| commit | 4bdc8012ddc888e7a23f931b01ee550c11a1c93a | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Nov 14 02:32:28 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Nov 14 02:32:28 2020 +0000 |
| tree | 35be35b629fa272c6ba40640adcf2957f7488758 | |
| parent | 2d2e3c8b588ac061f190e9d6d855c823d9a2fa0c [diff] | |
| parent | 77aaf7a96ad0facd18f8c827cfed8f4423792de3 [diff] |
Merge "NuPlayerRenderer: Reset negative media time to zero" am: 75ea8d08bf am: f8c5e6a793 am: 77aaf7a96a Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1491239 Change-Id: I6aa2af2bd22a8737d5e13d389676b537b7cc4aa7
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); }