am 3253bef3: am d8731629: Merge "notify seek complete upon first video output frame" into lmp-mr1-dev

* commit '3253bef38cd6653768e7858f95d8baf371d58bf0':
  notify seek complete upon first video output frame

1 files changed, 7 insertions, 1 deletions

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.h b/media/libmediaplayerservice/nuplayer/NuPlayer.h
index 0fd64ad..c64b32f 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.h
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.h
@@ -93,6 +93,7 @@ private:
     struct Action;
     struct SeekAction;
     struct SetSurfaceAction;
+    struct ResumeDecoderAction;
     struct FlushDecoderAction;
     struct PostMessageAction;
     struct SimpleAction;
@@ -169,6 +170,9 @@ private:
     FlushStatus mFlushingAudio;
     FlushStatus mFlushingVideo;
 
+    // Status of flush responses from the decoder and renderer.
+    bool mResumePending;
+
     int32_t mVideoScalingMode;
 
     bool mStarted;
@@ -205,6 +209,8 @@ private:
 
     void flushDecoder(bool audio, bool needShutdown);
 
+    void finishResume();
+
     void postScanSources();
 
     void schedulePollDuration();
@@ -217,7 +223,7 @@ private:
     void performReset();
     void performScanSources();
     void performSetSurface(const sp<NativeWindowWrapper> &wrapper);
-    void performResumeDecoders();
+    void performResumeDecoders(bool needNotify);
 
     void onSourceNotify(const sp<AMessage> &msg);
     void onClosedCaptionNotify(const sp<AMessage> &msg);