summaryrefslogtreecommitdiffstats
path: root/media/libmedia
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2012-04-20 16:17:38 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-20 16:17:38 -0700
commitf853499c6a088ef8506cacbb3ccdffa87e0cec3e (patch)
treedcb35fbedd788b5269c121c08532ecaad755046c /media/libmedia
parentfc554559032e394de1b28b918efb8ba9f72162fd (diff)
parent1948eb3ea6eee336e8cdab9b0c693f93f5f19993 (diff)
downloadframeworks_av-f853499c6a088ef8506cacbb3ccdffa87e0cec3e.zip
frameworks_av-f853499c6a088ef8506cacbb3ccdffa87e0cec3e.tar.gz
frameworks_av-f853499c6a088ef8506cacbb3ccdffa87e0cec3e.tar.bz2
Merge "Add support for deep audio buffers"
Diffstat (limited to 'media/libmedia')
-rw-r--r--media/libmedia/AudioTrack.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index 092b516..25d79d6 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -225,6 +225,10 @@ status_t AudioTrack::set(
flags = (audio_output_flags_t)
((flags | AUDIO_OUTPUT_FLAG_DIRECT) & ~AUDIO_OUTPUT_FLAG_FAST);
}
+ // only allow deep buffering for music stream type
+ if (streamType != AUDIO_STREAM_MUSIC) {
+ flags = (audio_output_flags_t)(flags &~AUDIO_OUTPUT_FLAG_DEEP_BUFFER);
+ }
if (!audio_is_output_channel(channelMask)) {
ALOGE("Invalid channel mask");