summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-05-01 11:05:29 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-01 11:05:29 -0700
commit2409e4337b1e5968cbf75a839778f849266b64d9 (patch)
tree52b52e876b324455d674e1aacba14a635581f9e1 /media
parent6635c44c27a8fc2f1eeaaefd5dfc2e65464bcb5d (diff)
parent1477e92867a950016579a644e74f803ed1d90cbb (diff)
downloadframeworks_av-2409e4337b1e5968cbf75a839778f849266b64d9.zip
frameworks_av-2409e4337b1e5968cbf75a839778f849266b64d9.tar.gz
frameworks_av-2409e4337b1e5968cbf75a839778f849266b64d9.tar.bz2
Merge "Enable fast track for SoundPool" into jb-dev
Diffstat (limited to 'media')
-rw-r--r--media/libmedia/SoundPool.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/SoundPool.cpp b/media/libmedia/SoundPool.cpp
index 4b318ed..abc8899 100644
--- a/media/libmedia/SoundPool.cpp
+++ b/media/libmedia/SoundPool.cpp
@@ -611,7 +611,7 @@ void SoundChannel::play(const sp<Sample>& sample, int nextChannelID, float leftV
channels, sample->getIMemory(), AUDIO_OUTPUT_FLAG_NONE, callback, userData);
#else
newTrack = new AudioTrack(streamType, sampleRate, sample->format(),
- channels, frameCount, AUDIO_OUTPUT_FLAG_NONE, callback, userData,
+ channels, frameCount, AUDIO_OUTPUT_FLAG_FAST, callback, userData,
bufferFrames);
#endif
oldTrack = mAudioTrack;