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

Commit edc4465d authored by Andrew Lewis's avatar Andrew Lewis Committed by Automerger Merge Worker
Browse files

Merge "Clamp audio seek to non-zero timestamp" into rvc-dev am: 7a0d96e9 am:... 

Merge "Clamp audio seek to non-zero timestamp" into rvc-dev am: 7a0d96e9 am: 68460b75 am: 68656358

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

Change-Id: I4bbe81cc2eeaabbaf4a8660e9f911c28d7464389
parents e9de9a30 68656358

media/libmediaplayerservice/nuplayer/GenericSource.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1159,7 +1159,7 @@ status_t NuPlayer::GenericSource::doSeek(int64_t seekTimeUs, MediaPlayerSeekMode 
        readBuffer(MEDIA_TRACK_TYPE_VIDEO, seekTimeUs, mode, &actualTimeUs);



        if (mode != MediaPlayerSeekMode::SEEK_CLOSEST) {

            seekTimeUs = actualTimeUs;

            seekTimeUs = std::max<int64_t>(0, actualTimeUs);

        }

        mVideoLastDequeueTimeUs = actualTimeUs;

    }