diff options
author | Chong Zhang <chz@google.com> | 2014-12-02 00:13:35 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-02 00:13:36 +0000 |
commit | d8731629bed46ff573b1ef904e5366d28f23dc0a (patch) | |
tree | f3c869ddad9bb2fa62fb54d1b07aefd8d8a39e6c /media/libmediaplayerservice/nuplayer/NuPlayer.h | |
parent | f20c4356931ef72084b6b8e310f56b67715c6fb9 (diff) | |
parent | f8d717772f6d185cb07720cd5091df9b7d612e0b (diff) | |
download | frameworks_av-d8731629bed46ff573b1ef904e5366d28f23dc0a.zip frameworks_av-d8731629bed46ff573b1ef904e5366d28f23dc0a.tar.gz frameworks_av-d8731629bed46ff573b1ef904e5366d28f23dc0a.tar.bz2 |
Merge "notify seek complete upon first video output frame" into lmp-mr1-dev
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayer.h')
-rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.h b/media/libmediaplayerservice/nuplayer/NuPlayer.h index 6856af1..6be38a4 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); |