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

Commit d3dcd248 authored by Robert Shih's avatar Robert Shih Committed by android-build-merger
Browse files

Merge "GenericSource: reset timed text/subtitle after seek" into oc-dr1-dev... 

Merge "GenericSource: reset timed text/subtitle after seek" into oc-dr1-dev am: 87b901ca am: 93d85e79
am: c7170f20

Change-Id: I638507d1b2e2466b9ae58236d4df939609b1a1a3
parents 5a76cab2 c7170f20

media/libmediaplayerservice/nuplayer/GenericSource.cpp

+10 −0
Original line number Diff line number Diff line
@@ -1238,6 +1238,16 @@ status_t NuPlayer::GenericSource::doSeek(int64_t seekTimeUs, MediaPlayerSeekMode 
        mAudioLastDequeueTimeUs = seekTimeUs;

    }



    if (mSubtitleTrack.mSource != NULL) {

        mSubtitleTrack.mPackets->clear();

        mFetchSubtitleDataGeneration++;

    }



    if (mTimedTextTrack.mSource != NULL) {

        mTimedTextTrack.mPackets->clear();

        mFetchTimedTextDataGeneration++;

    }



    // If currently buffering, post kWhatBufferingEnd first, so that

    // NuPlayer resumes. Otherwise, if cache hits high watermark

    // before new polling happens, no one will resume the playback.