summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/nuplayer/NuPlayer.h
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2014-10-31 17:57:05 -0700
committerWei Jia <wjia@google.com>2014-11-06 09:57:19 -0800
commitfef808d42a9c94b0b5ef3c3d5fb0a090edbc42da (patch)
tree94c39efa1b2c3cc6a3b40cf2b6e5f087dd6f917b /media/libmediaplayerservice/nuplayer/NuPlayer.h
parent151b3f41ffcdf187580542ba0c0d3b84df16beed (diff)
downloadframeworks_av-fef808d42a9c94b0b5ef3c3d5fb0a090edbc42da.zip
frameworks_av-fef808d42a9c94b0b5ef3c3d5fb0a090edbc42da.tar.gz
frameworks_av-fef808d42a9c94b0b5ef3c3d5fb0a090edbc42da.tar.bz2
AnotherPacketSource.cpp: Do not queue discontinity signal buffer resulted from seek.
This will remove the unnecessary flush for seek. Bug: 17511837 Change-Id: I4b7acfc71a410372f5c630afb94b6a95d09d8974
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayer.h')
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayer.h11
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);