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

libwebm: parse unkown cluster size

Browse Source 
Change-Id: I74f7f552185aafaa4466556644e95c3a25063a08
This commit is contained in:
matthewjheaney
2011-03-05 22:44:27 -05:00
parent 227d62aadf
commit 31b2d8689c
2 changed files with 1194 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1476
mkvparser.cpp
View File

File diff suppressed because it is too large Load Diff

29
mkvparser.hpp
View File

@@ -548,9 +548,9 @@ public:
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);
Cluster(); //EndOfStream Cluster(); //EndOfStream
~Cluster(); ~Cluster();
@@ -593,9 +593,8 @@ protected:
Cluster( Cluster(
Segment*, Segment*,
long index, long index,
//long long off, long long element_start);
long long element_start, //long long element_size);
long long element_size);
public: public:
const long long m_element_start; const long long m_element_start;
@@ -605,21 +604,24 @@ public:
long long GetElementSize() const; long long GetElementSize() const;
//long long GetPayloadSize() const; //long long GetPayloadSize() const;
long long Unparsed() const; //long long Unparsed() const;
private: private:
long m_index; long m_index;
mutable long long m_pos; mutable long long m_pos;
mutable long long m_size; //mutable long long m_size;
mutable long long m_element_size; mutable long long m_element_size;
mutable long long m_timecode; mutable long long m_timecode;
mutable BlockEntry** m_entries; mutable BlockEntry** m_entries;
mutable long m_entries_size; mutable long m_entries_size;
mutable long m_entries_count; mutable long m_entries_count;
void ParseBlock(long long id, long long pos, long long size) const; long ParseSimpleBlock(long long, long long&, long&) const;
void ParseBlockGroup(long long, long long, BlockEntry**&) const; long ParseBlockGroup(long long, long long&, long&) const;
void ParseSimpleBlock(long long, long long, BlockEntry**&) const;
void CreateBlock(long long id, long long pos, long long size) const;
void CreateBlockGroup(long long, long long, BlockEntry**&) const;
void CreateSimpleBlock(long long, long long, BlockEntry**&) const;
}; };
@@ -692,6 +694,7 @@ public:
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;
SeekHead* m_pSeekHead; SeekHead* m_pSeekHead;
SegmentInfo* m_pInfo; SegmentInfo* m_pInfo;
@@ -702,6 +705,10 @@ private:
long m_clusterPreloadCount; //number of entries for which m_index < 0 long m_clusterPreloadCount; //number of entries for which m_index < 0
long m_clusterSize; //array size long m_clusterSize; //array size
long DoLoadCluster(long long&, long&);
long DoLoadClusterUnknownSize(long long&, long&);
long DoParseNext(const Cluster*&, long long&, long&);
void AppendCluster(Cluster*); void AppendCluster(Cluster*);
void PreloadCluster(Cluster*, ptrdiff_t); void PreloadCluster(Cluster*, ptrdiff_t);