Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77aaf7a9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "NuPlayerRenderer: Reset negative media time to zero" am: 75ea8d08 am: f8c5e6a7 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1491239

Change-Id: Ib1f92d249a452c8f82ddd5d703cb2c4cc5e6689a
parents 110e3572 f8c5e6a7

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

+5 −0
Original line number Diff line number Diff line
@@ -922,6 +922,11 @@ size_t NuPlayer::Renderer::fillAudioBuffer(void *buffer, size_t size) { 
            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);

        }