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

libwebm: handle negative time for a block

Browse Source 
Change-Id: Iafa0254fb1554621b42635cb99d40b2c0177468f
This commit is contained in:
matthewjheaney
2012-05-03 18:38:55 -04:00
parent 0568dd63a6
commit 9a561ab4dd
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mkvparser.cpp
View File

@@ -7962,7 +7962,6 @@ Cluster::GetEntry(
} }
const long long tc_ = pBlock->GetTimeCode(this); const long long tc_ = pBlock->GetTimeCode(this);
assert(tc_ >= 0);
if (tc_ < tc) if (tc_ < tc)
{ {
@@ -8081,7 +8080,7 @@ SimpleBlock::SimpleBlock(
long SimpleBlock::Parse() long SimpleBlock::Parse()
{ {
return m_block.Parse(m_pCluster->m_pSegment->m_pReader); return m_block.Parse(m_pCluster);
} }
@@ -8116,7 +8115,7 @@ BlockGroup::BlockGroup(
long BlockGroup::Parse() long BlockGroup::Parse()
{ {
const long status = m_block.Parse(m_pCluster->m_pSegment->m_pReader); const long status = m_block.Parse(m_pCluster);
if (status) if (status)
return status; return status;
@@ -8186,9 +8185,14 @@ Block::~Block()
} }
long Block::Parse(IMkvReader* pReader) long Block::Parse(const Cluster* pCluster)
{ {
assert(pReader); if (pCluster == NULL)
return -1;
if (pCluster->m_pSegment == NULL)
return -1;
assert(m_start >= 0); assert(m_start >= 0);
assert(m_size >= 0); assert(m_size >= 0);
assert(m_track <= 0); assert(m_track <= 0);
@@ -8200,6 +8204,8 @@ long Block::Parse(IMkvReader* pReader)
long len; long len;
IMkvReader* const pReader = pCluster->m_pSegment->m_pReader;
m_track = ReadUInt(pReader, pos, len); m_track = ReadUInt(pReader, pos, len);
if (m_track <= 0) if (m_track <= 0)
@@ -8528,7 +8534,6 @@ long long Block::GetTimeCode(const Cluster* pCluster) const
assert(tc0 >= 0); assert(tc0 >= 0);
const long long tc = tc0 + m_timecode; const long long tc = tc0 + m_timecode;
assert(tc >= 0);
return tc; //unscaled timecode units return tc; //unscaled timecode units
} }

2
mkvparser.hpp
View File

@@ -86,7 +86,7 @@ public:
Block(long long start, long long size); Block(long long start, long long size);
~Block(); ~Block();
long Parse(IMkvReader*); long Parse(const Cluster*);
long long GetTrackNumber() const; long long GetTrackNumber() const;
long long GetTimeCode(const Cluster*) const; //absolute, but not scaled long long GetTimeCode(const Cluster*) const; //absolute, but not scaled