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

mkvparser: clang format run

Browse Source 
Change-Id: Ib416e3ea3a955090bf4269113b36e15922107438
This commit is contained in:
Tom Finegan
2016-02-04 09:56:48 -08:00
parent 93c4690449
commit 48b1e9a4a0
2 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
mkvparser.cpp
View File

@@ -38,8 +38,9 @@ inline bool isinf(double val) { return std::isinf(val); }
IMkvReader::~IMkvReader() {} IMkvReader::~IMkvReader() {}
template<typename Type> Type* SafeArrayAlloc(unsigned long long num_elements, template <typename Type>
unsigned long long element_size) { 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;
@@ -350,9 +351,8 @@ long UnserializeString(IMkvReader* pReader, long long pos, long long size,
return 0; return 0;
} }
long ParseElementHeader(IMkvReader* pReader, long long& pos, long ParseElementHeader(IMkvReader* pReader, long long& pos, long long stop,
long long stop, long long& id, 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;
@@ -649,8 +649,8 @@ long long EBMLHeader::Parse(IMkvReader* pReader, long long& pos) {
return E_FILE_FORMAT_INVALID; return E_FILE_FORMAT_INVALID;
// Make sure EBMLMaxIDLength and EBMLMaxSizeLength are valid. // Make sure EBMLMaxIDLength and EBMLMaxSizeLength are valid.
if (m_maxIdLength <= 0 || m_maxIdLength > 4 || if (m_maxIdLength <= 0 || m_maxIdLength > 4 || m_maxSizeLength <= 0 ||
m_maxSizeLength <= 0 || m_maxSizeLength > 8) m_maxSizeLength > 8)
return E_FILE_FORMAT_INVALID; return E_FILE_FORMAT_INVALID;
return 0; return 0;
@@ -2104,8 +2104,8 @@ const CuePoint* Cues::GetLast() const {
} }
const CuePoint* Cues::GetNext(const CuePoint* pCurr) const { const CuePoint* Cues::GetNext(const CuePoint* pCurr) const {
if (pCurr == NULL || pCurr->GetTimeCode() < 0 || if (pCurr == NULL || pCurr->GetTimeCode() < 0 || m_cue_points == NULL ||
m_cue_points == NULL || m_count < 1) { m_count < 1) {
return NULL; return NULL;
} }
@@ -6034,8 +6034,7 @@ long Cluster::Parse(long long& pos, long& len) const {
if (cluster_stop >= 0) { if (cluster_stop >= 0) {
if (block_stop > cluster_stop) { if (block_stop > cluster_stop) {
if (id == mkvmuxer::kMkvBlockGroup || if (id == mkvmuxer::kMkvBlockGroup || id == mkvmuxer::kMkvSimpleBlock) {
id == mkvmuxer::kMkvSimpleBlock) {
return E_FILE_FORMAT_INVALID; return E_FILE_FORMAT_INVALID;
} }
@@ -6187,8 +6186,7 @@ long Cluster::ParseSimpleBlock(long long block_size, long long& pos,
return E_BUFFER_NOT_FULL; return E_BUFFER_NOT_FULL;
} }
status = CreateBlock(mkvmuxer::kMkvSimpleBlock, status = CreateBlock(mkvmuxer::kMkvSimpleBlock, block_start, block_size,
block_start, block_size,
0); // DiscardPadding 0); // DiscardPadding
if (status != 0) if (status != 0)
@@ -6398,8 +6396,8 @@ long Cluster::ParseBlockGroup(long long payload_size, long long& pos,
if (pos != payload_stop) if (pos != payload_stop)
return E_FILE_FORMAT_INVALID; return E_FILE_FORMAT_INVALID;
status = CreateBlock(mkvmuxer::kMkvBlockGroup, status = CreateBlock(mkvmuxer::kMkvBlockGroup, payload_start, payload_size,
payload_start, payload_size, discard_padding); discard_padding);
if (status != 0) if (status != 0)
return status; return status;
@@ -7554,7 +7552,6 @@ long Block::Parse(const Cluster* pCluster) {
if (pf >= pf_end) if (pf >= pf_end)
return E_FILE_FORMAT_INVALID; return E_FILE_FORMAT_INVALID;
const Frame& prev = *pf++; const Frame& prev = *pf++;
assert(prev.len == frame_size); assert(prev.len == frame_size);
if (prev.len != frame_size) if (prev.len != frame_size)

5
mkvparser.hpp
View File

@@ -28,8 +28,9 @@ class IMkvReader {
virtual ~IMkvReader(); virtual ~IMkvReader();
}; };
template<typename Type> Type* SafeArrayAlloc(unsigned long long num_elements, template <typename Type>
unsigned long long element_size); Type* SafeArrayAlloc(unsigned long long num_elements,
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 ReadID(IMkvReader* pReader, long long pos, long& len);