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

Commit 93d85e79 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 

am: 87b901ca

Change-Id: I004617ccc72bec5e8c4270fc2991eab650e2ff6d
parents 47fb8a51 87b901ca

media/libmediaplayerservice/nuplayer/GenericSource.cpp

+10 −0
Original line number Diff line number Diff line
@@ -1242,6 +1242,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.