commit aec8d82dbd9b80eab3df62e200b47ba91cc94d42
author Wei Jia <wjia@google.com> Fri Aug 25 15:27:57 2017 -0700
committer Wei Jia <wjia@google.com> Mon Aug 28 09:55:28 2017 -0700
tree 00d70b4bd838ed1a48665319d0d24ec2bd54d08a
parent 52f34c8988bdaeccb715e36eec66ad2183f6158b

NuPlayer: fix out of range seeking in audio

Also allow media time to move forward when switching from a/v to video
only.
Test: media time is correct when playing and seeking
Bug: 63397228

Change-Id: I14317bb4f3daa210e7b0323ef2d4daf5e298d91c

media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
index ac187cc..cd770b6 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
@@ -750,12 +750,20 @@
 
         buffer->meta()->setInt32("eos", true);
         reply->setInt32("eos", true);
-    } else if (mSkipRenderingUntilMediaTimeUs >= 0) {
+    }
+
+    if (mSkipRenderingUntilMediaTimeUs >= 0) {
         if (timeUs < mSkipRenderingUntilMediaTimeUs) {
             ALOGV("[%s] dropping buffer at time %lld as requested.",
                      mComponentName.c_str(), (long long)timeUs);
 
             reply->post();
+            if (eos) {
+                notifyResumeCompleteIfNecessary();
+                if (mRenderer != NULL && !isDiscontinuityPending()) {
+                    mRenderer->queueEOS(mIsAudio, ERROR_END_OF_STREAM);
+                }
+            }
             return true;
         }