commit f875b213e0655511bc8283f46d701296092838d6
author Dichen Zhang <dichenzhang@google.com> Wed Feb 13 13:17:13 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Feb 13 13:17:13 2019 -0800
tree 94bed3826747c7b85ed54ab923ba159ea4763ea1
parent 29c6a1fa100592aed5654913ddbd9ad5adf0e775
parent d98913f7b54e9f7a622325d6544789cccf72eebe

Merge "NuPlayer2: Call video flush on audio teardown" am: bf430563f8
am: d98913f7b5

Change-Id: I4c1f8cf10cd6bbc555d6b453f2555c284ebc5eda

media/libmediaplayer2/nuplayer2/NuPlayer2.cpp

diff --git a/media/libmediaplayer2/nuplayer2/NuPlayer2.cpp b/media/libmediaplayer2/nuplayer2/NuPlayer2.cpp
index de4f34e..837bbc8 100644
--- a/media/libmediaplayer2/nuplayer2/NuPlayer2.cpp
+++ b/media/libmediaplayer2/nuplayer2/NuPlayer2.cpp
@@ -1884,11 +1884,21 @@
     closeAudioSink();
     mRenderer->flush(true /* audio */, false /* notifyComplete */);
     if (mVideoDecoder != NULL) {
-        mRenderer->flush(false /* audio */, false /* notifyComplete */);
+        mDeferredActions.push_back(
+                new FlushDecoderAction(FLUSH_CMD_NONE /* audio */,
+                                       FLUSH_CMD_FLUSH /* video */));
+        mDeferredActions.push_back(
+                new SeekAction(currentPositionUs,
+                MediaPlayerSeekMode::SEEK_PREVIOUS_SYNC /* mode */));
+        // After a flush without shutdown, decoder is paused.
+        // Don't resume it until source seek is done, otherwise it could
+        // start pulling stale data too soon.
+        mDeferredActions.push_back(new ResumeDecoderAction(false));
+        processDeferredActions();
+    } else {
+        performSeek(currentPositionUs, MediaPlayerSeekMode::SEEK_PREVIOUS_SYNC /* mode */);
     }
 
-    performSeek(currentPositionUs, MediaPlayer2SeekMode::SEEK_PREVIOUS_SYNC /* mode */);
-
     if (forceNonOffload) {
         mRenderer->signalDisableOffloadAudio();
         mOffloadAudio = false;