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

libwebm: liberalized parsing of next cluster

Browse Source 
Change-Id: I166ecfb5a76d475b77c3e418c4ae91195ff58d32
This commit is contained in:
matthewjheaney
2011-02-13 19:00:31 -05:00
parent d82f86a40a
commit 5ac9764a95
2 changed files with 540 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

751
mkvparser.cpp
View File

File diff suppressed because it is too large Load Diff

18
mkvparser.hpp
View File

@@ -545,7 +545,7 @@ public:
Segment*, Segment*,
long, long,
long long off, long long off,
long long element_start, //long long element_start,
long long element_size); long long element_size);
Cluster(); //EndOfStream Cluster(); //EndOfStream
@@ -567,12 +567,20 @@ public:
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(
const Segment*,
long long idoff,
long long& pos,
long& size);
long GetEntryCount() const; long GetEntryCount() const;
void Load() const; void Load() const;
long Load(long long& pos, long& size) const;
void LoadBlockEntries() const; void LoadBlockEntries() const;
long LoadBlockEntries(long long& pos, long& size) const;
protected: protected:
Cluster( Cluster(
@@ -588,7 +596,7 @@ public:
mutable long long m_pos; mutable long long m_pos;
mutable long long m_size; mutable long long m_size;
const long long m_element_start; const long long m_element_start;
const long long m_element_size; mutable long long m_element_size;
private: private:
mutable long long m_timecode; mutable long long m_timecode;
@@ -637,10 +645,12 @@ public:
long long& pos, long long& pos,
long& size); long& size);
#if 0
//This pair parses one cluster, but only changes the state of the //This pair parses one cluster, but only changes the state of the
//segment object when the cluster is actually added to the index. //segment object when the cluster is actually added to the index.
long ParseCluster(long long& cluster_pos, long long& new_pos) const; long ParseCluster(long long& cluster_pos, long long& new_pos) const;
bool AddCluster(long long cluster_pos, long long new_pos); bool AddCluster(long long cluster_pos, long long new_pos);
#endif
const SeekHead* GetSeekHead() const; const SeekHead* GetSeekHead() const;
const Tracks* GetTracks() const; const Tracks* GetTracks() const;