summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-05-19 16:02:17 -0700
committerWei Jia <wjia@google.com>2015-05-21 11:51:03 -0700
commit1061c9c29cfdeb3b2a307a4ee4cda2cd197b48e6 (patch)
tree5bcead6931b691612bce6a40f94ab8382c081be9 /media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
parent2232aee25e4df7d04446912e8ad9e9dc44d8ec16 (diff)
downloadframeworks_av-1061c9c29cfdeb3b2a307a4ee4cda2cd197b48e6.zip
frameworks_av-1061c9c29cfdeb3b2a307a4ee4cda2cd197b48e6.tar.gz
frameworks_av-1061c9c29cfdeb3b2a307a4ee4cda2cd197b48e6.tar.bz2
mediaplayer: display one frame when seek is called before start.
Bug: 18608164 Change-Id: I83252421278aeeb1c1611138994bfdaf86d7a363
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp')
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp14
1 files changed, 2 insertions, 12 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
index 231f2e1..84ae25e 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
@@ -397,23 +397,13 @@ status_t NuPlayerDriver::seekTo(int msec) {
switch (mState) {
case STATE_PREPARED:
case STATE_STOPPED_AND_PREPARED:
- {
+ case STATE_PAUSED:
mStartupSeekTimeUs = seekTimeUs;
- // pretend that the seek completed. It will actually happen when starting playback.
- // TODO: actually perform the seek here, so the player is ready to go at the new
- // location
- notifySeekComplete_l();
- break;
- }
-
+ // fall through.
case STATE_RUNNING:
- case STATE_PAUSED:
{
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 */);