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

libwebm: restored Cluster::GetLast

Browse Source 
Change-Id: I73564fb508e23004392b5aaab1f1ad7cdedc8bb1
This commit is contained in:
matthewjheaney 2011-03-19 10:34:12 -04:00
parent f2bd78ef6b
commit 70f9644a8d
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mkvparser.cpp
View File

@ -7399,7 +7399,6 @@ long long Cluster::GetFirstTime() const
}
#if 0
long long Cluster::GetLastTime() const
{
const BlockEntry* const pEntry = GetLast();
@ -7412,7 +7411,6 @@ long long Cluster::GetLastTime() const
return pBlock->GetTime(this);
}
#endif
void Cluster::CreateBlock(
@ -7545,13 +7543,31 @@ const BlockEntry* Cluster::GetFirst() const
}
#if 0
const BlockEntry* Cluster::GetLast() const
{
#if 0
LoadBlockEntries();
if ((m_entries == NULL) || (m_entries_count <= 0))
return NULL;
#else
for (;;)
{
long long pos;
long len;
const long status = Parse(pos, len);
assert(status >= 0);
if (status != 0) //no new block
break;
}
if (m_entries_count <= 0)
return NULL;
assert(m_entries);
#endif
const long idx = m_entries_count - 1;
@ -7560,7 +7576,6 @@ const BlockEntry* Cluster::GetLast() const
return pLast;
}
#endif
const BlockEntry* Cluster::GetNext(const BlockEntry* pEntry) const

4
mkvparser.hpp
View File

@ -560,10 +560,10 @@ public:
long long GetTimeCode() const; //absolute, but not scaled
long long GetTime() const; //absolute, and scaled (nanosecond units)
long long GetFirstTime() const; //time (ns) of first (earliest) block
//long long GetLastTime() const; //time (ns) of last (latest) block
long long GetLastTime() const; //time (ns) of last (latest) block
const BlockEntry* GetFirst() const;
//const BlockEntry* GetLast() const;
const BlockEntry* GetLast() const;
const BlockEntry* GetNext(const BlockEntry*) const;
const BlockEntry* GetEntry(const Track*, long long ns = -1) const;
const BlockEntry* GetEntry(