diff options
author | Ronghua Wu <ronghuawu@google.com> | 2014-11-20 21:16:00 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-20 21:16:00 +0000 |
commit | 2a424d6fdccc6152ae855025996beef39f20c6df (patch) | |
tree | 15a1da95e59cfc2506f73f10dab7fdcec432b4a8 | |
parent | c2d88d0b1571c11187e32b94e281ded17606070f (diff) | |
parent | 7966142a096c1d5d7386a42eaccc9aed5b4344b3 (diff) | |
download | frameworks_av-2a424d6fdccc6152ae855025996beef39f20c6df.zip frameworks_av-2a424d6fdccc6152ae855025996beef39f20c6df.tar.gz frameworks_av-2a424d6fdccc6152ae855025996beef39f20c6df.tar.bz2 |
am 7966142a: Merge "NuPlayer: invalid anchor time when render is flushed." into lmp-mr1-dev
* commit '7966142a096c1d5d7386a42eaccc9aed5b4344b3':
NuPlayer: invalid anchor time when render is flushed.
-rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | 7 | ||||
-rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp index e09567a..d050c78 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp @@ -310,6 +310,13 @@ status_t NuPlayerDriver::stop() { } status_t NuPlayerDriver::pause() { + // The NuPlayerRenderer may get flushed if pause for long enough, e.g. the pause timeout tear + // down for audio offload mode. If that happens, the NuPlayerRenderer will no longer know the + // current position. So similar to seekTo, update |mPositionUs| to the pause position by calling + // getCurrentPosition here. + int msec; + getCurrentPosition(&msec); + Mutex::Autolock autoLock(mLock); switch (mState) { diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp index 42288a3..faf115e 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp @@ -1039,6 +1039,7 @@ void NuPlayer::Renderer::onFlush(const sp<AMessage> &msg) { Mutex::Autolock autoLock(mLock); syncQueuesDone_l(); setPauseStartedTimeRealUs(-1); + setAnchorTime(-1, -1); } ALOGV("flushing %s", audio ? "audio" : "video"); |