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

clang-format on mkvmuxerutil.[ch]pp

Browse Source 
Conformance of mkvmuxerutil.[ch]pp to Google C++ style guide.

Change-Id: Ib66b73adb2682cd5560f6f363fc04d75ab3815c6
This commit is contained in:
Vignesh Venkatasubramanian
2014-04-14 10:28:59 -07:00
parent fb6b6e6444
commit 9ead078aaf
2 changed files with 63 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
mkvmuxerutil.cpp
View File

@@ -99,7 +99,7 @@ uint64 EbmlElementSize(uint64 type, uint64 value) {
return ebml_size; return ebml_size;
} }
uint64 EbmlElementSize(uint64 type, float /* value */ ) { uint64 EbmlElementSize(uint64 type, float /* value */) {
// Size of EBML ID // Size of EBML ID
uint64 ebml_size = GetUIntSize(type); uint64 ebml_size = GetUIntSize(type);
@@ -322,9 +322,7 @@ bool WriteEbmlElement(IMkvWriter* writer, uint64 type, const char* value) {
return true; return true;
} }
bool WriteEbmlElement(IMkvWriter* writer, bool WriteEbmlElement(IMkvWriter* writer, uint64 type, const uint8* value,
uint64 type,
const uint8* value,
uint64 size) { uint64 size) {
if (!writer || !value || size < 1) if (!writer || !value || size < 1)
return false; return false;
@@ -357,12 +355,8 @@ bool WriteEbmlDateElement(IMkvWriter* writer, uint64 type, int64 value) {
return true; return true;
} }
uint64 WriteSimpleBlock(IMkvWriter* writer, uint64 WriteSimpleBlock(IMkvWriter* writer, const uint8* data, uint64 length,
const uint8* data, uint64 track_number, int64 timecode, uint64 is_key) {
uint64 length,
uint64 track_number,
int64 timecode,
uint64 is_key) {
if (!writer) if (!writer)
return false; return false;
@@ -427,11 +421,8 @@ uint64 WriteSimpleBlock(IMkvWriter* writer,
// Duration size // Duration size
// (duration payload) // (duration payload)
// //
uint64 WriteMetadataBlock(IMkvWriter* writer, uint64 WriteMetadataBlock(IMkvWriter* writer, const uint8* data, uint64 length,
const uint8* data, uint64 track_number, int64 timecode,
uint64 length,
uint64 track_number,
int64 timecode,
uint64 duration) { uint64 duration) {
// We don't backtrack when writing to the stream, so we must // We don't backtrack when writing to the stream, so we must
// pre-compute the BlockGroup size, by summing the sizes of each // pre-compute the BlockGroup size, by summing the sizes of each
@@ -523,47 +514,37 @@ uint64 WriteMetadataBlock(IMkvWriter* writer,
// 1 (Denotes Alpha) // 1 (Denotes Alpha)
// BlockAdditional // BlockAdditional
// Data // Data
uint64 WriteBlockWithAdditional(IMkvWriter* writer, uint64 WriteBlockWithAdditional(IMkvWriter* writer, const uint8* data,
const uint8* data, uint64 length, const uint8* additional,
uint64 length, uint64 additional_length, uint64 add_id,
const uint8* additional, uint64 track_number, int64 timecode,
uint64 additional_length,
uint64 add_id,
uint64 track_number,
int64 timecode,
uint64 is_key) { uint64 is_key) {
if (!data || !additional || length < 1 || additional_length < 1) if (!data || !additional || length < 1 || additional_length < 1)
return 0; return 0;
const uint64 block_payload_size = 4 + length; const uint64 block_payload_size = 4 + length;
const uint64 block_elem_size = EbmlMasterElementSize(kMkvBlock, const uint64 block_elem_size =
block_payload_size) + EbmlMasterElementSize(kMkvBlock, block_payload_size) + block_payload_size;
block_payload_size; const uint64 block_additional_elem_size =
const uint64 block_additional_elem_size = EbmlElementSize(kMkvBlockAdditional, EbmlElementSize(kMkvBlockAdditional, additional, additional_length);
additional,
additional_length);
const uint64 block_addid_elem_size = EbmlElementSize(kMkvBlockAddID, add_id); const uint64 block_addid_elem_size = EbmlElementSize(kMkvBlockAddID, add_id);
const uint64 block_more_payload_size = block_addid_elem_size + const uint64 block_more_payload_size =
block_additional_elem_size; block_addid_elem_size + block_additional_elem_size;
const uint64 block_more_elem_size = EbmlMasterElementSize( const uint64 block_more_elem_size =
kMkvBlockMore, EbmlMasterElementSize(kMkvBlockMore, block_more_payload_size) +
block_more_payload_size) +
block_more_payload_size; block_more_payload_size;
const uint64 block_additions_payload_size = block_more_elem_size; const uint64 block_additions_payload_size = block_more_elem_size;
const uint64 block_additions_elem_size = EbmlMasterElementSize( const uint64 block_additions_elem_size =
kMkvBlockAdditions, EbmlMasterElementSize(kMkvBlockAdditions, block_additions_payload_size) +
block_additions_payload_size) +
block_additions_payload_size; block_additions_payload_size;
const uint64 block_group_payload_size = block_elem_size + const uint64 block_group_payload_size =
block_additions_elem_size; block_elem_size + block_additions_elem_size;
const uint64 block_group_elem_size = EbmlMasterElementSize( const uint64 block_group_elem_size =
kMkvBlockGroup, EbmlMasterElementSize(kMkvBlockGroup, block_group_payload_size) +
block_group_payload_size) +
block_group_payload_size; block_group_payload_size;
if (!WriteEbmlMasterElement(writer, kMkvBlockGroup, if (!WriteEbmlMasterElement(writer, kMkvBlockGroup, block_group_payload_size))
block_group_payload_size))
return 0; return 0;
if (!WriteEbmlMasterElement(writer, kMkvBlock, block_payload_size)) if (!WriteEbmlMasterElement(writer, kMkvBlock, block_payload_size))
@@ -594,8 +575,8 @@ uint64 WriteBlockWithAdditional(IMkvWriter* writer,
if (!WriteEbmlElement(writer, kMkvBlockAddID, add_id)) if (!WriteEbmlElement(writer, kMkvBlockAddID, add_id))
return 0; return 0;
if (!WriteEbmlElement(writer, kMkvBlockAdditional, if (!WriteEbmlElement(writer, kMkvBlockAdditional, additional,
additional, additional_length)) additional_length))
return 0; return 0;
return block_group_elem_size; return block_group_elem_size;
@@ -607,31 +588,25 @@ uint64 WriteBlockWithAdditional(IMkvWriter* writer,
// Block // Block
// Data // Data
// DiscardPadding // DiscardPadding
uint64 WriteBlockWithDiscardPadding(IMkvWriter* writer, uint64 WriteBlockWithDiscardPadding(IMkvWriter* writer, const uint8* data,
const uint8* data, uint64 length, int64 discard_padding,
uint64 length, uint64 track_number, int64 timecode,
int64 discard_padding,
uint64 track_number,
int64 timecode,
uint64 is_key) { uint64 is_key) {
if (!data || length < 1 || discard_padding <= 0) if (!data || length < 1 || discard_padding <= 0)
return 0; return 0;
const uint64 block_payload_size = 4 + length; const uint64 block_payload_size = 4 + length;
const uint64 block_elem_size = EbmlMasterElementSize(kMkvBlock, const uint64 block_elem_size =
block_payload_size) + EbmlMasterElementSize(kMkvBlock, block_payload_size) + block_payload_size;
block_payload_size; const uint64 discard_padding_elem_size =
const uint64 discard_padding_elem_size = EbmlElementSize(kMkvDiscardPadding, EbmlElementSize(kMkvDiscardPadding, discard_padding);
discard_padding); const uint64 block_group_payload_size =
const uint64 block_group_payload_size = block_elem_size + block_elem_size + discard_padding_elem_size;
discard_padding_elem_size; const uint64 block_group_elem_size =
const uint64 block_group_elem_size = EbmlMasterElementSize( EbmlMasterElementSize(kMkvBlockGroup, block_group_payload_size) +
kMkvBlockGroup,
block_group_payload_size) +
block_group_payload_size; block_group_payload_size;
if (!WriteEbmlMasterElement(writer, kMkvBlockGroup, if (!WriteEbmlMasterElement(writer, kMkvBlockGroup, block_group_payload_size))
block_group_payload_size))
return 0; return 0;
if (!WriteEbmlMasterElement(writer, kMkvBlock, block_payload_size)) if (!WriteEbmlMasterElement(writer, kMkvBlock, block_payload_size))
@@ -670,9 +645,9 @@ uint64 WriteVoidElement(IMkvWriter* writer, uint64 size) {
return false; return false;
// Subtract one for the void ID and the coded size. // Subtract one for the void ID and the coded size.
uint64 void_entry_size = size - 1 - GetCodedUIntSize(size-1); uint64 void_entry_size = size - 1 - GetCodedUIntSize(size - 1);
uint64 void_size = EbmlMasterElementSize(kMkvVoid, void_entry_size) + uint64 void_size =
void_entry_size; EbmlMasterElementSize(kMkvVoid, void_entry_size) + void_entry_size;
if (void_size != size) if (void_size != size)
return 0; return 0;
@@ -720,7 +695,7 @@ mkvmuxer::uint64 mkvmuxer::MakeUID(unsigned int* seed) {
for (int i = 0; i < 7; ++i) { // avoid problems with 8-byte values for (int i = 0; i < 7; ++i) { // avoid problems with 8-byte values
uid <<= 8; uid <<= 8;
// TODO(fgalligan): Move random number generation to platform specific code. // TODO(fgalligan): Move random number generation to platform specific code.
#ifdef _MSC_VER #ifdef _MSC_VER
(void)seed; (void)seed;
unsigned int random_value; unsigned int random_value;

42
mkvmuxerutil.hpp
View File

@@ -53,9 +53,7 @@ int32 WriteID(IMkvWriter* writer, uint64 type);
bool WriteEbmlElement(IMkvWriter* writer, uint64 type, uint64 value); bool WriteEbmlElement(IMkvWriter* writer, uint64 type, uint64 value);
bool WriteEbmlElement(IMkvWriter* writer, uint64 type, float value); bool WriteEbmlElement(IMkvWriter* writer, uint64 type, float value);
bool WriteEbmlElement(IMkvWriter* writer, uint64 type, const char* value); bool WriteEbmlElement(IMkvWriter* writer, uint64 type, const char* value);
bool WriteEbmlElement(IMkvWriter* writer, bool WriteEbmlElement(IMkvWriter* writer, uint64 type, const uint8* value,
uint64 type,
const uint8* value,
uint64 size); uint64 size);
bool WriteEbmlDateElement(IMkvWriter* writer, uint64 type, int64 value); bool WriteEbmlDateElement(IMkvWriter* writer, uint64 type, int64 value);
@@ -69,12 +67,8 @@ bool WriteEbmlDateElement(IMkvWriter* writer, uint64 type, int64 value);
// timecode: Relative timecode of the Block. Only values in the // timecode: Relative timecode of the Block. Only values in the
// range [0, 2^15) are permitted. // range [0, 2^15) are permitted.
// is_key: Non-zero value specifies that frame is a key frame. // is_key: Non-zero value specifies that frame is a key frame.
uint64 WriteSimpleBlock(IMkvWriter* writer, uint64 WriteSimpleBlock(IMkvWriter* writer, const uint8* data, uint64 length,
const uint8* data, uint64 track_number, int64 timecode, uint64 is_key);
uint64 length,
uint64 track_number,
int64 timecode,
uint64 is_key);
// Output a metadata keyframe, using a Block Group element. // Output a metadata keyframe, using a Block Group element.
// Inputs: // Inputs:
@@ -86,11 +80,8 @@ uint64 WriteSimpleBlock(IMkvWriter* writer,
// timecode Timecode of frame, relative to cluster timecode. Only // timecode Timecode of frame, relative to cluster timecode. Only
// values in the range [0, 2^15) are permitted. // values in the range [0, 2^15) are permitted.
// duration_timecode Duration of frame, using timecode units. // duration_timecode Duration of frame, using timecode units.
uint64 WriteMetadataBlock(IMkvWriter* writer, uint64 WriteMetadataBlock(IMkvWriter* writer, const uint8* data, uint64 length,
const uint8* data, uint64 track_number, int64 timecode,
uint64 length,
uint64 track_number,
int64 timecode,
uint64 duration_timecode); uint64 duration_timecode);
// Output an Mkv Block with BlockAdditional data. // Output an Mkv Block with BlockAdditional data.
@@ -106,14 +97,10 @@ uint64 WriteMetadataBlock(IMkvWriter* writer,
// timecode: Relative timecode of the Block. Only values in the // timecode: Relative timecode of the Block. Only values in the
// range [0, 2^15) are permitted. // range [0, 2^15) are permitted.
// is_key: Non-zero value specifies that frame is a key frame. // is_key: Non-zero value specifies that frame is a key frame.
uint64 WriteBlockWithAdditional(IMkvWriter* writer, uint64 WriteBlockWithAdditional(IMkvWriter* writer, const uint8* data,
const uint8* data, uint64 length, const uint8* additional,
uint64 length, uint64 additional_length, uint64 add_id,
const uint8* additional, uint64 track_number, int64 timecode,
uint64 additional_length,
uint64 add_id,
uint64 track_number,
int64 timecode,
uint64 is_key); uint64 is_key);
// Output an Mkv Block with a DiscardPadding element. // Output an Mkv Block with a DiscardPadding element.
@@ -127,12 +114,9 @@ uint64 WriteBlockWithAdditional(IMkvWriter* writer,
// timecode: Relative timecode of the Block. Only values in the // timecode: Relative timecode of the Block. Only values in the
// range [0, 2^15) are permitted. // range [0, 2^15) are permitted.
// is_key: Non-zero value specifies that frame is a key frame. // is_key: Non-zero value specifies that frame is a key frame.
uint64 WriteBlockWithDiscardPadding(IMkvWriter* writer, uint64 WriteBlockWithDiscardPadding(IMkvWriter* writer, const uint8* data,
const uint8* data, uint64 length, int64 discard_padding,
uint64 length, uint64 track_number, int64 timecode,
int64 discard_padding,
uint64 track_number,
int64 timecode,
uint64 is_key); uint64 is_key);
// Output a void element. |size| must be the entire size in bytes that will be // Output a void element. |size| must be the entire size in bytes that will be
@@ -148,6 +132,6 @@ void GetVersion(int32* major, int32* minor, int32* build, int32* revision);
// the random-number generator (see POSIX rand_r() for semantics). // the random-number generator (see POSIX rand_r() for semantics).
uint64 MakeUID(unsigned int* seed); uint64 MakeUID(unsigned int* seed);
} //end namespace mkvmuxer } // end namespace mkvmuxer
#endif // MKVMUXERUTIL_HPP #endif // MKVMUXERUTIL_HPP