diff options
author | Wei Jia <wjia@google.com> | 2014-11-06 23:38:17 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-06 23:38:18 +0000 |
commit | e86c6d59dfa8aea8f321287cbb1f122623e5417a (patch) | |
tree | de24fd38277b8d4f3ee954fe4156798f34a045a3 /media/libmediaplayerservice/nuplayer/NuPlayer.h | |
parent | 1cf9ad1abb599ce4057189e0db154cf00b4913f8 (diff) | |
parent | fef808d42a9c94b0b5ef3c3d5fb0a090edbc42da (diff) | |
download | frameworks_av-e86c6d59dfa8aea8f321287cbb1f122623e5417a.zip frameworks_av-e86c6d59dfa8aea8f321287cbb1f122623e5417a.tar.gz frameworks_av-e86c6d59dfa8aea8f321287cbb1f122623e5417a.tar.bz2 |
Merge "AnotherPacketSource.cpp: Do not queue discontinity signal buffer resulted from seek." into lmp-mr1-dev
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayer.h')
-rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.h b/media/libmediaplayerservice/nuplayer/NuPlayer.h index 14056ca..121f7dd 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.h +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.h @@ -94,7 +94,7 @@ private: struct Action; struct SeekAction; struct SetSurfaceAction; - struct ShutdownDecoderAction; + struct FlushDecoderAction; struct PostMessageAction; struct SimpleAction; @@ -159,6 +159,12 @@ private: SHUT_DOWN, }; + enum FlushCommand { + FLUSH_CMD_NONE, + FLUSH_CMD_FLUSH, + FLUSH_CMD_SHUTDOWN, + }; + // Once the current flush is complete this indicates whether the // notion of time has changed. bool mTimeDiscontinuityPending; @@ -229,8 +235,7 @@ private: void processDeferredActions(); void performSeek(int64_t seekTimeUs, bool needNotify); - void performDecoderFlush(); - void performDecoderShutdown(bool audio, bool video); + void performDecoderFlush(FlushCommand audio, FlushCommand video); void performReset(); void performScanSources(); void performSetSurface(const sp<NativeWindowWrapper> &wrapper); |