diff options
author | Wei Jia <wjia@google.com> | 2014-10-31 00:20:19 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-31 00:20:19 +0000 |
commit | 545e123c54789f8dcb9f5fa77fd5aa0b7a172f10 (patch) | |
tree | baf2eb742b8dfe92e7b069233e0e8a33d0e44825 /media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | |
parent | 2384b55ab31c49fb5babce058237c27ed28ed53e (diff) | |
parent | 0307c3ce5be18d83093e0e45b8cbd90caf30c4fc (diff) | |
download | frameworks_av-545e123c54789f8dcb9f5fa77fd5aa0b7a172f10.zip frameworks_av-545e123c54789f8dcb9f5fa77fd5aa0b7a172f10.tar.gz frameworks_av-545e123c54789f8dcb9f5fa77fd5aa0b7a172f10.tar.bz2 |
am 0307c3ce: am 97d84d7f: am cde2b722: Merge "NuPlayer: merge start() and resume()." into lmp-mr1-dev
* commit '0307c3ce5be18d83093e0e45b8cbd90caf30c4fc':
NuPlayer: merge start() and resume().
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp')
-rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp index 3876f1e..2b1c559 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp @@ -239,16 +239,24 @@ status_t NuPlayerDriver::start() { // fall through } + case STATE_PAUSED: + case STATE_STOPPED_AND_PREPARED: + { + if (mAtEOS && mStartupSeekTimeUs < 0) { + mStartupSeekTimeUs = 0; + mPositionUs = -1; + } + + // fall through + } + case STATE_PREPARED: { mAtEOS = false; mPlayer->start(); if (mStartupSeekTimeUs >= 0) { - if (mStartupSeekTimeUs > 0) { - mPlayer->seekToAsync(mStartupSeekTimeUs); - } - + mPlayer->seekToAsync(mStartupSeekTimeUs); mStartupSeekTimeUs = -1; } break; @@ -264,20 +272,6 @@ status_t NuPlayerDriver::start() { break; } - case STATE_PAUSED: - case STATE_STOPPED_AND_PREPARED: - { - if (mAtEOS) { - mPlayer->seekToAsync(0); - mAtEOS = false; - mPlayer->resume(); - mPositionUs = -1; - } else { - mPlayer->resume(); - } - break; - } - default: return INVALID_OPERATION; } @@ -348,6 +342,7 @@ status_t NuPlayerDriver::seekTo(int msec) { switch (mState) { case STATE_PREPARED: + case STATE_STOPPED_AND_PREPARED: { int curpos = 0; if (mPositionUs > 0) { |