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

mkvparser: Make mkvparser namespace usage uniform.

Browse Source 
Instead of being weird and defining the first few functions
in mkvparser by explicitly prepending the namespace, open the
namespace immediately and define all functions within it.

Change-Id: I9a44a0fda8b04f89c8f874a2a6edc78f1b8e5bcc
This commit is contained in:
Tom Finegan
2015-08-28 14:26:46 -07:00
parent 93b24c4195
commit 0735bb5bdc
1 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
mkvparser.cpp
View File

@@ -19,11 +19,12 @@
#pragma warning(disable : 4996) #pragma warning(disable : 4996)
#endif #endif
mkvparser::IMkvReader::~IMkvReader() {} namespace mkvparser {
template<typename Type> Type* mkvparser::SafeArrayAlloc( IMkvReader::~IMkvReader() {}
unsigned long long num_elements,
unsigned long long element_size) { template<typename Type> Type* SafeArrayAlloc(unsigned long long num_elements,
unsigned long long element_size) {
if (num_elements == 0 || element_size == 0) if (num_elements == 0 || element_size == 0)
return NULL; return NULL;
@@ -35,14 +36,14 @@ template<typename Type> Type* mkvparser::SafeArrayAlloc(
return new (std::nothrow) Type[num_bytes]; return new (std::nothrow) Type[num_bytes];
} }
void mkvparser::GetVersion(int& major, int& minor, int& build, int& revision) { void GetVersion(int& major, int& minor, int& build, int& revision) {
major = 1; major = 1;
minor = 0; minor = 0;
build = 0; build = 0;
revision = 30; revision = 30;
} }
long long mkvparser::ReadUInt(IMkvReader* pReader, long long pos, long& len) { long long 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;
@@ -91,8 +92,7 @@ long long mkvparser::ReadUInt(IMkvReader* pReader, long long pos, long& len) {
return result; return result;
} }
long long mkvparser::ReadID(mkvparser::IMkvReader* pReader, long long ReadID(IMkvReader* pReader, long long pos, long& len) {
long long pos, long& len) {
const long long id = ReadUInt(pReader, pos, len); const long long id = ReadUInt(pReader, pos, len);
if (id < 0 || len < 1 || len > 4) { if (id < 0 || len < 1 || len > 4) {
// An ID must be at least 1 byte long, and cannot exceed 4. // An ID must be at least 1 byte long, and cannot exceed 4.
@@ -102,8 +102,7 @@ long long mkvparser::ReadID(mkvparser::IMkvReader* pReader,
return id; return id;
} }
long long mkvparser::GetUIntLength(IMkvReader* pReader, long long pos, long long GetUIntLength(IMkvReader* pReader, long long pos, long& len) {
long& len) {
if (!pReader || pos < 0) if (!pReader || pos < 0)
return E_FILE_FORMAT_INVALID; return E_FILE_FORMAT_INVALID;
@@ -140,8 +139,7 @@ long long mkvparser::GetUIntLength(IMkvReader* pReader, long long pos,
// TODO(vigneshv): This function assumes that unsigned values never have their // TODO(vigneshv): This function assumes that unsigned values never have their
// high bit set. // high bit set.
long long mkvparser::UnserializeUInt(IMkvReader* pReader, long long pos, long long UnserializeUInt(IMkvReader* pReader, long long pos, long long size) {
long long size) {
if (!pReader || pos < 0 || (size <= 0) || (size > 8)) if (!pReader || pos < 0 || (size <= 0) || (size > 8))
return E_FILE_FORMAT_INVALID; return E_FILE_FORMAT_INVALID;
@@ -164,8 +162,8 @@ long long mkvparser::UnserializeUInt(IMkvReader* pReader, long long pos,
return result; return result;
} }
long mkvparser::UnserializeFloat(IMkvReader* pReader, long long pos, long UnserializeFloat(IMkvReader* pReader, long long pos, long long size_,
long long size_, double& result) { double& result) {
if (!pReader || pos < 0 || ((size_ != 4) && (size_ != 8))) if (!pReader || pos < 0 || ((size_ != 4) && (size_ != 8)))
return E_FILE_FORMAT_INVALID; return E_FILE_FORMAT_INVALID;
@@ -222,8 +220,8 @@ long mkvparser::UnserializeFloat(IMkvReader* pReader, long long pos,
return 0; return 0;
} }
long mkvparser::UnserializeInt(IMkvReader* pReader, long long pos, long UnserializeInt(IMkvReader* pReader, long long pos, long long size,
long long size, long long& result_ref) { long long& result_ref) {
if (!pReader || pos < 0 || size < 1 || size > 8) if (!pReader || pos < 0 || size < 1 || size > 8)
return E_FILE_FORMAT_INVALID; return E_FILE_FORMAT_INVALID;
@@ -254,8 +252,8 @@ long mkvparser::UnserializeInt(IMkvReader* pReader, long long pos,
return 0; return 0;
} }
long mkvparser::UnserializeString(IMkvReader* pReader, long long pos, long UnserializeString(IMkvReader* pReader, long long pos, long long size,
long long size, char*& str) { char*& str) {
delete[] str; delete[] str;
str = NULL; str = NULL;
@@ -284,9 +282,9 @@ long mkvparser::UnserializeString(IMkvReader* pReader, long long pos,
return 0; return 0;
} }
long mkvparser::ParseElementHeader(IMkvReader* pReader, long long& pos, long ParseElementHeader(IMkvReader* pReader, long long& pos,
long long stop, long long& id, long long stop, long long& id,
long long& size) { long long& size) {
if (stop >= 0 && pos >= stop) if (stop >= 0 && pos >= stop)
return E_FILE_FORMAT_INVALID; return E_FILE_FORMAT_INVALID;
@@ -326,8 +324,8 @@ long mkvparser::ParseElementHeader(IMkvReader* pReader, long long& pos,
return 0; // success return 0; // success
} }
bool mkvparser::Match(IMkvReader* pReader, long long& pos, bool Match(IMkvReader* pReader, long long& pos, unsigned long expected_id,
unsigned long expected_id, long long& val) { long long& val) {
if (!pReader || pos < 0) if (!pReader || pos < 0)
return false; return false;
@@ -364,9 +362,8 @@ bool mkvparser::Match(IMkvReader* pReader, long long& pos,
return true; return true;
} }
bool mkvparser::Match(IMkvReader* pReader, long long& pos, bool Match(IMkvReader* pReader, long long& pos, unsigned long expected_id,
unsigned long expected_id, unsigned char*& buf, size_t& buflen) {
unsigned char*& buf, size_t& buflen) {
if (!pReader || pos < 0) if (!pReader || pos < 0)
return false; return false;
@@ -424,8 +421,6 @@ bool mkvparser::Match(IMkvReader* pReader, long long& pos,
return true; return true;
} }
namespace mkvparser {
EBMLHeader::EBMLHeader() : m_docType(NULL) { Init(); } EBMLHeader::EBMLHeader() : m_docType(NULL) { Init(); }
EBMLHeader::~EBMLHeader() { delete[] m_docType; } EBMLHeader::~EBMLHeader() { delete[] m_docType; }