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

Commit a7e65b19 authored by Robert Shih's avatar Robert Shih Committed by Android (Google) Code Review
Browse files

Merge "MatroskaExtractor: use GetTrackByNumber instead of GetTrackByIndex" into lmp-mr1-dev

parents 95768fc3 0644f95a

media/libstagefright/matroska/MatroskaExtractor.cpp

+5 −4
Original line number Diff line number Diff line
@@ -413,16 +413,16 @@ void BlockIterator::seek( 


    const mkvparser::CuePoint* pCP;

    mkvparser::Tracks const *pTracks = pSegment->GetTracks();

    unsigned long int trackCount = pTracks->GetTracksCount();

    while (!pCues->DoneParsing()) {

        pCues->LoadCuePoint();

        pCP = pCues->GetLast();

        CHECK(pCP);



        size_t trackCount = mExtractor->mTracks.size();

        for (size_t index = 0; index < trackCount; ++index) {

            const mkvparser::Track *pTrack = pTracks->GetTrackByIndex(index);

            if (pTrack && pTrack->GetType() == 1 && pCP->Find(pTrack)) { // VIDEO_TRACK

            MatroskaExtractor::TrackInfo& track = mExtractor->mTracks.editItemAt(index);

            const mkvparser::Track *pTrack = pTracks->GetTrackByNumber(track.mTrackNum);

            if (pTrack && pTrack->GetType() == 1 && pCP->Find(pTrack)) { // VIDEO_TRACK

                track.mCuePoints.push_back(pCP);

            }

        }
@@ -434,12 +434,13 @@ void BlockIterator::seek( 
    }



    const mkvparser::CuePoint::TrackPosition *pTP = NULL;

    const mkvparser::Track *thisTrack = pTracks->GetTrackByIndex(mIndex);

    const mkvparser::Track *thisTrack = pTracks->GetTrackByNumber(mTrackNum);

    if (thisTrack->GetType() == 1) { // video

        MatroskaExtractor::TrackInfo& track = mExtractor->mTracks.editItemAt(mIndex);

        pTP = track.find(seekTimeNs);

    } else {

        // The Cue index is built around video keyframes

        unsigned long int trackCount = pTracks->GetTracksCount();

        for (size_t index = 0; index < trackCount; ++index) {

            const mkvparser::Track *pTrack = pTracks->GetTrackByIndex(index);

            if (pTrack && pTrack->GetType() == 1 && pCues->Find(seekTimeNs, pTrack, pCP, pTP)) {