commit 8716e3f386f37abd3d759404ca8b3deaf46afde8
author Wei Jia <wjia@google.com> Tue Sep 09 22:08:44 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 09 22:08:45 2014 +0000
tree 994b1c4461e0997b72e1fffecef4346877319bb7
parent 47a13d45ae3f05ddb778124484a17d4754c82b7a
parent 1008e1c9eb9ec7aeefffa4d9907f890a8eab7668

Merge "NuPlayer: make previous decoders obsolete when reset is done." into lmp-dev

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index 59766c8..df3e992 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -1279,7 +1279,6 @@
         }
 
         if (err == -EWOULDBLOCK) {
-            ALOGD("feedDecoderInputData() got EWOULDBLOCK");
             if (biggerBuffer == NULL) {
                 return err;
             } else {

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
index aad6e93..067784b 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
@@ -893,8 +893,10 @@
 }
 
 void NuPlayer::Renderer::onPause() {
-    CHECK(!mPaused);
-
+    if (mPaused) {
+        ALOGW("Renderer::onPause() called while already paused!");
+        return;
+    }
     {
         Mutex::Autolock autoLock(mLock);
         ++mAudioQueueGeneration;