diff options
| author | Eric Laurent <elaurent@google.com> | 2014-12-17 17:55:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-17 17:55:26 +0000 |
| commit | 145cf5d885c238b690ab8240137934327b85c427 (patch) | |
| tree | f9e3e2f23e92f7ba7c98f0f09a9a4cfb6b40cd47 /media | |
| parent | 71b52b5bb3be81bffa320241ca486fbf964d743e (diff) | |
| parent | d1f69b0b17acbd96987ecb2f3378abd394d05903 (diff) | |
| download | frameworks_av-145cf5d885c238b690ab8240137934327b85c427.zip frameworks_av-145cf5d885c238b690ab8240137934327b85c427.tar.gz frameworks_av-145cf5d885c238b690ab8240137934327b85c427.tar.bz2 | |
Merge "audioflinger: implement pause/resume for direct outputs" into lmp-mr1-dev
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 d9c3177..389aacc 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); |