changed version to 1.0.0.9

Change-Id: Iee4ba7605e191290e99a9424b76e57d6f0e965c2

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

mkvparser.hpp

@@ -73,22 +73,44 @@ 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);
 
+    int GetFrameCount() const;  //to index frames: [0, count)
+
+    struct Frame
+    {
+        long long pos;  //absolute offset
+        long len;
+
+        long Read(IMkvReader*, unsigned char*) const;
+    };
+
+#if 0
+    long long GetOffset() const;
     long GetSize() const;
     long Read(IMkvReader*, unsigned char*) const;
+#else
+    const Frame& GetFrame(int frame_index) const;
+#endif
 
 private:
     long long m_track;   //Track::Number()
     short m_timecode;  //relative to cluster
     unsigned char m_flags;
+
+#if 0
     long long m_frameOff;
     long m_frameSize;
+#else
+    Frame* m_frames;
+    int m_frame_count;
+#endif
 
 };
 
@@ -101,10 +123,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 +143,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 +166,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
@@ -187,10 +209,12 @@ public:
 
     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 +228,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,6 +244,7 @@ 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&);
@@ -229,7 +256,7 @@ protected:
         EOSBlock();
 
         bool EOS() const;
-        Cluster* GetCluster() const;
+        const Cluster* GetCluster() const;
         size_t GetIndex() const;
         const Block* GetBlock() const;
         bool IsBFrame() const;
@@ -252,6 +279,7 @@ public:
     double GetFrameRate() const;
 
     bool VetEntry(const BlockEntry*) const;
+    long Seek(long long time_ns, const BlockEntry*&) const;
 
 private:
     long long m_width;
@@ -272,6 +300,7 @@ public:
     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;
@@ -293,8 +322,8 @@ public:
     Tracks(Segment*, long long start, long long 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;
@@ -333,14 +362,19 @@ private:
     char* m_pTitleAsUTF8;
 };
 
-
+class Cues;
 class CuePoint
 {
-public:
-    CuePoint();
+    friend class Cues;
+
+    CuePoint(size_t, long long);
     ~CuePoint();
 
-    void Parse(IMkvReader*, long long start, long long size);
+    CuePoint(const CuePoint&);
+    CuePoint& operator=(const CuePoint&);
+
+public:
+    void Load(IMkvReader*);
 
     long long GetTimeCode() const;      //absolute but unscaled
     long long GetTime(Segment*) const;  //absolute and scaled (ns units)
@@ -360,6 +394,7 @@ public:
     const TrackPosition* Find(const Track*) const;
 
 private:
+    const size_t m_index;
     long long m_timecode;
     TrackPosition* m_track_positions;
     size_t m_track_positions_count;
@@ -369,6 +404,11 @@ private:
 
 class Cues
 {
+    friend class Segment;
+
+    Cues(Segment*, long long start, long long size);
+    ~Cues();
+
     Cues(const Cues&);
     Cues& operator=(const Cues&);
 
@@ -377,24 +417,37 @@ public:
     const long long m_start;
     const long long m_size;
 
-    Cues(Segment*, long long start, long long size);
-    ~Cues();
-
     bool Find(  //lower bound of time_ns
         long long time_ns,
         const Track*,
         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;
 
 private:
-    CuePoint* m_cue_points;
-    size_t m_cue_points_count;
+    void Init() const;
+    bool LoadCuePoint() const;
+    void PreloadCuePoint(size_t&, long long) const;
+
+    mutable CuePoint** m_cue_points;
+    mutable size_t m_count;
+    mutable size_t m_preload_count;
+    mutable long long m_pos;
 
 };
 
@@ -406,51 +459,59 @@ class Cluster
 
 public:
     Segment* const m_pSegment;
-    const size_t m_index;
 
 public:
-    static Cluster* Parse(Segment*, size_t, long long off);
+    static Cluster* Parse(Segment*, long, long long off);
 
     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);
 
 protected:
-    Cluster(Segment*, size_t, long long off);
+    Cluster(Segment*, long, long long off);
 
 public:
-    long long m_pos;
-    long long m_size;
+    //TODO: these should all be private, with public selector functions
+    long m_index;
+    mutable long long m_pos;
+    mutable long long m_size;
 
 private:
-    long long m_timecode;
-    BlockEntry** m_pEntries;
-    size_t m_entriesCount;
+    mutable long long m_timecode;
+    mutable BlockEntry** m_entries;
+    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);
+    void Load() const;
+    void LoadBlockEntries() const;
+    void ParseBlockGroup(long long, long long, size_t) const;
+    void ParseSimpleBlock(long long, long long, size_t) const;
 
 };
 
 
 class Segment
 {
+    friend class Cues;
+    friend class VideoTrack;
+    friend class AudioTrack;
+
     Segment(const Segment&);
     Segment& operator=(const Segment&);
 
@@ -466,62 +527,66 @@ 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)
+    //for incremental loading
     long long Unparsed() const;
-    long long ParseHeaders();
-    long ParseCluster(Cluster*&, long long& newpos) const;
-    bool AddCluster(Cluster*, long long);
+    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();
+
+    //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);
 
     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;
+
 private:
+
     long long m_pos;  //absolute file posn; what has been consumed so far
     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
 
     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

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"

sample.cpp

@@ -148,14 +148,14 @@ 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 Uid\t\t: %lld\n", trackUid);
 
         if (pTrackName == NULL)
             printf("\t\tTrack Name\t\t: NULL\n");
@@ -220,7 +220,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 +235,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,%15lx\n", size, offset);
+            }
+
             pBlockEntry = pCluster->GetNext(pBlockEntry);
         }
 

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"