diff options
author | Ronghua Wu <ronghuawu@google.com> | 2014-11-21 02:45:53 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2014-11-21 02:45:53 +0000 |
commit | f108dc85443936ca219567cc3a8556daa4a20fb3 (patch) | |
tree | a8d610347caa8ad78701821a036c9ba44a4f6f5c /media | |
parent | 9f77da1003b5a68034a9c34a057517eabbc24326 (diff) | |
parent | 2a424d6fdccc6152ae855025996beef39f20c6df (diff) | |
download | frameworks_av-f108dc85443936ca219567cc3a8556daa4a20fb3.zip frameworks_av-f108dc85443936ca219567cc3a8556daa4a20fb3.tar.gz frameworks_av-f108dc85443936ca219567cc3a8556daa4a20fb3.tar.bz2 |
am 7966142a: Merge "NuPlayer: invalid anchor time when render is flushed." into lmp-mr1-dev
automerge: 2a424d6
* commit '2a424d6fdccc6152ae855025996beef39f20c6df':
NuPlayer: invalid anchor time when render is flushed.
Diffstat (limited to 'media')
-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"); |