commit 86dc61807a68592cb1b3b42a848bfb8b6451b6e8
author Paras Nagda <pnagda@codeaurora.org> Tue Oct 27 13:01:47 2020 +0530
committer Lajos Molnar <lajos@google.com> Fri Nov 06 21:45:01 2020 -0800
tree 7228698a7cfa0fa8697ac6b4614199262db4b8d6
parent 11ac2dfe77c87de985871b6a3c3cce29f9ac9252

NuPlayerRenderer: Reset negative media time to zero

Reset negative media time to zero before call is made to
Mediaclock's setStartingTimeMedia().

Test:run android.mediastress.cts.HEVCR1080pAacLongPlayerTest#testPlay00 on gsi

Bug: 170621757
Bug: 171945667
Bug: 170797642
Bug: 171562715
Bug: 171850618
Change-Id: I2c405007b38229038119760423156bd53a2701c0

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
index c30f048..7e8fe45 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
@@ -922,6 +922,11 @@
             firstEntry = false;
             int64_t mediaTimeUs;
             CHECK(entry->mBuffer->meta()->findInt64("timeUs", &mediaTimeUs));
+            if (mediaTimeUs < 0) {
+                ALOGD("fillAudioBuffer: reset negative media time %.2f secs to zero",
+                       mediaTimeUs / 1E6);
+                mediaTimeUs = 0;
+            }
             ALOGV("fillAudioBuffer: rendering audio at media time %.2f secs", mediaTimeUs / 1E6);
             setAudioFirstAnchorTimeIfNeeded_l(mediaTimeUs);
         }