diff options
author | Wei Jia <wjia@google.com> | 2014-12-18 10:44:17 -0800 |
---|---|---|
committer | Wei Jia <wjia@google.com> | 2014-12-19 11:29:30 -0800 |
commit | d4cdba18ba7d0057ae54ec7efa5871b1a9d8beca (patch) | |
tree | 6a8a44525450cb0a0d13ab0c60ad31c47bed9f1b /media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | |
parent | e48cf5b8f823c30af93577c1e380d752ac69b871 (diff) | |
download | frameworks_av-d4cdba18ba7d0057ae54ec7efa5871b1a9d8beca.zip frameworks_av-d4cdba18ba7d0057ae54ec7efa5871b1a9d8beca.tar.gz frameworks_av-d4cdba18ba7d0057ae54ec7efa5871b1a9d8beca.tar.bz2 |
NuPlayer: reports paused position in paused state.
Bug: 18733773
Change-Id: I993a4bf108913ab98a0294d7dcf7605349f7029b
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 d050c78..e7e1759 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp @@ -380,13 +380,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; |