commit b7e8d8522c5eb2e0a9c04b2f499f930eabba8309
author Andy Hung <hunga@google.com> Fri Jun 05 03:51:21 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 05 03:51:22 2015 +0000
tree 6f4ed8a6fe2135d0894aba8e489441c581b82a30
parent c9e54ee0420bdb0226bc077c3952cdd4953773de
parent 85e48142f726770d3b65caa1f29d8b98f8d5db6b

Merge "NuPlayer: Allow audio callback to fill buffer when paused" into mnc-dev

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
index f8b21e5..5022439 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
@@ -692,7 +692,7 @@
 size_t NuPlayer::Renderer::fillAudioBuffer(void *buffer, size_t size) {
     Mutex::Autolock autoLock(mLock);
 
-    if (!mUseAudioCallback || mPaused) {
+    if (!mUseAudioCallback) {
         return 0;
     }
 
@@ -1291,7 +1291,9 @@
         if (offloadingAudio()) {
             mAudioSink->pause();
             mAudioSink->flush();
-            mAudioSink->start();
+            if (!mPaused) {
+                mAudioSink->start();
+            }
         } else {
             mAudioSink->pause();
             mAudioSink->flush();
@@ -1665,7 +1667,9 @@
                 // before reaching the hardware.
                 // TODO
                 mCurrentOffloadInfo = offloadInfo;
-                err = mAudioSink->start();
+                if (!mPaused) { // for preview mode, don't start if paused
+                    err = mAudioSink->start();
+                }
                 ALOGV_IF(err == OK, "openAudioSink: offload succeeded");
             }
             if (err != OK) {