generic-library/webm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

handle empty clusters when seeking

Browse Source 
Change-Id: I9bb39ff95e308639402e1c7f9aec59c81350d091
This commit is contained in:
matthewjheaney
2010-10-28 14:45:27 -04:00
parent acf7ddb273
commit d7ce23a019
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
mkvparser.cpp
View File

@@ -2716,11 +2716,21 @@ const BlockEntry* Segment::Seek(
assert(lo > i); assert(lo > i);
assert(lo <= j); assert(lo <= j);
Cluster* const pCluster = *--lo; while (lo > i)
assert(pCluster); {
assert(pCluster->GetTime() <= time_ns); Cluster* const pCluster = *--lo;
assert(pCluster);
assert(pCluster->GetTime() <= time_ns);
return pCluster->GetEntry(pTrack); const BlockEntry* const pBE = pCluster->GetEntry(pTrack);
if ((pBE != 0) && !pBE->EOS())
return pBE;
//landed on empty cluster (no entries)
}
return pTrack->GetEOS(); //weird
} }
assert(pTrack->GetType() == 1); //video assert(pTrack->GetType() == 1); //video
@@ -2761,17 +2771,16 @@ const BlockEntry* Segment::Seek(
{ {
const BlockEntry* const pBlockEntry = pCluster->GetEntry(pTrack); const BlockEntry* const pBlockEntry = pCluster->GetEntry(pTrack);
assert(pBlockEntry);
if (!pBlockEntry->EOS()) //found a keyframe if ((pBlockEntry != 0) && !pBlockEntry->EOS()) //found a keyframe
{ {
const Block* const pBlock = pBlockEntry->GetBlock(); const Block* const pBlock = pBlockEntry->GetBlock();
assert(pBlock); assert(pBlock);
//TODO: this isn't necessarily the keyframe we want, //NOTE: this isn't necessarily the keyframe we want,
//since there might another keyframe on this same //since there might another keyframe on this same
//cluster with a greater timecode that but that is //cluster with a greater timecode, that is still
//still less than the requested time. For now we //less than the requested time. For now we
//simply return the first keyframe we find. //simply return the first keyframe we find.
if (pBlock->GetTime(pCluster) <= time_ns) if (pBlock->GetTime(pCluster) <= time_ns)
@@ -2788,9 +2797,8 @@ const BlockEntry* Segment::Seek(
assert(pCluster->GetTime() <= time_ns); assert(pCluster->GetTime() <= time_ns);
const BlockEntry* const pBlockEntry = pCluster->GetMaxKey(pVideo); const BlockEntry* const pBlockEntry = pCluster->GetMaxKey(pVideo);
assert(pBlockEntry);
if (!pBlockEntry->EOS()) if ((pBlockEntry != 0) && !pBlockEntry->EOS())
return pBlockEntry; return pBlockEntry;
} }