diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2014-11-19 10:02:16 -0800 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2014-12-18 09:59:21 -0800 |
| commit | 8b67ce7210caa4f119a687e9b0946b339db08265 (patch) | |
| tree | 14726dcfaba10a6364c4497cf9d532c5db7e8caf /media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | |
| parent | 6f3b732b6f95e9b96172164cba13382ce64864ba (diff) | |
| download | frameworks_av-8b67ce7210caa4f119a687e9b0946b339db08265.zip frameworks_av-8b67ce7210caa4f119a687e9b0946b339db08265.tar.gz frameworks_av-8b67ce7210caa4f119a687e9b0946b339db08265.tar.bz2 | |
DO NOT MERGE - NuPlayer: invalid anchor time when render is flushed.
Also rememeber the pause time in NuPlayerDriver.
Bug: 18436336
Change-Id: If09f680a0d0f9137bd55c5f94201eb3aa783278a
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 ab46074..4bff90f 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp @@ -316,6 +316,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) { |