summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorRonghua Wu <ronghuawu@google.com>2014-08-19 18:55:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-19 18:55:51 +0000
commitc89ce3c72c10786985b4156f6d4fcfd478d6d7c6 (patch)
tree8440a502c9f71ba2c301d5248d43ecef0043d914 /media
parent0e58fd504fbc9c7b56dd86984b104f9c754989cf (diff)
parent33610e353ff518c958a96686807326e5e0983913 (diff)
downloadframeworks_av-c89ce3c72c10786985b4156f6d4fcfd478d6d7c6.zip
frameworks_av-c89ce3c72c10786985b4156f6d4fcfd478d6d7c6.tar.gz
frameworks_av-c89ce3c72c10786985b4156f6d4fcfd478d6d7c6.tar.bz2
am 33610e35: am 5a5a2325: Merge "NuPlayer: disable deep audio buffer in offload mode." into lmp-dev
* commit '33610e353ff518c958a96686807326e5e0983913': NuPlayer: disable deep audio buffer in offload mode.
Diffstat (limited to 'media')
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayer.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index 5e7ecfa..7ed65de 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -1061,6 +1061,7 @@ void NuPlayer::openAudioSink(const sp<AMessage> &format, bool offloadOnly) {
}
ALOGV("openAudioSink: try to open AudioSink in offload mode");
flags |= AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD;
+ flags &= ~AUDIO_OUTPUT_FLAG_DEEP_BUFFER;
audioSinkChanged = true;
mAudioSink->close();
err = mAudioSink->open(