commit 334e5dff4751eb77ade396f4c32404ca2b2892b3
author Wei Jia <wjia@google.com> Thu May 03 19:21:59 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 03 19:21:59 2018 +0000
tree de93ad2065ec7e05c042d5efae39d843c62305fb
parent 2178e2c8103cb29cb77cf6b92dc216d6b9d538e7
parent db13135caa6eafd6217efb8d73e7c01f4a3e8576

Merge "fix position go backward after resume"

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
index bd866cb..a52303f 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
@@ -355,8 +355,12 @@
 
         // AudioSink has rendered some frames.
         int64_t nowUs = ALooper::GetNowUs();
-        int64_t nowMediaUs = mAudioSink->getPlayedOutDurationUs(nowUs)
-                + mAudioFirstAnchorTimeMediaUs;
+        int64_t playedOutDurationUs = mAudioSink->getPlayedOutDurationUs(nowUs);
+        if (playedOutDurationUs == 0) {
+            *mediaUs = mAudioFirstAnchorTimeMediaUs;
+            return OK;
+        }
+        int64_t nowMediaUs = playedOutDurationUs + mAudioFirstAnchorTimeMediaUs;
         mMediaClock->updateAnchor(nowMediaUs, nowUs, -1);
     }