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

Commit 290ca3a7 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "fix crash with cues at the beginning of the file"

parents 1bd139a2 be7ac3d6
Loading
Loading
Loading
Loading
+4 −9
Original line number Diff line number Diff line
@@ -346,9 +346,7 @@ void BlockIterator::seek(
                long len; long long pos;
                pSegment->ParseCues(pEntry->pos, pos, len);
                pCues = pSegment->GetCues();
                // Pull one cue point to fix loop below
                ALOGV("Loading Cue points");
                pCues->LoadCuePoint();
                ALOGV("Cues found");
                break;
            }
        }
@@ -365,16 +363,13 @@ void BlockIterator::seek(

    const mkvparser::CuePoint* pCP;
    while (!pCues->DoneParsing()) {
        // Make sure we don't have the necessary Cue already.
        // If one Cue hadn't been loaded it would need to pre-emptively
        // load one every time (until they are all loaded).
        pCues->LoadCuePoint();
        pCP = pCues->GetLast();

        if (pCP->GetTime(pSegment) >= seekTimeNs) {
            ALOGV("Located segment");
            ALOGV("Parsed past relevant Cue");
            break;
        }

        pCues->LoadCuePoint();
    }

    // Find the video track for seeking. It doesn't make sense to search the