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

clang-format on mkvparser.[ch]pp

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

Change-Id: I459adac3da1496b432b71b3580b4dbd63037df2b
This commit is contained in:
Vignesh Venkatasubramanian
2014-04-14 10:31:50 -07:00
parent c6767b94fd
commit 4df111e60a
2 changed files with 6256 additions and 7653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2607
mkvparser.cpp
View File

File diff suppressed because it is too large Load Diff

296
mkvparser.hpp
View File

@@ -13,17 +13,16 @@
#include <cstdio> #include <cstdio>
#include <cstddef> #include <cstddef>
namespace mkvparser namespace mkvparser {
{
const int E_FILE_FORMAT_INVALID = -2; const int E_FILE_FORMAT_INVALID = -2;
const int E_BUFFER_NOT_FULL = -3; const int E_BUFFER_NOT_FULL = -3;
class IMkvReader class IMkvReader {
{
public: public:
virtual int Read(long long pos, long len, unsigned char* buf) = 0; virtual int Read(long long pos, long len, unsigned char* buf) = 0;
virtual int Length(long long* total, long long* available) = 0; virtual int Length(long long* total, long long* available) = 0;
protected: protected:
virtual ~IMkvReader(); virtual ~IMkvReader();
}; };
@@ -35,26 +34,19 @@ 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&);
long UnserializeInt(IMkvReader*, long long pos, long len, long long& result); long UnserializeInt(IMkvReader*, long long pos, long len, long long& result);
long UnserializeString( long UnserializeString(IMkvReader*, long long pos, long long size, char*& str);
IMkvReader*,
long long pos,
long long size,
char*& str);
long ParseElementHeader( long ParseElementHeader(IMkvReader* pReader,
IMkvReader* pReader,
long long& pos, // consume id and size fields long long& pos, // consume id and size fields
long long stop, // if you know size of element's parent long long stop, // if you know size of element's parent
long long& id, long long& id, long long& size);
long long& size);
bool Match(IMkvReader*, long long&, unsigned long, long long&); bool Match(IMkvReader*, long long&, unsigned long, long long&);
bool Match(IMkvReader*, long long&, unsigned long, unsigned char*&, size_t&); bool Match(IMkvReader*, long long&, unsigned long, unsigned char*&, size_t&);
void GetVersion(int& major, int& minor, int& build, int& revision); void GetVersion(int& major, int& minor, int& build, int& revision);
struct EBMLHeader struct EBMLHeader {
{
EBMLHeader(); EBMLHeader();
~EBMLHeader(); ~EBMLHeader();
long long m_version; long long m_version;
@@ -69,13 +61,11 @@ struct EBMLHeader
void Init(); void Init();
}; };
class Segment; class Segment;
class Track; class Track;
class Cluster; class Cluster;
class Block class Block {
{
Block(const Block&); Block(const Block&);
Block& operator=(const Block&); Block& operator=(const Block&);
@@ -100,8 +90,7 @@ public:
int GetFrameCount() const; // to index frames: [0, count) int GetFrameCount() const; // to index frames: [0, count)
struct Frame struct Frame {
{
long long pos; // absolute offset long long pos; // absolute offset
long len; long len;
@@ -124,9 +113,7 @@ protected:
const long long m_discard_padding; const long long m_discard_padding;
}; };
class BlockEntry {
class BlockEntry
{
BlockEntry(const BlockEntry&); BlockEntry(const BlockEntry&);
BlockEntry& operator=(const BlockEntry&); BlockEntry& operator=(const BlockEntry&);
@@ -147,12 +134,9 @@ public:
protected: protected:
Cluster* const m_pCluster; Cluster* const m_pCluster;
const long m_index; const long m_index;
}; };
class SimpleBlock : public BlockEntry {
class SimpleBlock : public BlockEntry
{
SimpleBlock(const SimpleBlock&); SimpleBlock(const SimpleBlock&);
SimpleBlock& operator=(const SimpleBlock&); SimpleBlock& operator=(const SimpleBlock&);
@@ -165,24 +149,17 @@ public:
protected: protected:
Block m_block; Block m_block;
}; };
class BlockGroup : public BlockEntry {
class BlockGroup : public BlockEntry
{
BlockGroup(const BlockGroup&); BlockGroup(const BlockGroup&);
BlockGroup& operator=(const BlockGroup&); BlockGroup& operator=(const BlockGroup&);
public: public:
BlockGroup( BlockGroup(Cluster*, long index,
Cluster*,
long index,
long long block_start, // absolute pos of block's payload long long block_start, // absolute pos of block's payload
long long block_size, // size of block's payload long long block_size, // size of block's payload
long long prev, long long prev, long long next, long long duration,
long long next,
long long duration,
long long discard_padding); long long discard_padding);
long Parse(); long Parse();
@@ -207,9 +184,7 @@ private:
// compressed with zlib or header stripping. // compressed with zlib or header stripping.
class ContentEncoding { class ContentEncoding {
public: public:
enum { enum { kCTR = 1 };
kCTR = 1
};
ContentEncoding(); ContentEncoding();
~ContentEncoding(); ~ContentEncoding();
@@ -262,8 +237,7 @@ public:
// starting offset of the ContentCompression payload. |size| is the size in // starting offset of the ContentCompression payload. |size| is the size in
// bytes of the ContentCompression payload. |compression| is where the parsed // bytes of the ContentCompression payload. |compression| is where the parsed
// values will be stored. // values will be stored.
long ParseCompressionEntry(long long start, long ParseCompressionEntry(long long start, long long size,
long long size,
IMkvReader* pReader, IMkvReader* pReader,
ContentCompression* compression); ContentCompression* compression);
@@ -279,26 +253,22 @@ public:
// starting offset of the ContentEncAESSettings payload. |size| is the // starting offset of the ContentEncAESSettings payload. |size| is the
// size in bytes of the ContentEncAESSettings payload. |encryption| is // size in bytes of the ContentEncAESSettings payload. |encryption| is
// where the parsed values will be stored. // where the parsed values will be stored.
long ParseContentEncAESSettingsEntry(long long start, long ParseContentEncAESSettingsEntry(long long start, long long size,
long long size,
IMkvReader* pReader, IMkvReader* pReader,
ContentEncAESSettings* aes); ContentEncAESSettings* aes);
// Parses the ContentEncoding element from |pReader|. |start| is the // Parses the ContentEncoding element from |pReader|. |start| is the
// starting offset of the ContentEncoding payload. |size| is the size in // starting offset of the ContentEncoding payload. |size| is the size in
// bytes of the ContentEncoding payload. Returns true on success. // bytes of the ContentEncoding payload. Returns true on success.
long ParseContentEncodingEntry(long long start, long ParseContentEncodingEntry(long long start, long long size,
long long size,
IMkvReader* pReader); IMkvReader* pReader);
// Parses the ContentEncryption element from |pReader|. |start| is the // Parses the ContentEncryption element from |pReader|. |start| is the
// starting offset of the ContentEncryption payload. |size| is the size in // starting offset of the ContentEncryption payload. |size| is the size in
// bytes of the ContentEncryption payload. |encryption| is where the parsed // bytes of the ContentEncryption payload. |encryption| is where the parsed
// values will be stored. // values will be stored.
long ParseEncryptionEntry(long long start, long ParseEncryptionEntry(long long start, long long size,
long long size, IMkvReader* pReader, ContentEncryption* encryption);
IMkvReader* pReader,
ContentEncryption* encryption);
unsigned long long encoding_order() const { return encoding_order_; } unsigned long long encoding_order() const { return encoding_order_; }
unsigned long long encoding_scope() const { return encoding_scope_; } unsigned long long encoding_scope() const { return encoding_scope_; }
@@ -323,26 +293,16 @@ private:
ContentEncoding& operator=(const ContentEncoding&); ContentEncoding& operator=(const ContentEncoding&);
}; };
class Track class Track {
{
Track(const Track&); Track(const Track&);
Track& operator=(const Track&); Track& operator=(const Track&);
public: public:
class Info; class Info;
static long Create( static long Create(Segment*, const Info&, long long element_start,
Segment*, long long element_size, Track*&);
const Info&,
long long element_start,
long long element_size,
Track*&);
enum Type { enum Type { kVideo = 1, kAudio = 2, kSubtitle = 0x11, kMetadata = 0x21 };
kVideo = 1,
kAudio = 2,
kSubtitle = 0x11,
kMetadata = 0x21
};
Segment* const m_pSegment; Segment* const m_pSegment;
const long long m_element_start; const long long m_element_start;
@@ -364,14 +324,12 @@ public:
const BlockEntry* GetEOS() const; const BlockEntry* GetEOS() const;
struct Settings struct Settings {
{
long long start; long long start;
long long size; long long size;
}; };
class Info class Info {
{
public: public:
Info(); Info();
~Info(); ~Info();
@@ -409,15 +367,11 @@ public:
long ParseContentEncodingsEntry(long long start, long long size); long ParseContentEncodingsEntry(long long start, long long size);
protected: protected:
Track( Track(Segment*, long long element_start, long long element_size);
Segment*,
long long element_start,
long long element_size);
Info m_info; Info m_info;
class EOSBlock : public BlockEntry class EOSBlock : public BlockEntry {
{
public: public:
EOSBlock(); EOSBlock();
@@ -432,24 +386,15 @@ private:
ContentEncoding** content_encoding_entries_end_; ContentEncoding** content_encoding_entries_end_;
}; };
class VideoTrack : public Track {
class VideoTrack : public Track
{
VideoTrack(const VideoTrack&); VideoTrack(const VideoTrack&);
VideoTrack& operator=(const VideoTrack&); VideoTrack& operator=(const VideoTrack&);
VideoTrack( VideoTrack(Segment*, long long element_start, long long element_size);
Segment*,
long long element_start,
long long element_size);
public: public:
static long Parse( static long Parse(Segment*, const Info&, long long element_start,
Segment*, long long element_size, VideoTrack*&);
const Info&,
long long element_start,
long long element_size,
VideoTrack*&);
long long GetWidth() const; long long GetWidth() const;
long long GetHeight() const; long long GetHeight() const;
@@ -462,26 +407,17 @@ private:
long long m_width; long long m_width;
long long m_height; long long m_height;
double m_rate; double m_rate;
}; };
class AudioTrack : public Track {
class AudioTrack : public Track
{
AudioTrack(const AudioTrack&); AudioTrack(const AudioTrack&);
AudioTrack& operator=(const AudioTrack&); AudioTrack& operator=(const AudioTrack&);
AudioTrack( AudioTrack(Segment*, long long element_start, long long element_size);
Segment*,
long long element_start,
long long element_size);
public: public:
static long Parse( static long Parse(Segment*, const Info&, long long element_start,
Segment*, long long element_size, AudioTrack*&);
const Info&,
long long element_start,
long long element_size,
AudioTrack*&);
double GetSamplingRate() const; double GetSamplingRate() const;
long long GetChannels() const; long long GetChannels() const;
@@ -493,9 +429,7 @@ private:
long long m_bitDepth; long long m_bitDepth;
}; };
class Tracks {
class Tracks
{
Tracks(const Tracks&); Tracks(const Tracks&);
Tracks& operator=(const Tracks&); Tracks& operator=(const Tracks&);
@@ -506,11 +440,7 @@ public:
const long long m_element_start; const long long m_element_start;
const long long m_element_size; const long long m_element_size;
Tracks( Tracks(Segment*, long long start, long long size, long long element_start,
Segment*,
long long start,
long long size,
long long element_start,
long long element_size); long long element_size);
~Tracks(); ~Tracks();
@@ -526,18 +456,12 @@ private:
Track** m_trackEntries; Track** m_trackEntries;
Track** m_trackEntriesEnd; Track** m_trackEntriesEnd;
long ParseTrackEntry( long ParseTrackEntry(long long payload_start, long long payload_size,
long long payload_start, long long element_start, long long element_size,
long long payload_size,
long long element_start,
long long element_size,
Track*&) const; Track*&) const;
}; };
class Chapters {
class Chapters
{
Chapters(const Chapters&); Chapters(const Chapters&);
Chapters& operator=(const Chapters&); Chapters& operator=(const Chapters&);
@@ -548,12 +472,8 @@ public:
const long long m_element_start; const long long m_element_start;
const long long m_element_size; const long long m_element_size;
Chapters( Chapters(Segment*, long long payload_start, long long payload_size,
Segment*, long long element_start, long long element_size);
long long payload_start,
long long payload_size,
long long element_start,
long long element_size);
~Chapters(); ~Chapters();
@@ -562,17 +482,18 @@ public:
class Atom; class Atom;
class Edition; class Edition;
class Display class Display {
{
friend class Atom; friend class Atom;
Display(); Display();
Display(const Display&); Display(const Display&);
~Display(); ~Display();
Display& operator=(const Display&); Display& operator=(const Display&);
public: public:
const char* GetString() const; const char* GetString() const;
const char* GetLanguage() const; const char* GetLanguage() const;
const char* GetCountry() const; const char* GetCountry() const;
private: private:
void Init(); void Init();
void ShallowCopy(Display&) const; void ShallowCopy(Display&) const;
@@ -584,13 +505,13 @@ public:
char* m_country; char* m_country;
}; };
class Atom class Atom {
{
friend class Edition; friend class Edition;
Atom(); Atom();
Atom(const Atom&); Atom(const Atom&);
~Atom(); ~Atom();
Atom& operator=(const Atom&); Atom& operator=(const Atom&);
public: public:
unsigned long long GetUID() const; unsigned long long GetUID() const;
const char* GetStringUID() const; const char* GetStringUID() const;
@@ -603,6 +524,7 @@ public:
int GetDisplayCount() const; int GetDisplayCount() const;
const Display* GetDisplay(int index) const; const Display* GetDisplay(int index) const;
private: private:
void Init(); void Init();
void ShallowCopy(Atom&) const; void ShallowCopy(Atom&) const;
@@ -623,16 +545,17 @@ public:
int m_displays_count; int m_displays_count;
}; };
class Edition class Edition {
{
friend class Chapters; friend class Chapters;
Edition(); Edition();
Edition(const Edition&); Edition(const Edition&);
~Edition(); ~Edition();
Edition& operator=(const Edition&); Edition& operator=(const Edition&);
public: public:
int GetAtomCount() const; int GetAtomCount() const;
const Atom* GetAtom(int index) const; const Atom* GetAtom(int index) const;
private: private:
void Init(); void Init();
void ShallowCopy(Edition&) const; void ShallowCopy(Edition&) const;
@@ -657,12 +580,9 @@ private:
Edition* m_editions; Edition* m_editions;
int m_editions_size; int m_editions_size;
int m_editions_count; int m_editions_count;
}; };
class SegmentInfo {
class SegmentInfo
{
SegmentInfo(const SegmentInfo&); SegmentInfo(const SegmentInfo&);
SegmentInfo& operator=(const SegmentInfo&); SegmentInfo& operator=(const SegmentInfo&);
@@ -673,12 +593,8 @@ public:
const long long m_element_start; const long long m_element_start;
const long long m_element_size; const long long m_element_size;
SegmentInfo( SegmentInfo(Segment*, long long start, long long size,
Segment*, long long element_start, long long element_size);
long long start,
long long size,
long long element_start,
long long element_size);
~SegmentInfo(); ~SegmentInfo();
@@ -698,9 +614,7 @@ private:
char* m_pTitleAsUTF8; char* m_pTitleAsUTF8;
}; };
class SeekHead {
class SeekHead
{
SeekHead(const SeekHead&); SeekHead(const SeekHead&);
SeekHead& operator=(const SeekHead&); SeekHead& operator=(const SeekHead&);
@@ -711,19 +625,14 @@ public:
const long long m_element_start; const long long m_element_start;
const long long m_element_size; const long long m_element_size;
SeekHead( SeekHead(Segment*, long long start, long long size, long long element_start,
Segment*,
long long start,
long long size,
long long element_start,
long long element_size); long long element_size);
~SeekHead(); ~SeekHead();
long Parse(); long Parse();
struct Entry struct Entry {
{
// the SeekHead entry payload // the SeekHead entry payload
long long id; long long id;
long long pos; long long pos;
@@ -738,8 +647,7 @@ public:
int GetCount() const; int GetCount() const;
const Entry* GetEntry(int idx) const; const Entry* GetEntry(int idx) const;
struct VoidElement struct VoidElement {
{
// absolute pos of Void ID // absolute pos of Void ID
long long element_start; long long element_start;
@@ -757,17 +665,13 @@ private:
VoidElement* m_void_elements; VoidElement* m_void_elements;
int m_void_element_count; int m_void_element_count;
static bool ParseEntry( static bool ParseEntry(IMkvReader*,
IMkvReader*,
long long pos, // payload long long pos, // payload
long long size, long long size, Entry*);
Entry*);
}; };
class Cues; class Cues;
class CuePoint class CuePoint {
{
friend class Cues; friend class Cues;
CuePoint(long, long long); CuePoint(long, long long);
@@ -785,8 +689,7 @@ public:
long long GetTimeCode() const; // absolute but unscaled long long GetTimeCode() const; // absolute but unscaled
long long GetTime(const Segment*) const; // absolute and scaled (ns units) long long GetTime(const Segment*) const; // absolute and scaled (ns units)
struct TrackPosition struct TrackPosition {
{
long long m_track; long long m_track;
long long m_pos; // of cluster long long m_pos; // of cluster
long long m_block; long long m_block;
@@ -804,19 +707,12 @@ private:
long long m_timecode; long long m_timecode;
TrackPosition* m_track_positions; TrackPosition* m_track_positions;
size_t m_track_positions_count; size_t m_track_positions_count;
}; };
class Cues {
class Cues
{
friend class Segment; friend class Segment;
Cues( Cues(Segment*, long long start, long long size, long long element_start,
Segment*,
long long start,
long long size,
long long element_start,
long long element_size); long long element_size);
~Cues(); ~Cues();
@@ -831,9 +727,7 @@ public:
const long long m_element_size; const long long m_element_size;
bool Find( // lower bound of time_ns bool Find( // lower bound of time_ns
long long time_ns, long long time_ns, const Track*, const CuePoint*&,
const Track*,
const CuePoint*&,
const CuePoint::TrackPosition*&) const; const CuePoint::TrackPosition*&) const;
#if 0 #if 0
@@ -848,8 +742,7 @@ public:
const CuePoint* GetLast() const; const CuePoint* GetLast() const;
const CuePoint* GetNext(const CuePoint*) const; const CuePoint* GetNext(const CuePoint*) const;
const BlockEntry* GetBlock( const BlockEntry* GetBlock(const CuePoint*,
const CuePoint*,
const CuePoint::TrackPosition*) const; const CuePoint::TrackPosition*) const;
bool LoadCuePoint() const; bool LoadCuePoint() const;
@@ -865,12 +758,9 @@ private:
mutable long m_count; mutable long m_count;
mutable long m_preload_count; mutable long m_preload_count;
mutable long long m_pos; mutable long long m_pos;
}; };
class Cluster {
class Cluster
{
friend class Segment; friend class Segment;
Cluster(const Cluster&); Cluster(const Cluster&);
@@ -880,8 +770,7 @@ public:
Segment* const m_pSegment; Segment* const m_pSegment;
public: public:
static Cluster* Create( static Cluster* Create(Segment*,
Segment*,
long index, // index in segment long index, // index in segment
long long off); // offset relative to segment long long off); // offset relative to segment
// long long element_size); // long long element_size);
@@ -901,17 +790,13 @@ public:
long GetNext(const BlockEntry* curr, const BlockEntry*& next) const; long GetNext(const BlockEntry* curr, const BlockEntry*& next) const;
const BlockEntry* GetEntry(const Track*, long long ns = -1) const; const BlockEntry* GetEntry(const Track*, long long ns = -1) const;
const BlockEntry* GetEntry( const BlockEntry* GetEntry(const CuePoint&,
const CuePoint&,
const CuePoint::TrackPosition&) const; const CuePoint::TrackPosition&) const;
// const BlockEntry* GetMaxKey(const VideoTrack*) const; // const BlockEntry* GetMaxKey(const VideoTrack*) const;
// static bool HasBlockEntries(const Segment*, long long); // static bool HasBlockEntries(const Segment*, long long);
static long HasBlockEntries( static long HasBlockEntries(const Segment*, long long idoff, long long& pos,
const Segment*,
long long idoff,
long long& pos,
long& size); long& size);
long GetEntryCount() const; long GetEntryCount() const;
@@ -922,10 +807,7 @@ public:
long GetEntry(long index, const mkvparser::BlockEntry*&) const; long GetEntry(long index, const mkvparser::BlockEntry*&) const;
protected: protected:
Cluster( Cluster(Segment*, long index, long long element_start);
Segment*,
long index,
long long element_start);
// long long element_size); // long long element_size);
public: public:
@@ -956,12 +838,9 @@ private:
long CreateBlockGroup(long long start_offset, long long size, long CreateBlockGroup(long long start_offset, long long size,
long long discard_padding); long long discard_padding);
long CreateSimpleBlock(long long, long long); long CreateSimpleBlock(long long, long long);
}; };
class Segment {
class Segment
{
friend class Cues; friend class Cues;
friend class Track; friend class Track;
friend class VideoTrack; friend class VideoTrack;
@@ -970,12 +849,9 @@ class Segment
Segment& operator=(const Segment&); Segment& operator=(const Segment&);
private: private:
Segment( Segment(IMkvReader*, long long elem_start,
IMkvReader*,
long long elem_start,
// long long elem_size, // long long elem_size,
long long pos, long long pos, long long size);
long long size);
public: public:
IMkvReader* const m_pReader; IMkvReader* const m_pReader;
@@ -998,10 +874,7 @@ public:
long LoadCluster(long long& pos, long& size); // load one cluster long LoadCluster(long long& pos, long& size); // load one cluster
long LoadCluster(); long LoadCluster();
long ParseNext( long ParseNext(const Cluster* pCurr, const Cluster*& pNext, long long& pos,
const Cluster* pCurr,
const Cluster*& pNext,
long long& pos,
long& size); long& size);
#if 0 #if 0
@@ -1029,13 +902,10 @@ public:
const Cluster* FindOrPreloadCluster(long long pos); const Cluster* FindOrPreloadCluster(long long pos);
long ParseCues( long ParseCues(long long cues_off, // offset relative to start of segment
long long cues_off, //offset relative to start of segment long long& parse_pos, long& parse_len);
long long& parse_pos,
long& parse_len);
private: private:
long long m_pos; // absolute file posn; what has been consumed so far long long m_pos; // absolute file posn; what has been consumed so far
Cluster* m_pUnknownSize; Cluster* m_pUnknownSize;
@@ -1060,16 +930,12 @@ private:
// void ParseSeekEntry(long long pos, long long size); // void ParseSeekEntry(long long pos, long long size);
// void ParseCues(long long); // void ParseCues(long long);
const BlockEntry* GetBlock( const BlockEntry* GetBlock(const CuePoint&, const CuePoint::TrackPosition&);
const CuePoint&,
const CuePoint::TrackPosition&);
}; };
} // end namespace mkvparser } // end namespace mkvparser
inline long mkvparser::Segment::LoadCluster() inline long mkvparser::Segment::LoadCluster() {
{
long long pos; long long pos;
long size; long size;