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

Merge "mkvparser: Add ReadID."

Browse Source
This commit is contained in:
Tom Finegan
2015-08-26 19:49:11 +00:00
committed by Gerrit Code Review
parent 795fd568b6 23bb18b76d
commit 7f77201dca
2 changed files with 57 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
mkvparser.cpp
View File

@@ -45,22 +45,9 @@ long long mkvparser::ReadUInt(IMkvReader* pReader, long long pos, long& len) {
if (!pReader || pos < 0) if (!pReader || pos < 0)
return E_FILE_FORMAT_INVALID; return E_FILE_FORMAT_INVALID;
int status;
//#ifdef _DEBUG
// long long total, available;
// status = pReader->Length(&total, &available);
// assert(status >= 0);
// assert((total < 0) || (available <= total));
// assert(pos < available);
// assert((available - pos) >= 1); //assume here max u-int len is 8
//#endif
len = 1; len = 1;
unsigned char b; unsigned char b;
int status = pReader->Read(pos, 1, &b);
status = pReader->Read(pos, 1, &b);
if (status < 0) // error or underflow if (status < 0) // error or underflow
return status; return status;
@@ -78,10 +65,6 @@ long long mkvparser::ReadUInt(IMkvReader* pReader, long long pos, long& len) {
++len; ++len;
} }
//#ifdef _DEBUG
// assert((available - pos) >= len);
//#endif
long long result = b & (~m); long long result = b & (~m);
++pos; ++pos;
@@ -107,6 +90,17 @@ long long mkvparser::ReadUInt(IMkvReader* pReader, long long pos, long& len) {
return result; return result;
} }
long long mkvparser::ReadID(mkvparser::IMkvReader* pReader,
long long pos, long& len) {
const long long id = ReadUInt(pReader, pos, len);
if (id < 0 || len < 1 || len > 4) {
// An ID must be at least 1 byte long, and cannot exceed 4.
// See EBMLMaxIDLength: http://www.matroska.org/technical/specs/index.html
return E_FILE_FORMAT_INVALID;
}
return id;
}
long long mkvparser::GetUIntLength(IMkvReader* pReader, long long pos, long long mkvparser::GetUIntLength(IMkvReader* pReader, long long pos,
long& len) { long& len) {
if (!pReader || pos < 0) if (!pReader || pos < 0)
@@ -297,11 +291,9 @@ long mkvparser::ParseElementHeader(IMkvReader* pReader, long long& pos,
long len; long len;
id = ReadUInt(pReader, pos, len); id = ReadID(pReader, pos, len);
if (id < 0 || len < 1 || len > 4) if (id < 0)
// An ID must be at least 1 byte long, and cannot exceed 4.
// See EBMLMaxIDLength: http://www.matroska.org/technical/specs/index.html
return E_FILE_FORMAT_INVALID; return E_FILE_FORMAT_INVALID;
pos += len; // consume id pos += len; // consume id
@@ -347,8 +339,8 @@ bool mkvparser::Match(IMkvReader* pReader, long long& pos,
long len = 0; long len = 0;
const long long id = ReadUInt(pReader, pos, len); const long long id = ReadID(pReader, pos, len);
if (id < 0 || len < 1 || len > 4 || (available - pos) > len) if (id < 0 || (available - pos) > len)
return false; return false;
if (static_cast<unsigned long>(id) != expected_id) if (static_cast<unsigned long>(id) != expected_id)
@@ -385,8 +377,8 @@ bool mkvparser::Match(IMkvReader* pReader, long long& pos,
return false; return false;
long len = 0; long len = 0;
const long long id = ReadUInt(pReader, pos, len); const long long id = ReadID(pReader, pos, len);
if (id < 0 || len < 1 || len > 4 || (available - pos) > len) if (id < 0 || (available - pos) > len)
return false; return false;
if (static_cast<unsigned long>(id) != expected_id) if (static_cast<unsigned long>(id) != expected_id)
@@ -714,10 +706,10 @@ long long Segment::CreateInstance(IMkvReader* pReader, long long pos,
return pos + len; return pos + len;
const long long idpos = pos; const long long idpos = pos;
const long long id = ReadUInt(pReader, pos, len); const long long id = ReadID(pReader, pos, len);
if (id < 0) // error if (id < 0)
return id; return E_FILE_FORMAT_INVALID;
pos += len; // consume ID pos += len; // consume ID
@@ -836,15 +828,10 @@ long long Segment::ParseHeaders() {
return pos + len; return pos + len;
const long long idpos = pos; const long long idpos = pos;
const long long id = ReadUInt(m_pReader, idpos, len); const long long id = ReadID(m_pReader, idpos, len);
if (id < 0 || len < 1 || len > 4) { if (id < 0)
// TODO(tomfinegan): A helper that is intended for reading IDs would be return E_FILE_FORMAT_INVALID;
// handy; even better if its aware of the max ID size from the EBML
// header. It could easily enforce the rules here, instead of duping this
// check everytime an ID is read.
return id;
}
if (id == 0x0F43B675) // Cluster ID if (id == 0x0F43B675) // Cluster ID
break; break;
@@ -1048,10 +1035,10 @@ long Segment::DoLoadCluster(long long& pos, long& len) {
return E_BUFFER_NOT_FULL; return E_BUFFER_NOT_FULL;
const long long idpos = pos; const long long idpos = pos;
const long long id = ReadUInt(m_pReader, idpos, len); const long long id = ReadID(m_pReader, idpos, len);
if (id < 0) // error (or underflow) if (id < 0)
return static_cast<long>(id); return E_FILE_FORMAT_INVALID;
pos += len; // consume ID pos += len; // consume ID
@@ -1619,7 +1606,7 @@ long Segment::ParseCues(long long off, long long& pos, long& len) {
const long long idpos = pos; const long long idpos = pos;
const long long id = ReadUInt(m_pReader, idpos, len); const long long id = ReadID(m_pReader, idpos, len);
if (id != 0x0C53BB6B) // Cues ID if (id != 0x0C53BB6B) // Cues ID
return E_FILE_FORMAT_INVALID; return E_FILE_FORMAT_INVALID;
@@ -1699,8 +1686,9 @@ bool SeekHead::ParseEntry(IMkvReader* pReader, long long start, long long size_,
// parse the container for the level-1 element ID // parse the container for the level-1 element ID
const long long seekIdId = ReadUInt(pReader, pos, len); const long long seekIdId = ReadID(pReader, pos, len);
// seekIdId; if (seekIdId < 0)
return false;
if (seekIdId != 0x13AB) // SeekID ID if (seekIdId != 0x13AB) // SeekID ID
return false; return false;
@@ -1839,7 +1827,7 @@ bool Cues::Init() const {
long len; long len;
const long long id = ReadUInt(pReader, pos, len); const long long id = ReadID(pReader, pos, len);
if (id < 0 || (pos + len) > stop) { if (id < 0 || (pos + len) > stop) {
return false; return false;
} }
@@ -1919,18 +1907,19 @@ bool Cues::LoadCuePoint() const {
long len; long len;
const long long id = ReadUInt(pReader, m_pos, len); const long long id = ReadID(pReader, m_pos, len);
assert(id >= 0); // TODO if (id < 0 || (m_pos + len) > stop)
assert((m_pos + len) <= stop); return false;
m_pos += len; // consume ID m_pos += len; // consume ID
const long long size = ReadUInt(pReader, m_pos, len); const long long size = ReadUInt(pReader, m_pos, len);
assert(size >= 0); if (size < 0 || (m_pos + len) > stop)
assert((m_pos + len) <= stop); return false;
m_pos += len; // consume Size field m_pos += len; // consume Size field
assert((m_pos + size) <= stop); if ((m_pos + size) > stop)
return false;
if (id != 0x3B) { // CuePoint ID if (id != 0x3B) { // CuePoint ID
m_pos += size; // consume payload m_pos += size; // consume payload
@@ -1940,12 +1929,11 @@ bool Cues::LoadCuePoint() const {
continue; continue;
} }
assert(m_preload_count > 0); if (m_preload_count < 1)
return false;
CuePoint* const pCP = m_cue_points[m_count]; CuePoint* const pCP = m_cue_points[m_count];
assert(pCP); if (!pCP || (pCP->GetTimeCode() < 0 && (-pCP->GetTimeCode() != idpos)))
assert((pCP->GetTimeCode() >= 0) || (-pCP->GetTimeCode() == idpos));
if (pCP->GetTimeCode() < 0 && (-pCP->GetTimeCode() != idpos))
return false; return false;
if (!pCP->Load(pReader)) { if (!pCP->Load(pReader)) {
@@ -2253,8 +2241,7 @@ bool CuePoint::Load(IMkvReader* pReader) {
{ {
long len; long len;
const long long id = ReadUInt(pReader, pos_, len); const long long id = ReadID(pReader, pos_, len);
assert(id == 0x3B); // CuePoint ID
if (id != 0x3B) if (id != 0x3B)
return false; return false;
@@ -2278,7 +2265,7 @@ bool CuePoint::Load(IMkvReader* pReader) {
while (pos < stop) { while (pos < stop) {
long len; long len;
const long long id = ReadUInt(pReader, pos, len); const long long id = ReadID(pReader, pos, len);
if ((id < 0) || (pos + len > stop)) { if ((id < 0) || (pos + len > stop)) {
return false; return false;
} }
@@ -2324,9 +2311,9 @@ bool CuePoint::Load(IMkvReader* pReader) {
while (pos < stop) { while (pos < stop) {
long len; long len;
const long long id = ReadUInt(pReader, pos, len); const long long id = ReadID(pReader, pos, len);
assert(id >= 0); if (id < 0 || (pos + len) > stop)
assert((pos + len) <= stop); return false;
pos += len; // consume ID pos += len; // consume ID
@@ -2369,7 +2356,7 @@ bool CuePoint::TrackPosition::Parse(IMkvReader* pReader, long long start_,
while (pos < stop) { while (pos < stop) {
long len; long len;
const long long id = ReadUInt(pReader, pos, len); const long long id = ReadID(pReader, pos, len);
if ((id < 0) || ((pos + len) > stop)) { if ((id < 0) || ((pos + len) > stop)) {
return false; return false;
} }
@@ -2525,9 +2512,8 @@ const Cluster* Segment::GetNext(const Cluster* pCurr) {
if (result != 0) if (result != 0)
return NULL; return NULL;
const long long id = ReadUInt(m_pReader, pos, len); const long long id = ReadID(m_pReader, pos, len);
assert(id == 0x0F43B675); // Cluster ID if (id != 0x0F43B675) // Cluster ID
if (id != 0x0F43B675)
return NULL; return NULL;
pos += len; // consume ID pos += len; // consume ID
@@ -2562,8 +2548,9 @@ const Cluster* Segment::GetNext(const Cluster* pCurr) {
const long long idpos = pos; // pos of next (potential) cluster const long long idpos = pos; // pos of next (potential) cluster
const long long id = ReadUInt(m_pReader, idpos, len); const long long id = ReadID(m_pReader, idpos, len);
assert(id > 0); // TODO if (id < 0)
return NULL;
pos += len; // consume ID pos += len; // consume ID
@@ -6856,9 +6843,9 @@ long Cluster::CreateBlockGroup(long long start_offset, long long size,
while (pos < stop) { while (pos < stop) {
long len; long len;
const long long id = ReadUInt(pReader, pos, len); const long long id = ReadID(pReader, pos, len);
assert(id >= 0); // TODO if (id < 0 || (pos + len) > stop)
assert((pos + len) <= stop); return E_FILE_FORMAT_INVALID;
pos += len; // consume ID pos += len; // consume ID

1
mkvparser.hpp
View File

@@ -31,6 +31,7 @@ template<typename Type> Type* SafeArrayAlloc(unsigned long long num_elements,
unsigned long long element_size); unsigned long long element_size);
long long GetUIntLength(IMkvReader*, long long, long&); long long GetUIntLength(IMkvReader*, long long, long&);
long long ReadUInt(IMkvReader*, long long, long&); long long ReadUInt(IMkvReader*, long long, long&);
long long ReadID(IMkvReader* pReader, long long pos, long& len);
long long UnserializeUInt(IMkvReader*, long long pos, long long size); long long UnserializeUInt(IMkvReader*, long long pos, long long size);
long UnserializeFloat(IMkvReader*, long long pos, long long size, double&); long UnserializeFloat(IMkvReader*, long long pos, long long size, double&);