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

GetEntry now accepts a time

Browse Source 
Change-Id: I850cfa1deaae465b91c9f65b774ad49cce9e8b8d
This commit is contained in:
matthewjheaney 2010-11-17 14:27:55 -05:00
parent 8db600e1c9
commit 2ce6965b2d
2 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
mkvparser.cpp
View File

@ -2762,22 +2762,10 @@ const BlockEntry* Segment::Seek(
assert(pCluster->GetTime() <= time_ns); assert(pCluster->GetTime() <= time_ns);
{ {
const BlockEntry* const pBlockEntry = pCluster->GetEntry(pTrack); const BlockEntry* const pBE = pCluster->GetEntry(pTrack, time_ns);
if ((pBlockEntry != 0) && !pBlockEntry->EOS()) //found a keyframe if ((pBE != 0) && !pBE->EOS()) //found a keyframe
{ return pBE;
const Block* const pBlock = pBlockEntry->GetBlock();
assert(pBlock);
//NOTE: this isn't necessarily the keyframe we want,
//since there might another keyframe on this same
//cluster with a greater timecode, that is still
//less than the requested time. For now we
//simply return the first keyframe we find.
if (pBlock->GetTime(pCluster) <= time_ns)
return pBlockEntry;
}
} }
const VideoTrack* const pVideo = static_cast<const VideoTrack*>(pTrack); const VideoTrack* const pVideo = static_cast<const VideoTrack*>(pTrack);
@ -4105,7 +4093,9 @@ const BlockEntry* Cluster::GetNext(const BlockEntry* pEntry) const
} }
const BlockEntry* Cluster::GetEntry(const Track* pTrack) const const BlockEntry* Cluster::GetEntry(
const Track* pTrack,
long long time_ns) const
{ {
assert(pTrack); assert(pTrack);
@ -4115,7 +4105,9 @@ const BlockEntry* Cluster::GetEntry(const Track* pTrack) const
LoadBlockEntries(); LoadBlockEntries();
if ((m_entries == NULL) || (m_entriesCount == 0)) if ((m_entries == NULL) || (m_entriesCount == 0))
return NULL; return NULL; //return EOS here?
const BlockEntry* pResult = pTrack->GetEOS();
BlockEntry** i = m_entries; BlockEntry** i = m_entries;
assert(i); assert(i);
@ -4135,10 +4127,27 @@ const BlockEntry* Cluster::GetEntry(const Track* pTrack) const
continue; continue;
if (pTrack->VetEntry(pEntry)) if (pTrack->VetEntry(pEntry))
return pEntry; {
if (time_ns < 0) //just want first candidate block
return pEntry;
const long long ns = pBlock->GetTime(this);
if (ns > time_ns)
break;
pResult = pEntry;
}
else if (time_ns >= 0)
{
const long long ns = pBlock->GetTime(this);
if (ns > time_ns)
break;
}
} }
return pTrack->GetEOS(); //no satisfactory block found return pResult;
} }

2
mkvparser.hpp
View File

@ -473,7 +473,7 @@ public:
const BlockEntry* GetFirst() const; const BlockEntry* GetFirst() const;
const BlockEntry* GetLast() const; const BlockEntry* GetLast() const;
const BlockEntry* GetNext(const BlockEntry*) const; const BlockEntry* GetNext(const BlockEntry*) const;
const BlockEntry* GetEntry(const Track*) const; const BlockEntry* GetEntry(const Track*, long long ns = -1) const;
const BlockEntry* GetEntry( const BlockEntry* GetEntry(
const CuePoint&, const CuePoint&,
const CuePoint::TrackPosition&) const; const CuePoint::TrackPosition&) const;