summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
diff options
context:
space:
mode:
authorRonghua Wu <ronghuawu@google.com>2014-11-20 21:13:08 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-11-20 21:13:08 +0000
commit7966142a096c1d5d7386a42eaccc9aed5b4344b3 (patch)
tree15a1da95e59cfc2506f73f10dab7fdcec432b4a8 /media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
parentf4ea51fda9396d7ee851b1d4d220384210ea2336 (diff)
parentf83408b41bbd796b7923d719e7e3799ddc7acaff (diff)
downloadframeworks_av-7966142a096c1d5d7386a42eaccc9aed5b4344b3.zip
frameworks_av-7966142a096c1d5d7386a42eaccc9aed5b4344b3.tar.gz
frameworks_av-7966142a096c1d5d7386a42eaccc9aed5b4344b3.tar.bz2
Merge "NuPlayer: invalid anchor time when render is flushed." into lmp-mr1-dev
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp')
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp7
1 files changed, 7 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) {