commit 64c2d17111b5aebaee2592d9d17c56301bb3e1bc
author Ronghua Wu <ronghuawu@google.com> Wed Oct 07 16:52:19 2015 -0700
committer Ronghua Wu <ronghuawu@google.com> Mon Oct 26 21:58:17 2015 +0000
tree 2c78bfca6b77a13dd53215e15a69db77cf475b2b
parent d373ede5e7737f7fec936f4c37f64805a538d584

nuplayer: don't resume if player is reseting

Bug: 24712426
Change-Id: I58cca0bde708a5c3b073ed77e18b62fe81d6c017

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index c29d4ed..aabe989 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -188,6 +188,7 @@
       mPlaybackSettings(AUDIO_PLAYBACK_RATE_DEFAULT),
       mVideoFpsHint(-1.f),
       mStarted(false),
+      mResetting(false),
       mSourceStarted(false),
       mPaused(false),
       mPausedByClient(false),
@@ -1156,6 +1157,8 @@
         {
             ALOGV("kWhatReset");
 
+            mResetting = true;
+
             mDeferredActions.push_back(
                     new FlushDecoderAction(
                         FLUSH_CMD_SHUTDOWN /* audio */,
@@ -1238,7 +1241,8 @@
 }
 
 void NuPlayer::onResume() {
-    if (!mPaused) {
+    if (!mPaused || mResetting) {
+        ALOGD_IF(mResetting, "resetting, onResume discarded");
         return;
     }
     mPaused = false;
@@ -1942,6 +1946,7 @@
     }
 
     mStarted = false;
+    mResetting = false;
     mSourceStarted = false;
 }