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

libwebm: removed old Cluster::Load

Browse Source 
Change-Id: I02448e6c9d5850368282353dba40a549753c26bc
This commit is contained in:
matthewjheaney
2011-04-03 11:25:22 -05:00
parent bd833a82e4
commit 2b84a12da8
2 changed files with 0 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
mkvparser.cpp
View File

@@ -5858,84 +5858,6 @@ long long Cluster::Unparsed() const
#endif #endif
#if 0
void Cluster::Load() const
{
assert(m_pSegment);
assert(m_pos >= m_element_start);
//assert(m_size);
if (m_timecode >= 0) //loaded
return;
assert(m_pos == m_element_start);
IMkvReader* const pReader = m_pSegment->m_pReader;
long len;
const long long id_ = ReadUInt(pReader, m_pos, len);
assert(id_ >= 0);
assert(id_ == 0x0F43B675); //Cluster ID
m_pos += len; //consume id
const long long cluster_size = ReadUInt(pReader, m_pos, len);
assert(cluster_size >= 0); //TODO
const long long unknown_size = (1LL << (7 * len)) - 1;
unknown_size;
assert(cluster_size != unknown_size); //TODO
m_pos += len; //consume size field
const long long stop = m_pos + cluster_size;
const long long element_size = stop - m_element_start;
assert((m_element_size <= 0) || (m_element_size == element_size));
if (m_element_size <= 0)
m_element_size = element_size;
long long timecode = -1;
while (m_pos < stop)
{
if (Match(pReader, m_pos, 0x67, timecode))
break;
else
{
const long long id = ReadUInt(pReader, m_pos, len);
assert(id >= 0); //TODO
assert((m_pos + len) <= stop);
m_pos += len; //consume id
const long long size = ReadUInt(pReader, m_pos, len);
assert(size >= 0); //TODO
assert((m_pos + len) <= stop);
m_pos += len; //consume size
if (id == 0x20) //BlockGroup ID
break;
if (id == 0x23) //SimpleBlock ID
break;
m_pos += size; //consume payload
assert(m_pos <= stop);
}
}
assert(m_pos <= stop);
assert(timecode >= 0);
m_timecode = timecode;
}
#endif
long Cluster::Load(long long& pos, long& len) const long Cluster::Load(long long& pos, long& len) const
{ {
assert(m_pSegment); assert(m_pSegment);

1
mkvparser.hpp
View File

@@ -575,7 +575,6 @@ public:
long GetEntryCount() const; long GetEntryCount() const;
//void Load() const;
long Load(long long& pos, long& size) const; long Load(long long& pos, long& size) const;
long Parse(long long& pos, long& size) const; long Parse(long long& pos, long& size) const;