summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-04-17 18:45:59 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-17 18:46:00 +0000
commit2170233c49e50f3986cdc4f726016d6003cb5b8e (patch)
tree177f9549d93188931db2ba9cde44a9b953ec641d /media
parentbfb03d2486e3c5dd21120bf403d68fa36323b102 (diff)
parentd3c28f66a48dd450f5f6d8a3ba92a40132bc45de (diff)
downloadframeworks_av-2170233c49e50f3986cdc4f726016d6003cb5b8e.zip
frameworks_av-2170233c49e50f3986cdc4f726016d6003cb5b8e.tar.gz
frameworks_av-2170233c49e50f3986cdc4f726016d6003cb5b8e.tar.bz2
Merge "NuPlayerDriver: Maintain the timeStamp after seek"
Diffstat (limited to 'media')
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
index bb1255f..04a324c 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
@@ -388,6 +388,9 @@ status_t NuPlayerDriver::seekTo(int msec) {
{
mAtEOS = false;
mSeekInProgress = true;
+ if (mState == STATE_PAUSED) {
+ mStartupSeekTimeUs = seekTimeUs;
+ }
// seeks can take a while, so we essentially paused
notifyListener_l(MEDIA_PAUSED);
mPlayer->seekToAsync(seekTimeUs, true /* needNotify */);