diff options
| author | Eric Laurent <elaurent@google.com> | 2014-12-17 18:04:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-17 18:04:15 +0000 |
| commit | 85aca658ac7d20584b0647427256df50a5f243ef (patch) | |
| tree | 0a368cd14a99953de3943fa6f43334a8aea9f19f /media | |
| parent | 22dfb93254de370d401706728aba1f032ef1b172 (diff) | |
| parent | d33712d7ec5dcf427cc0be9b7d2ca1c99823c8e6 (diff) | |
| download | frameworks_av-85aca658ac7d20584b0647427256df50a5f243ef.zip frameworks_av-85aca658ac7d20584b0647427256df50a5f243ef.tar.gz frameworks_av-85aca658ac7d20584b0647427256df50a5f243ef.tar.bz2 | |
am d33712d7: am 145cf5d8: Merge "audioflinger: implement pause/resume for direct outputs" into lmp-mr1-dev
* commit 'd33712d7ec5dcf427cc0be9b7d2ca1c99823c8e6':
audioflinger: implement pause/resume for direct outputs
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/AudioTrack.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index 6bdf865..735db5c 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -335,6 +335,11 @@ status_t AudioTrack::set( ((flags | AUDIO_OUTPUT_FLAG_DIRECT) & ~AUDIO_OUTPUT_FLAG_FAST); } + // force direct flag if HW A/V sync requested + if ((flags & AUDIO_OUTPUT_FLAG_HW_AV_SYNC) != 0) { + flags = (audio_output_flags_t)(flags | AUDIO_OUTPUT_FLAG_DIRECT); + } + if (flags & AUDIO_OUTPUT_FLAG_DIRECT) { if (audio_is_linear_pcm(format)) { mFrameSize = channelCount * audio_bytes_per_sample(format); |