diff options
author | Wei Jia <wjia@google.com> | 2014-12-19 22:31:54 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-19 22:31:54 +0000 |
commit | 8e883a15d950c461f258104d7fe5c3c81c1db0de (patch) | |
tree | dbb2d0fdffc739477ecf4f8e4596174ded92a1ef /media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | |
parent | 68586a6c3d8ce45c054bb7e7c3c38f70f3e167fd (diff) | |
parent | bae511e3b982355fbc75ae2ba13bb88feab9fe8c (diff) | |
download | frameworks_av-8e883a15d950c461f258104d7fe5c3c81c1db0de.zip frameworks_av-8e883a15d950c461f258104d7fe5c3c81c1db0de.tar.gz frameworks_av-8e883a15d950c461f258104d7fe5c3c81c1db0de.tar.bz2 |
am bae511e3: am 4af263bd: am ad019236: Merge "NuPlayer: reports paused position in paused state." into lmp-mr1-dev
* commit 'bae511e3b982355fbc75ae2ba13bb88feab9fe8c':
NuPlayer: reports paused position in paused state.
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp')
-rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp index d65df14..f126b87 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp @@ -388,13 +388,22 @@ status_t NuPlayerDriver::seekTo(int msec) { status_t NuPlayerDriver::getCurrentPosition(int *msec) { int64_t tempUs = 0; + { + Mutex::Autolock autoLock(mLock); + if (mSeekInProgress || mState == STATE_PAUSED) { + tempUs = (mPositionUs <= 0) ? 0 : mPositionUs; + *msec = (int)divRound(tempUs, (int64_t)(1000)); + return OK; + } + } + status_t ret = mPlayer->getCurrentPosition(&tempUs); Mutex::Autolock autoLock(mLock); // We need to check mSeekInProgress here because mPlayer->seekToAsync is an async call, which // means getCurrentPosition can be called before seek is completed. Iow, renderer may return a // position value that's different the seek to position. - if (ret != OK || mSeekInProgress) { + if (ret != OK) { tempUs = (mPositionUs <= 0) ? 0 : mPositionUs; } else { mPositionUs = tempUs; |