libwebm: change version to 1.0.0.21

Change-Id: Ic8ef4e8f02a3dc5b07939f0b09903d31dc4a403f
libwebm: bad assert in Cluster::GetEntry
2011-03-28 13:04:26 -04:00 · 2011-03-22 14:18:14 -04:00 · 2011-03-19 10:34:12 -04:00 · 2011-03-19 09:54:41 -04:00 · 2011-03-18 21:43:06 -04:00 · 2011-03-18 11:18:46 -04:00
6 changed files with 5966 additions and 1030 deletions
--- a/RELEASE.TXT
+++ b/RELEASE.TXT
@@ -1,3 +1,29 @@
+1.0.0.5
+ * Handled case when no duration
+ * Handled empty clusters
+ * Handled empty clusters when seeking
+ * Implemented check lacing bits
+
+1.0.0.4
+ * Made Cues member variables mutables
+ * Defined against badly-formatted cue points
+ * Segment::GetCluster returns CuePoint too
+ * Separated cue-based searches
+
+1.0.0.3
+ * Added Block::GetOffset() to get a frame's offset in a block
+ * Changed cluster count type from size_t to long
+ * Parsed SeekHead to find cues
+ * Allowed seeking beyond end of cluster cache
+ * Added not to attempt to reparse cues element
+ * Restructured Segment::LoadCluster
+ * Marked position of cues without parsing cues element
+ * Allowed cue points to be loaded incrementally
+ * Implemented to load lazily cue points as they're searched
+ * Merged Cues::LoadCuePoint into Cues::Find
+ * Lazy init cues
+ * Loaded cue point during find
+
 1.0.0.2
 * added support for Cues element
 * seeking was improved
@@ -5,4 +31,4 @@
 1.0.0.1
 * fixed item 141
 * added item 142
- * added this file, RELEASE.TXT, to repository
+ * added this file, RELEASE.TXT, to repository
--- a/mkvparser.cpp
+++ b/mkvparser.cpp
--- a/mkvparser.hpp
+++ b/mkvparser.hpp
@@ -37,7 +37,7 @@ short Unserialize2SInt(IMkvReader*, long long);
 signed char Unserialize1SInt(IMkvReader*, long long);
 bool Match(IMkvReader*, long long&, unsigned long, long long&);
 bool Match(IMkvReader*, long long&, unsigned long, char*&);
-bool Match(IMkvReader*, long long&, unsigned long,unsigned char*&, size_t&);
+bool Match(IMkvReader*, long long&, unsigned long, unsigned char*&, size_t&);
 bool Match(IMkvReader*, long long&, unsigned long, double&);
 bool Match(IMkvReader*, long long&, unsigned long, short&);

@@ -56,6 +56,7 @@ struct EBMLHeader
    long long m_docTypeReadVersion;

    long long Parse(IMkvReader*, long long&);
+    void Init();
 };


@@ -73,22 +74,34 @@ public:
    const long long m_size;

    Block(long long start, long long size, IMkvReader*);
+    ~Block();

    long long GetTrackNumber() const;
-    long long GetTimeCode(Cluster*) const;  //absolute, but not scaled
-    long long GetTime(Cluster*) const;      //absolute, and scaled (ns units)
+    long long GetTimeCode(const Cluster*) const;  //absolute, but not scaled
+    long long GetTime(const Cluster*) const;      //absolute, and scaled (ns)
    bool IsKey() const;
    void SetKey(bool);
+    bool IsInvisible() const;

-    long GetSize() const;
-    long Read(IMkvReader*, unsigned char*) const;
+    int GetFrameCount() const;  //to index frames: [0, count)
+
+    struct Frame
+    {
+        long long pos;  //absolute offset
+        long len;
+
+        long Read(IMkvReader*, unsigned char*) const;
+    };
+
+    const Frame& GetFrame(int frame_index) const;

 private:
    long long m_track;   //Track::Number()
    short m_timecode;  //relative to cluster
    unsigned char m_flags;
-    long long m_frameOff;
-    long m_frameSize;
+
+    Frame* m_frames;
+    int m_frame_count;

 };

@@ -101,10 +114,10 @@ class BlockEntry
 public:
    virtual ~BlockEntry();
    virtual bool EOS() const = 0;
-    virtual Cluster* GetCluster() const = 0;
+    virtual const Cluster* GetCluster() const = 0;
    virtual size_t GetIndex() const = 0;
    virtual const Block* GetBlock() const = 0;
-    virtual bool IsBFrame() const = 0;
+    //virtual bool IsBFrame() const = 0;

 protected:
    BlockEntry();
@@ -121,10 +134,10 @@ public:
    SimpleBlock(Cluster*, size_t, long long start, long long size);

    bool EOS() const;
-    Cluster* GetCluster() const;
+    const Cluster* GetCluster() const;
    size_t GetIndex() const;
    const Block* GetBlock() const;
-    bool IsBFrame() const;
+    //bool IsBFrame() const;

 protected:
    Cluster* const m_pCluster;
@@ -144,10 +157,10 @@ public:
    ~BlockGroup();

    bool EOS() const;
-    Cluster* GetCluster() const;
+    const Cluster* GetCluster() const;
    size_t GetIndex() const;
    const Block* GetBlock() const;
-    bool IsBFrame() const;
+    //bool IsBFrame() const;

    short GetPrevTimeCode() const;  //relative to block's time
    short GetNextTimeCode() const;  //as above
@@ -183,14 +196,18 @@ class Track

 public:
    Segment* const m_pSegment;
+    const long long m_element_start;
+    const long long m_element_size;
    virtual ~Track();

    long long GetType() const;
    long long GetNumber() const;
+    unsigned long long GetUid() const;
    const char* GetNameAsUTF8() const;
    const char* GetCodecNameAsUTF8() const;
    const char* GetCodecId() const;
    const unsigned char* GetCodecPrivate(size_t&) const;
+    bool GetLacing() const;

    const BlockEntry* GetEOS() const;

@@ -204,13 +221,15 @@ public:
    {
        long long type;
        long long number;
-        long long uid;
+        unsigned long long uid;
        char* nameAsUTF8;
        char* codecId;
        unsigned char* codecPrivate;
        size_t codecPrivateSize;
        char* codecNameAsUTF8;
+        bool lacing;
        Settings settings;
+
        Info();
        void Clear();
    };
@@ -218,9 +237,14 @@ public:
    long GetFirst(const BlockEntry*&) const;
    long GetNext(const BlockEntry* pCurr, const BlockEntry*& pNext) const;
    virtual bool VetEntry(const BlockEntry*) const = 0;
+    virtual long Seek(long long time_ns, const BlockEntry*&) const = 0;

 protected:
-    Track(Segment*, const Info&);
+    Track(
+        Segment*,
+        const Info&,
+        long long element_start,
+        long long element_size);
    const Info m_info;

    class EOSBlock : public BlockEntry
@@ -229,7 +253,7 @@ protected:
        EOSBlock();

        bool EOS() const;
-        Cluster* GetCluster() const;
+        const Cluster* GetCluster() const;
        size_t GetIndex() const;
        const Block* GetBlock() const;
        bool IsBFrame() const;
@@ -246,12 +270,17 @@ class VideoTrack : public Track
    VideoTrack& operator=(const VideoTrack&);

 public:
-    VideoTrack(Segment*, const Info&);
+    VideoTrack(
+        Segment*,
+        const Info&,
+        long long element_start,
+        long long element_size);
    long long GetWidth() const;
    long long GetHeight() const;
    double GetFrameRate() const;

    bool VetEntry(const BlockEntry*) const;
+    long Seek(long long time_ns, const BlockEntry*&) const;

 private:
    long long m_width;
@@ -267,11 +296,16 @@ class AudioTrack : public Track
    AudioTrack& operator=(const AudioTrack&);

 public:
-    AudioTrack(Segment*, const Info&);
+    AudioTrack(
+        Segment*,
+        const Info&,
+        long long element_start,
+        long long element_size);
    double GetSamplingRate() const;
    long long GetChannels() const;
    long long GetBitDepth() const;
    bool VetEntry(const BlockEntry*) const;
+    long Seek(long long time_ns, const BlockEntry*&) const;

 private:
    double m_rate;
@@ -289,18 +323,30 @@ public:
    Segment* const m_pSegment;
    const long long m_start;
    const long long m_size;
+    const long long m_element_start;
+    const long long m_element_size;

-    Tracks(Segment*, long long start, long long size);
+    Tracks(
+        Segment*,
+        long long start,
+        long long size,
+        long long element_start,
+        long long element_size);
    virtual ~Tracks();

-    Track* GetTrackByNumber(unsigned long tn) const;
-    Track* GetTrackByIndex(unsigned long idx) const;
+    const Track* GetTrackByNumber(unsigned long tn) const;
+    const Track* GetTrackByIndex(unsigned long idx) const;

 private:
    Track** m_trackEntries;
    Track** m_trackEntriesEnd;

-    void ParseTrackEntry(long long, long long, Track*&);
+    void ParseTrackEntry(
+        long long,
+        long long,
+        Track*&,
+        long long element_start,
+        long long element_size);

 public:
    unsigned long GetTracksCount() const;
@@ -316,9 +362,18 @@ public:
    Segment* const m_pSegment;
    const long long m_start;
    const long long m_size;
+    const long long m_element_start;
+    const long long m_element_size;
+
+    SegmentInfo(
+        Segment*,
+        long long start,
+        long long size,
+        long long element_start,
+        long long element_size);

-    SegmentInfo(Segment*, long long start, long long size);
    ~SegmentInfo();
+
    long long GetTimeCodeScale() const;
    long long GetDuration() const;  //scaled
    const char* GetMuxingAppAsUTF8() const;
@@ -334,16 +389,67 @@ private:
 };


+class SeekHead
+{
+    SeekHead(const SeekHead&);
+    SeekHead& operator=(const SeekHead&);
+
+public:
+    Segment* const m_pSegment;
+    const long long m_start;
+    const long long m_size;
+    const long long m_element_start;
+    const long long m_element_size;
+
+    SeekHead(
+        Segment*,
+        long long start,
+        long long size,
+        long long element_start,
+        long long element_size);
+
+    ~SeekHead();
+
+    struct Entry
+    {
+        long long id;
+        long long pos;
+    };
+
+    int GetCount() const;
+    const Entry* GetEntry(int idx) const;
+
+private:
+    Entry* m_entries;
+    int m_count;
+
+    static void ParseEntry(
+        IMkvReader*,
+        long long pos,
+        long long size,
+        Entry*&);
+
+};
+
+class Cues;
 class CuePoint
 {
-public:
-    CuePoint();
+    friend class Cues;
+
+    CuePoint(long, long long);
    ~CuePoint();

-    void Parse(IMkvReader*, long long start, long long size);
+    CuePoint(const CuePoint&);
+    CuePoint& operator=(const CuePoint&);
+
+public:
+    long long m_element_start;
+    long long m_element_size;
+
+    void Load(IMkvReader*);

    long long GetTimeCode() const;      //absolute but unscaled
-    long long GetTime(Segment*) const;  //absolute and scaled (ns units)
+    long long GetTime(const Segment*) const;  //absolute and scaled (ns units)

    struct TrackPosition
    {
@@ -360,6 +466,7 @@ public:
    const TrackPosition* Find(const Track*) const;

 private:
+    const long m_index;
    long long m_timecode;
    TrackPosition* m_track_positions;
    size_t m_track_positions_count;
@@ -369,6 +476,16 @@ private:

 class Cues
 {
+    friend class Segment;
+
+    Cues(
+        Segment*,
+        long long start,
+        long long size,
+        long long element_start,
+        long long element_size);
+    ~Cues();
+
    Cues(const Cues&);
    Cues& operator=(const Cues&);

@@ -376,9 +493,8 @@ public:
    Segment* const m_pSegment;
    const long long m_start;
    const long long m_size;
-
-    Cues(Segment*, long long start, long long size);
-    ~Cues();
+    const long long m_element_start;
+    const long long m_element_size;

    bool Find(  //lower bound of time_ns
        long long time_ns,
@@ -386,71 +502,136 @@ public:
        const CuePoint*&,
        const CuePoint::TrackPosition*&) const;

+#if 0
    bool FindNext(  //upper_bound of time_ns
        long long time_ns,
        const Track*,
        const CuePoint*&,
        const CuePoint::TrackPosition*&) const;
+#endif
+
+    const CuePoint* GetFirst() const;
+    const CuePoint* GetLast() const;
+    const CuePoint* GetNext(const CuePoint*) const;
+
+    const BlockEntry* GetBlock(
+                        const CuePoint*,
+                        const CuePoint::TrackPosition*) const;
+
+    bool LoadCuePoint() const;
+    long GetCount() const;  //loaded only
+    //long GetTotal() const;  //loaded + preloaded
+    bool DoneParsing() const;

 private:
-    CuePoint* m_cue_points;
-    size_t m_cue_points_count;
+    void Init() const;
+    void PreloadCuePoint(long&, long long) const;
+
+    mutable CuePoint** m_cue_points;
+    mutable long m_count;
+    mutable long m_preload_count;
+    mutable long long m_pos;

 };


 class Cluster
 {
+    friend class Segment;
+
    Cluster(const Cluster&);
    Cluster& operator=(const Cluster&);

 public:
    Segment* const m_pSegment;
-    const size_t m_index;

 public:
-    static Cluster* Parse(Segment*, size_t, long long off);
+    static Cluster* Create(
+        Segment*,
+        long index,       //index in segment
+        long long off);   //offset relative to segment
+        //long long element_size);

    Cluster();  //EndOfStream
    ~Cluster();

    bool EOS() const;

-    long long GetTimeCode();   //absolute, but not scaled
-    long long GetTime();       //absolute, and scaled (nanosecond units)
-    long long GetFirstTime();  //time (ns) of first (earliest) block
+    long long GetTimeCode() const;   //absolute, but not scaled
+    long long GetTime() const;       //absolute, and scaled (nanosecond units)
+    long long GetFirstTime() const;  //time (ns) of first (earliest) block
+    long long GetLastTime() const;   //time (ns) of last (latest) block

-    const BlockEntry* GetFirst();
-    const BlockEntry* GetLast();
+    const BlockEntry* GetFirst() const;
+    const BlockEntry* GetLast() const;
    const BlockEntry* GetNext(const BlockEntry*) const;
-    const BlockEntry* GetEntry(const Track*);
+    const BlockEntry* GetEntry(const Track*, long long ns = -1) const;
    const BlockEntry* GetEntry(
        const CuePoint&,
-        const CuePoint::TrackPosition&);
-    const BlockEntry* GetMaxKey(const VideoTrack*);
+        const CuePoint::TrackPosition&) const;
+    //const BlockEntry* GetMaxKey(const VideoTrack*) const;
+
+//    static bool HasBlockEntries(const Segment*, long long);
+
+    static long HasBlockEntries(
+            const Segment*,
+            long long idoff,
+            long long& pos,
+            long& size);
+
+    long GetEntryCount() const;
+
+    //void Load() const;
+    long Load(long long& pos, long& size) const;
+
+    //void LoadBlockEntries() const;
+
+    long Parse(long long& pos, long& size) const;
+    long GetEntry(long index, const mkvparser::BlockEntry*&) const;

 protected:
-    Cluster(Segment*, size_t, long long off);
+    Cluster(
+        Segment*,
+        long index,
+        long long element_start);
+        //long long element_size);

 public:
-    long long m_pos;
-    long long m_size;
+    const long long m_element_start;
+    long long GetPosition() const;  //offset relative to segment
+
+    long GetIndex() const;
+    long long GetElementSize() const;
+    //long long GetPayloadSize() const;
+
+    //long long Unparsed() const;

 private:
-    long long m_timecode;
-    BlockEntry** m_pEntries;
-    size_t m_entriesCount;
+    long m_index;
+    mutable long long m_pos;
+    //mutable long long m_size;
+    mutable long long m_element_size;
+    mutable long long m_timecode;
+    mutable BlockEntry** m_entries;
+    mutable long m_entries_size;
+    mutable long m_entries_count;

-    void Load();
-    void LoadBlockEntries();
-    void ParseBlockGroup(long long, long long, size_t);
-    void ParseSimpleBlock(long long, long long, size_t);
+    long ParseSimpleBlock(long long, long long&, long&) const;
+    long ParseBlockGroup(long long, long long&, long&) 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;

 };


 class Segment
 {
+    friend class Cues;
+    friend class VideoTrack;
+    friend class AudioTrack;
+
    Segment(const Segment&);
    Segment& operator=(const Segment&);

@@ -466,62 +647,90 @@ public:
    static long long CreateInstance(IMkvReader*, long long, Segment*&);
    ~Segment();

-    //for big-bang loading (source filter)
-    long Load();
+    long Load();  //loads headers and all clusters

-    //for incremental loading (splitter)
-    long long Unparsed() const;
-    long long ParseHeaders();
-    long ParseCluster(Cluster*&, long long& newpos) const;
-    bool AddCluster(Cluster*, long long);
+    //for incremental loading
+    //long long Unparsed() const;
+    bool DoneParsing() const;
+    long long ParseHeaders();  //stops when first cluster is found
+    //long FindNextCluster(long long& pos, long& size) const;
+    long LoadCluster(long long& pos, long& size);  //load one cluster
+    long LoadCluster();

-    Tracks* GetTracks() const;
+    long ParseNext(
+            const Cluster* pCurr,
+            const Cluster*& pNext,
+            long long& pos,
+            long& size);
+
+#if 0
+    //This pair parses one cluster, but only changes the state of the
+    //segment object when the cluster is actually added to the index.
+    long ParseCluster(long long& cluster_pos, long long& new_pos) const;
+    bool AddCluster(long long cluster_pos, long long new_pos);
+#endif
+
+    const SeekHead* GetSeekHead() const;
+    const Tracks* GetTracks() const;
    const SegmentInfo* GetInfo() const;
-    long long GetDuration() const;
-
-    //NOTE: this turned out to be too inefficient.
-    //long long Load(long long time_nanoseconds);
-
-    Cluster* GetFirst();
-    Cluster* GetLast();
-    unsigned long GetCount() const;
-
-    Cluster* GetNext(const Cluster*);
-    Cluster* GetCluster(long long time_nanoseconds);
-
-    void GetCluster(
-        long long time_nanoseconds,
-        Track*,
-        Cluster*&,
-        const BlockEntry*&);
-
    const Cues* GetCues() const;

+    long long GetDuration() const;
+
+    unsigned long GetCount() const;
+    const Cluster* GetFirst() const;
+    const Cluster* GetLast() const;
+    const Cluster* GetNext(const Cluster*);
+
+    const Cluster* FindCluster(long long time_nanoseconds) const;
+    //const BlockEntry* Seek(long long time_nanoseconds, const Track*) const;
+
+    const Cluster* FindOrPreloadCluster(long long pos);
+
+    long ParseCues(
+        long long cues_off,  //offset relative to start of segment
+        long long& parse_pos,
+        long& parse_len);
+
 private:
+
    long long m_pos;  //absolute file posn; what has been consumed so far
+    Cluster* m_pUnknownSize;
+
+    SeekHead* m_pSeekHead;
    SegmentInfo* m_pInfo;
    Tracks* m_pTracks;
    Cues* m_pCues;
    Cluster** m_clusters;
-    size_t m_clusterCount;  //number of entries
-    size_t m_clusterSize;   //array size
+    long m_clusterCount;         //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 DoLoadCluster(long long&, long&);
+    long DoLoadClusterUnknownSize(long long&, long&);
+    long DoParseNext(const Cluster*&, long long&, long&);

    void AppendCluster(Cluster*);
+    void PreloadCluster(Cluster*, ptrdiff_t);

-    //void ParseSeekHead(long long pos, long long size, size_t*);
-    //void ParseSeekEntry(long long pos, long long size, size_t*);
-    //void ParseSecondarySeekHead(long long off, size_t*);
-    void ParseCues(long long off);
+    //void ParseSeekHead(long long pos, long long size);
+    //void ParseSeekEntry(long long pos, long long size);
+    //void ParseCues(long long);

-    bool SearchCues(
-        long long time_ns,
-        Track*,
-        Cluster*&,
-        const BlockEntry*&);
+    const BlockEntry* GetBlock(
+        const CuePoint&,
+        const CuePoint::TrackPosition&);

 };

-
 }  //end namespace mkvparser

+inline long mkvparser::Segment::LoadCluster()
+{
+    long long pos;
+    long size;
+
+    return LoadCluster(pos, size);
+}
+
 #endif  //MKVPARSER_HPP
--- a/mkvparser_2008.vcproj
+++ b/mkvparser_2008.vcproj
@@ -43,13 +43,13 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="true"
+				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
 				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
+				DebugInformationFormat="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
--- a/sample.cpp
+++ b/sample.cpp
@@ -109,22 +109,32 @@ int main(int argc, char* argv[])
    printf("\t\tDuration\t\t: %lld\n", duration_ns);

    const double duration_sec = double(duration_ns) / 1000000000;
-    printf("\t\tDuration(secs)\t\t: %7.3f\n", duration_sec);
+    printf("\t\tDuration(secs)\t\t: %7.3lf\n", duration_sec);

    if (pTitle == NULL)
        printf("\t\tTrack Name\t\t: NULL\n");
    else
+    {
        printf("\t\tTrack Name\t\t: %ls\n", pTitle);
+        delete [] pTitle;
+    }
+

    if (pMuxingApp == NULL)
        printf("\t\tMuxing App\t\t: NULL\n");
    else
+    {
        printf("\t\tMuxing App\t\t: %ls\n", pMuxingApp);
+        delete [] pMuxingApp;
+    }

    if (pWritingApp == NULL)
        printf("\t\tWriting App\t\t: NULL\n");
    else
+    {
        printf("\t\tWriting App\t\t: %ls\n", pWritingApp);
+        delete [] pWritingApp;
+    }

    // pos of segment payload
    printf("\t\tPosition(Segment)\t: %lld\n", pSegment->m_start);
@@ -132,7 +142,7 @@ int main(int argc, char* argv[])
    // size of segment payload
    printf("\t\tSize(Segment)\t\t: %lld\n", pSegment->m_size);

-    mkvparser::Tracks* const pTracks = pSegment->GetTracks();
+    const mkvparser::Tracks* pTracks = pSegment->GetTracks();

    unsigned long i = 0;
    const unsigned long j = pTracks->GetTracksCount();
@@ -148,19 +158,22 @@ int main(int argc, char* argv[])
        if (pTrack == NULL)
            continue;

-        const long long trackType_ = pTrack->GetType();
-        unsigned long trackType = static_cast<unsigned long>(trackType_);
-
-        unsigned long trackNumber = pTrack->GetNumber();
+        const long long trackType = pTrack->GetType();
+        const long long trackNumber = pTrack->GetNumber();
+        const unsigned long long trackUid = pTrack->GetUid();
        const wchar_t* const pTrackName = utf8towcs(pTrack->GetNameAsUTF8());

-        printf("\t\tTrack Type\t\t: %ld\n", trackType);
-        printf("\t\tTrack Number\t\t: %ld\n", trackNumber);
+        printf("\t\tTrack Type\t\t: %lld\n", trackType);
+        printf("\t\tTrack Number\t\t: %lld\n", trackNumber);
+        printf("\t\tTrack Uid\t\t: %lld\n", trackUid);

        if (pTrackName == NULL)
            printf("\t\tTrack Name\t\t: NULL\n");
        else
+        {
            printf("\t\tTrack Name\t\t: %ls \n", pTrackName);
+            delete [] pTrackName;
+        }

        const char* const pCodecId = pTrack->GetCodecId();

@@ -175,7 +188,10 @@ int main(int argc, char* argv[])
        if (pCodecName == NULL)
            printf("\t\tCodec Name\t\t: NULL\n");
        else
+        {
            printf("\t\tCodec Name\t\t: %ls\n", pCodecName);
+            delete [] pCodecName;
+        }

        if (trackType == VIDEO_TRACK)
        {
@@ -220,7 +236,7 @@ int main(int argc, char* argv[])
        return -1;
    }

-    mkvparser::Cluster* pCluster = pSegment->GetFirst();
+    const mkvparser::Cluster* pCluster = pSegment->GetFirst();

    while ((pCluster != NULL) && !pCluster->EOS())
    {
@@ -235,18 +251,26 @@ int main(int argc, char* argv[])
        while ((pBlockEntry != NULL) && !pBlockEntry->EOS())
        {
            const Block* const pBlock  = pBlockEntry->GetBlock();
-            const unsigned long trackNum = pBlock->GetTrackNumber();
-            const Track* const pTrack = pTracks->GetTrackByNumber(trackNum);
+            const long long trackNum = pBlock->GetTrackNumber();
+            const unsigned long tn = static_cast<unsigned long>(trackNum);
+            const Track* const pTrack = pTracks->GetTrackByNumber(tn);
            const long long trackType = pTrack->GetType();
-            const long size = pBlock->GetSize();
+            const int frameCount = pBlock->GetFrameCount();
            const long long time_ns = pBlock->GetTime(pCluster);

-            printf("\t\t\tBlock\t\t:%s,%15ld,%s,%15lld\n",
+            printf("\t\t\tBlock\t\t:%s,%s,%15lld\n",
                   (trackType == VIDEO_TRACK) ? "V" : "A",
-                   size,
                   pBlock->IsKey() ? "I" : "P",
                   time_ns);

+            for (int i = 0; i < frameCount; ++i)
+            {
+                const Block::Frame& theFrame = pBlock->GetFrame(i);
+                const long size = theFrame.len;
+                const long long offset = theFrame.pos;
+                printf("\t\t\t %15ld,%15llx\n", size, offset);
+            }
+
            pBlockEntry = pCluster->GetNext(pBlockEntry);
        }

--- a/sample_2008.vcproj
+++ b/sample_2008.vcproj
@@ -43,13 +43,13 @@
 				Optimization="0"
 				AdditionalIncludeDirectories="..\"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
+				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
 				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
+				DebugInformationFormat="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
Author	SHA1	Message	Date
matthewjheaney	35ded77a23	libwebm: change version to 1.0.0.21 Change-Id: Ic8ef4e8f02a3dc5b07939f0b09903d31dc4a403f	2011-03-28 13:04:26 -04:00
matthewjheaney	1f33611caa	libwebm: bad assert in Cluster::GetEntry Change-Id: I5bcee1f496260416b438a1c2632dd24e8b26eee4	2011-03-22 14:18:14 -04:00
matthewjheaney	70f9644a8d	libwebm: restored Cluster::GetLast Change-Id: I73564fb508e23004392b5aaab1f1ad7cdedc8bb1	2011-03-19 10:34:12 -04:00
matthewjheaney	f2bd78ef6b	libwebm: changed semantics of LoadCuePoint retval Change-Id: Iabbc82b24bde27c06b44b9f9f45e64215b9164c5	2011-03-19 09:54:41 -04:00
matthewjheaney	2083c72300	libwebm: removed LoadBlockEntries Change-Id: I1d65c07d91de568573f48e9fddf83b4c5672871d	2011-03-18 21:43:06 -04:00
matthewjheaney	f5ec272e54	libwebm: removed Cluster::Load (non-incremental) Change-Id: I1f2ad153e0c643d04fa1fe1ec85410bbef1954ef	2011-03-18 11:18:46 -04:00
matthewjheaney	b324e52139	libwebm: handle truncated segment Change-Id: Iddd15a207bce4a2c26f72e5e35f736c1b3f700d7	2011-03-16 15:08:06 -04:00
matthewjheaney	4137f9c999	libwebm: v1.0.0.20 Change-Id: I8a93517762c0edecd59a38e2f4fc99566c7b2de5	2011-03-15 14:27:53 -04:00
matthewjheaney	ba4096f120	libwebm: fixed bug in LoadBlockEntries Change-Id: I4a0870030803bcbb5502800ae5627f716d417440	2011-03-10 15:12:16 -05:00
matthewjheaney	365a39b5ec	libwebm: set version to v1.0.0.19 Change-Id: I5e88dce1c52bc18bdab2063111830b5fbd0faafe	2011-03-09 11:04:21 -05:00
matthewjheaney	601f7903a3	libwebm: block group must parse ref times too Change-Id: Iadf7674dfaf311e04f2eea35fc396e2eaab18163	2011-03-08 21:51:13 -05:00
matthewjheaney	16b2cdaf57	libwebm: changed to version v1.0.0.18 Change-Id: I9f0f0c25fca48cfe18fd16c332bf21265bfef204	2011-03-08 13:13:07 -05:00
matthewjheaney	ca1e6b7323	libwebm: defend against truncated stream Change-Id: I3fb983f9601ac133752fbbdb8bb8b179b18d14fb	2011-03-08 12:25:26 -05:00
matthewjheaney	c226b79e61	libwebm: safer way to handle truncated cluster Change-Id: Ifa9df95fedee14846835c16942a80735e7f3c0ed	2011-03-07 23:44:47 -05:00
matthewjheaney	dc8bdb3389	libwebm: handle EOF in ParseNext Change-Id: I1d93fca0c6ad259e76b79bdba8bb0debdd96bd94	2011-03-07 22:40:00 -05:00
matthewjheaney	31b2d8689c	libwebm: parse unkown cluster size Change-Id: I74f7f552185aafaa4466556644e95c3a25063a08	2011-03-07 21:11:57 -05:00
matthewjheaney	227d62aadf	libwebm: changed type from size_t to long Change-Id: I5a684628119877a2f89116b760a1c7e41716748d	2011-03-02 19:05:28 -05:00
matthewjheaney	85beb00fe3	libwebm: changed idx from size_t to long Change-Id: I7ea9637ab3c55d7535fe9f2fe11fe88f4d47e474	2011-03-02 18:21:21 -05:00
matthewjheaney	eb4bd69098	libwebm: do not lazy-load cue points Change-Id: I07646f1942d1f473f051ff8ab0aa07b2f4381d4c	2011-02-26 16:59:42 -05:00
matthewjheaney	cf36dc2848	libwebm: added Cues::GetCount Change-Id: I5b2bca8fd7229318783d9b97c50a4e20ce2ba640	2011-02-26 11:50:23 -05:00
matthewjheaney	b0465e167e	libwebm: audio track channel count defaults to 1 Change-Id: Id12bec611bd34f299235a278738f3b55cf5a36c5	2011-02-23 13:15:37 -05:00
matthewjheaney	a1aa16692a	libwebm: added support for incremental cluster parsing Change-Id: Idb1bd292a01b7c9971967760ad016691ac628c29	2011-02-22 11:51:23 -05:00
matthewjheaney	f971a94349	changed version to 1.0.0.17 Change-Id: I213e1279a25d8b7830e635434723b4770d31662c	2011-02-14 15:31:38 -05:00
matthewjheaney	5ac9764a95	libwebm: liberalized parsing of next cluster Change-Id: I166ecfb5a76d475b77c3e418c4ae91195ff58d32	2011-02-13 19:00:31 -05:00
matthewjheaney	d82f86a40a	libwebm: handle underflow from IMkvReader::Read Change-Id: I8bb0ed53b7bfdde6c0ed24665591f95d7cf43083	2011-02-10 20:42:52 -05:00
matthewjheaney	a1736157be	libwebm: handle unknown cluster size in Segment::Load too Change-Id: I7ed5feb7fe29cd413c8de35274138605725c5b38	2011-02-10 14:41:54 -05:00
matthewjheaney	2c835bcc28	libwebm: handle (as error) cluster with unknown size Change-Id: I8342d50d0482d77cb895ae659568016eb48ed2be	2011-02-10 13:32:40 -05:00
matthewjheaney	d931a6ecc6	libwebm: set version to 1.0.0.16 Change-Id: Id8f9d8a5d1aa50545c403eb9da04f62347b4604f	2011-02-01 18:49:47 -08:00
matthewjheaney	7a8b013f16	libwebm: handle unknown file length Change-Id: I6ad22ce302e40a4ec882b4f9ac59d5ca7f6489d7	2011-02-01 16:29:02 -08:00
matthewjheaney	a977a2b536	libwebm: changed version to 1.0.0.15 Change-Id: I70c6b22d75defcb11fecbbcd8763659cca7f77e0	2011-01-28 16:56:27 -05:00
matthewjheaney	5e72a2dfc2	libwebm: changed signature of CuePoint::GetTime Change-Id: Ia80da8af5607c7067e848bafd453842cfe8cfcca	2011-01-28 00:52:13 -05:00
matthewjheaney	056b0d96a8	libwebm: changed version to 1.0.0.14 Change-Id: Id8147672e7fb761b2a69ff0d1ec05705e34eefc1	2011-01-26 19:08:43 -05:00
matthewjheaney	dbc58d0510	libwebm: make unserialize operations endian-neutral Change-Id: I0c754ea8192020886dac14e3a0bd6a74c3165a92	2011-01-26 18:50:07 -05:00
matthewjheaney	a131a01446	libwebm: incrementally load block entries Change-Id: I566df5979e7638b6a5411a3338bbb0cf7d9ad111	2011-01-25 23:01:51 -05:00
Hwasoo Lee	b8cb358204	fixed build error in sample Change-Id: Id6ac66f5e625952918857c3e13e655452c32abc8	2011-01-25 11:31:20 -05:00
matthewjheaney	5b06b22b31	libwebm: removed warning in x64 mode Change-Id: I391ad625babdede58c8025b332ee2c949e930454	2011-01-24 22:45:10 -05:00
matthewjheaney	598de03ef3	libwebm: version 1.0.0.13 Change-Id: I6417dfd731604461939a780d0fb411b888ae1d32	2011-01-24 22:40:19 -05:00
matthewjheaney	94f2d589fc	libwebm: tolerate errors in SeekHead element Change-Id: I380f43dd495dc5107f5df37f9d05ff67da4f8424	2011-01-24 20:50:12 -05:00
matthewjheaney	786357a59d	version 1.0.0.12 Supports incremental (partial) loading Supports incremental parsing of Cues element Change-Id: I38ef8dc56b970a7401aa4561197bf93e2df979da	2011-01-22 13:48:09 -05:00
matthewjheaney	6e723319e8	added support for incremental (partial) loading Change-Id: Ic411e6214fdfc3e23a7e3f621f9fb8be0d650d50	2011-01-21 20:04:58 -05:00
matthewjheaney	9911f61616	incrementally parse cue points Change-Id: I83699208eabb2433b25f634927b7c0be8623c3a2	2011-01-19 21:22:37 -05:00
matthewjheaney	b0f96983d2	changed version to 1.0.0.11 Change-Id: I22e85c56a3be07dba0959520a40b341b807f377c	2011-01-14 18:21:35 -05:00
matthewjheaney	6d7732575a	added comment to fix VideoTrack::Seek Change-Id: I2a8b3e4ca92bdfd2d77c84ab970379d22a06e451	2011-01-14 18:17:16 -05:00
matthewjheaney	8081c58b9b	LoadCluster: ensure avail before geting uint len Change-Id: I421501fcd9fdc017eee5307834911fbd18b510b0	2011-01-13 23:30:47 -05:00
matthewjheaney	00aa1804e9	Segment::ParseHeaders return wrong result when underflow Change-Id: Iabdec9c2f062ec2fc6c9edeec208c4efc07c8307	2011-01-13 22:53:54 -05:00
matthewjheaney	bb8dfbe026	Segment::ParseNext is implemented Change-Id: I31100afd4c16c48b366b7a29bec597909f9e2bbc	2011-01-13 15:11:33 -05:00
Hwasoo Lee	b81751642e	initialized members using initialize list of EBMLHeader Change-Id: I5bb46132141d7381dd23e0a3b87a3b6c0e8b7f4b	2011-01-13 15:00:16 -05:00
Hwasoo Lee	3b0f1b6d2b	fixed memory leaks from utf8towcs() Change-Id: I4d35b67da464c073d86f465801f64b15e69a8de2	2011-01-06 15:23:28 -05:00
Frank Galligan	d1aff34626	Added EBML element start and size to Segment Info, Tracks, Track, Cluster, Cues, and CuePoint. The information was needed for some tools bieng worked on. Element start is byte offset of the EMBL ID's first byte. Change-Id: I64e0a48932630e0a5269418f4979487d6d7bce60	2011-01-05 13:57:29 -05:00
matthewjheaney	6623441ee8	changed version to 1.0.0.10 Change-Id: Ib5acbe084dce95b1bb520731015ff345390acad8	2010-12-16 15:13:41 -05:00
matthewjheaney	3ba8df9a64	return invisible flag setting Change-Id: I1953b0a590813302054245b8ceb5430aa1d9d09b	2010-12-14 15:05:35 -05:00
matthewjheaney	bebe4accb8	changed version to 1.0.0.9 Change-Id: Iee4ba7605e191290e99a9424b76e57d6f0e965c2	2010-12-07 13:58:49 -05:00
matthewjheaney	93263f0b4a	return error when no segment id found Change-Id: I291335dc726171f7eb3820b9ade2d261a33500ff	2010-12-03 11:57:53 -05:00
matthewjheaney	e1e757f919	LoadCluster passes back posn and size Change-Id: I91b3c2234f7621139a5cae2d71af7301a30c027e	2010-11-30 12:49:20 -05:00
matthewjheaney	6c45ab2d4c	parse seek head only when source available Change-Id: Iba3b9e46d0cb28fd91a2a7062c6aa4bac3f72c0c	2010-11-29 17:11:38 -05:00
matthewjheaney	cb7b24880f	LoadCluster now checks for underflow Change-Id: I5a1ad57753657f71075d0ad8ca39841e7aae9e57	2010-11-29 16:03:44 -05:00
matthewjheaney	157775ac74	fixed bug: was searching outside array bounds Change-Id: If02466f240dc2a00b2a9a8f75b0ffa27a8984ec0	2010-11-22 16:29:40 -05:00
matthewjheaney	fd1d8006f0	moved seek function from segment to track Change-Id: Ie34549cea4c5d961b6cc04ef229a3eadc1f0ee3b	2010-11-22 15:57:25 -05:00
matthewjheaney	9203d2dcd1	set version to 1.0.0.8 Change-Id: If4bd0d73f72cb819dee9d985fe8f64490c3ab206	2010-11-19 14:55:56 -05:00
matthewjheaney	be2f81abca	filter out empty clusters Change-Id: Iad4da9d55c1cfc332042d0017bd5d77e9ad511b6	2010-11-18 19:28:50 -05:00
matthewjheaney	cb5414a42a	changed semantics of m_entries_count Change-Id: I114b1482239cced838932f35ca4b5ae380f0d022	2010-11-18 17:30:12 -05:00
matthewjheaney	2ce6965b2d	GetEntry now accepts a time Change-Id: I850cfa1deaae465b91c9f65b774ad49cce9e8b8d	2010-11-17 14:27:55 -05:00
Hwasoo Lee	8db600e1c9	handled unknown size of segment for live stream Change-Id: I7dcc08e38c6cd31a55693b39ace414c14399d1b5	2010-11-16 16:17:10 -05:00
Hwasoo Lee	85353469f8	updated the project files Change-Id: Ia949818a03663b4b4e3595e60183213de8e98100	2010-11-16 14:56:55 -05:00
Hwasoo Lee	d97f236f81	fixed the issue 234 Change-Id: Ie527263ae2862426e8c58fce13b34da4c792cc01	2010-11-16 14:54:14 -05:00
matthewjheaney	790f639f2f	ignore empty clusters when getting first block Change-Id: I9278efcacc3ea5dcfa584cb0937e39a4004e6947	2010-11-15 21:22:57 -05:00
matthewjheaney	91dbee4b6e	set version to 1.0.0.7 Change-Id: I09444586c0b1ed6fd5002631a9eece890644d278	2010-11-12 15:01:57 -05:00
matthewjheaney	1e6c5cbaf7	ignore empty clusters when finding next one Change-Id: I7478e6428c8383a1d05a91e9a44b6d1ee1335da7	2010-11-12 13:30:47 -05:00
matthewjheaney	c62b9f8a21	relax block value check Change-Id: Ifaf4cbc4176dde8e2653cb9da9888551a872da7b	2010-11-11 22:30:42 -05:00
Hwasoo Lee	5dd6000dc7	updated to handle a laced webm	2010-11-09 09:54:31 -05:00
Hwasoo Lee	3ea595b132	Merge "Updated RELEASE.TXT"	2010-11-08 14:22:15 -08:00
Ryan Thompson	14e42cf98b	Made getcluster call const As Inherited from the super class this call should also be const.	2010-11-08 16:14:04 -05:00
matthewjheaney	6c9f4d11a1	set version to 1.0.0.6 Change-Id: I259171d7bce7f670cb937707a9864aa0b9eb0d22	2010-11-05 15:21:28 -04:00
matthewjheaney	95c134ad53	ensure const correctness Change-Id: Ia401d66519d1d663e9630ad1e70f18adec0f0bb5	2010-11-04 19:15:16 -04:00
Hwasoo Lee	30bf3472bf	Updated RELEASE.TXT	2010-11-03 13:46:44 -04:00
matthewjheaney	7adec5248a	added lacing support Change-Id: I79ce0b6820f62846b05edbc8a0cb381aa2bc32a6	2010-11-02 11:44:31 -04:00
matthewjheaney	093b78faf2	set version to 1.0.0.5 Change-Id: I3643a0019110b1ff7359a8d414bf0cd2ba9b5d54	2010-10-29 14:31:47 -04:00
matthewjheaney	ed90de0d52	check lacing bits Change-Id: Iaa3a65429b7f3211868a86bbb83ce8018350554a	2010-10-29 14:04:43 -04:00
matthewjheaney	a01e568293	removed IsBFrame selector Change-Id: Iae51165c318997a9131e9af5c667cfac1f37e773	2010-10-28 17:28:59 -04:00
matthewjheaney	d7ce23a019	handle empty clusters when seeking Change-Id: I9bb39ff95e308639402e1c7f9aec59c81350d091	2010-10-28 14:45:27 -04:00
matthewjheaney	acf7ddb273	handle empty clusters Change-Id: I57b085367e1b900acb0ddd6ee419e317f261718a	2010-10-27 16:47:14 -04:00
matthewjheaney	fc12207e15	handle case when no duration Change-Id: I694f6ce6ae9ecc6fc3b90b954dd7041e82fb9ac0	2010-10-22 13:46:39 -04:00
matthewjheaney	c2f6bea0d8	changed version to 1.0.0.4 Change-Id: I8580a5de258d74b6a83505046d014ad9c6abfc23	2010-10-14 19:34:37 -04:00
matthewjheaney	16934eb76f	separate cue-based searches Change-Id: I5d98be1c9c5bc33b4ef216f48de22220f38c0f36	2010-10-13 13:44:13 -04:00
matthewjheaney	9c15c0f40b	Segment::GetCluster returns CuePoint too Change-Id: Id1b865a9efdcee6b6ef68d4fb323da50f1942f2a	2010-10-12 15:29:28 -04:00
matthewjheaney	43f77d54bd	defend against badly-formatted cue points Change-Id: I72bab89f0828b2c5275a4c4b3ac22ee61a173ddf	2010-10-11 19:09:27 -04:00
matthewjheaney	aec650fed7	made Cues member variables mutable Change-Id: I405b845f37c9deaffd67e50752fb9b2aa7124484	2010-10-11 12:59:17 -04:00
matthewjheaney	024ad97571	set version to 1.0.0.3 Change-Id: I629400289383482462dac5d0b00f9f615d83db89	2010-10-08 20:19:47 -04:00
matthewjheaney	8f2a2e04d7	load cue point during find Change-Id: Ied0ea43c85cba47af61c0f60698df18c58389d0c	2010-10-08 20:08:15 -04:00
matthewjheaney	9105d61514	lazy init cues Change-Id: I20e923bcc4be0dd607fb66a63c4f94b96854573e	2010-10-08 19:35:32 -04:00
matthewjheaney	77f61bdd68	merged Cues::LoadCuePoint into Cues::Find Change-Id: I7b90dd076418b75e54b1d77bb4a934220019e9df	2010-10-08 19:06:20 -04:00
matthewjheaney	485b6e8125	lazy load cue points as they're searched Change-Id: Ifa767e579624f4da06670bf791a85cbee4336682	2010-10-08 18:26:44 -04:00
matthewjheaney	1d0c804fb9	allow cue points to be loaded incrementally Change-Id: I6c10647c8885d9dcb0d6cb10dd2d6ba94a04ea38	2010-10-07 19:07:48 -04:00
matthewjheaney	b607880184	mark position of cues without parsing cues element Change-Id: I351ecca9dd82be95f8ef46f967983e612846ce87	2010-10-07 14:33:38 -04:00
matthewjheaney	d2688d316d	restructured Segment::LoadCluster Change-Id: Iaf792807445f3866f4ace4cc5663eb6396ac34be	2010-10-06 12:13:33 -04:00
matthewjheaney	885d2e1ef8	do not attempt to reparse cues element Change-Id: Iebab4960f849fa65ecded360f73c0df8ebac4cc5	2010-10-05 20:42:28 -04:00
matthewjheaney	1cf3a81c78	allow seeking beyond end of cluster cache Change-Id: I254039af3cb72039b5204f52d0dd613f7a47782d	2010-10-05 20:18:19 -04:00
matthewjheaney	6efbd56948	parse SeekHead to find Cues Change-Id: I08334e48c587e08392c29dfa4118eb92eca7c25d	2010-10-05 14:12:15 -04:00
matthewjheaney	f56533b30e	changed cluster count type from size_t to long Change-Id: I1957e20b7f565d8e43ee3f983eaceb67f2ddf3cd	2010-10-04 13:55:03 -04:00
Jeff Koppi	ec2b951a78	Add Block::GetOffset() accessor. Change-Id: I6172c412a8b2b093a365d634e48fcd7a09363111 Added accessor for Block, to query offset value.	2010-10-01 17:21:28 -04:00