diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2014-11-21 02:57:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-21 02:57:54 +0000 |
| commit | 8518168a1bdb81e56f4324a72224a724337a5844 (patch) | |
| tree | 2967f3023cf5b39e681ed41599d9afbee48f4ce3 /media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | |
| parent | 9020d978f4e838fbda21867d685779841599433a (diff) | |
| parent | f108dc85443936ca219567cc3a8556daa4a20fb3 (diff) | |
| download | frameworks_av-8518168a1bdb81e56f4324a72224a724337a5844.zip frameworks_av-8518168a1bdb81e56f4324a72224a724337a5844.tar.gz frameworks_av-8518168a1bdb81e56f4324a72224a724337a5844.tar.bz2 | |
am f108dc85: am 7966142a: Merge "NuPlayer: invalid anchor time when render is flushed." into lmp-mr1-dev automerge: 2a424d6
* commit 'f108dc85443936ca219567cc3a8556daa4a20fb3':
NuPlayer: invalid anchor time when render is flushed.
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp index de16ec9..d65df14 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) { |