summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/nuplayer/NuPlayer.h
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2014-12-02 00:18:34 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-02 00:18:34 +0000
commit3253bef38cd6653768e7858f95d8baf371d58bf0 (patch)
treef3c869ddad9bb2fa62fb54d1b07aefd8d8a39e6c /media/libmediaplayerservice/nuplayer/NuPlayer.h
parent390ef84373b7edd1397381f780ca235326357094 (diff)
parentd8731629bed46ff573b1ef904e5366d28f23dc0a (diff)
downloadframeworks_av-3253bef38cd6653768e7858f95d8baf371d58bf0.zip
frameworks_av-3253bef38cd6653768e7858f95d8baf371d58bf0.tar.gz
frameworks_av-3253bef38cd6653768e7858f95d8baf371d58bf0.tar.bz2
am d8731629: Merge "notify seek complete upon first video output frame" into lmp-mr1-dev
* commit 'd8731629bed46ff573b1ef904e5366d28f23dc0a': notify seek complete upon first video output frame
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayer.h')
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayer.h8
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);