changed version to 1.0.0.11

Change-Id: I22e85c56a3be07dba0959520a40b341b807f377c

mkvparser.hpp

@@ -56,6 +56,7 @@ struct EBMLHeader
     long long m_docTypeReadVersion;
 
     long long Parse(IMkvReader*, long long&);
+    void Init();
 };
 
 
@@ -80,6 +81,7 @@ public:
     long long GetTime(const Cluster*) const;      //absolute, and scaled (ns)
     bool IsKey() const;
     void SetKey(bool);
+    bool IsInvisible() const;
 
     int GetFrameCount() const;  //to index frames: [0, count)
 
@@ -91,26 +93,15 @@ public:
         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
 
 };
 
@@ -205,6 +196,8 @@ 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;
@@ -244,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
@@ -272,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;
@@ -293,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;
@@ -315,8 +323,15 @@ 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();
 
     const Track* GetTrackByNumber(unsigned long tn) const;
@@ -326,7 +341,12 @@ 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;
@@ -342,8 +362,15 @@ 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);
+    SegmentInfo(
+        Segment*,
+        long long start,
+        long long size,
+        long long element_start,
+        long long element_size);
     ~SegmentInfo();
     long long GetTimeCodeScale() const;
     long long GetDuration() const;  //scaled
@@ -371,6 +398,9 @@ class 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
@@ -403,7 +433,12 @@ class Cues
 {
     friend class Segment;
 
-    Cues(Segment*, long long start, long long size);
+    Cues(
+        Segment*,
+        long long start,
+        long long size,
+        long long element_start,
+        long long element_size);
     ~Cues();
 
     Cues(const Cues&);
@@ -413,6 +448,8 @@ 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;
 
     bool Find(  //lower bound of time_ns
         long long time_ns,
@@ -458,7 +495,12 @@ public:
     Segment* const m_pSegment;
 
 public:
-    static Cluster* Parse(Segment*, long, long long off);
+    static Cluster* Parse(
+        Segment*,
+        long,
+        long long off,
+        long long element_start,
+        long long element_size);
 
     Cluster();  //EndOfStream
     ~Cluster();
@@ -480,22 +522,29 @@ public:
     const BlockEntry* GetMaxKey(const VideoTrack*) const;
 
     static bool HasBlockEntries(const Segment*, long long);
+    void Load() const;
 
 protected:
-    Cluster(Segment*, long, long long off);
+    Cluster(
+        Segment*,
+        long,
+        long long off,
+        long long element_start,
+        long long element_size);
 
 public:
     //TODO: these should all be private, with public selector functions
     long m_index;
     mutable long long m_pos;
     mutable long long m_size;
+    const long long m_element_start;
+    const long long m_element_size;
 
 private:
     mutable long long m_timecode;
     mutable BlockEntry** m_entries;
     mutable long m_entries_count;
 
-    void Load() const;
     void LoadBlockEntries() const;
     void ParseBlockGroup(long long, long long, size_t) const;
     void ParseSimpleBlock(long long, long long, size_t) const;
@@ -506,6 +555,8 @@ private:
 class Segment
 {
     friend class Cues;
+    friend class VideoTrack;
+    friend class AudioTrack;
 
     Segment(const Segment&);
     Segment& operator=(const Segment&);
@@ -524,10 +575,18 @@ public:
 
     long Load();  //loads headers and all clusters
 
-    //for incremental loading (splitter)
+    //for incremental loading
     long long Unparsed() const;
     long long ParseHeaders();  //stops when first cluster is found
-    long LoadCluster();        //loads one cluster
+    //long FindNextCluster(long long& pos, long& size) const;
+    long LoadCluster(long long& pos, long& size);  //load one cluster
+    long LoadCluster();
+
+    long ParseNext(
+            const Cluster* pCurr,
+            const Cluster*& pNext,
+            long long& pos,
+            long& size);
 
     //This pair parses one cluster, but only changes the state of the
     //segment object when the cluster is actually added to the index.
@@ -546,7 +605,7 @@ public:
     const Cluster* GetNext(const Cluster*);
 
     const Cluster* FindCluster(long long time_nanoseconds) const;
-    const BlockEntry* Seek(long long time_nanoseconds, const Track*) const;
+    //const BlockEntry* Seek(long long time_nanoseconds, const Track*) const;
 
 private:
 
@@ -572,7 +631,14 @@ private:
 
 };
 
-
 }  //end namespace mkvparser
 
+inline long mkvparser::Segment::LoadCluster()
+{
+    long long pos;
+    long size;
+
+    return LoadCluster(pos, size);
+}
+
 #endif  //MKVPARSER_HPP

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);
@@ -153,14 +163,17 @@ int main(int argc, char* argv[])
         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)
         {
@@ -252,7 +268,7 @@ int main(int argc, char* argv[])
                 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);
+                printf("\t\t\t %15ld,%15llx\n", size, offset);
             }
 
             pBlockEntry = pCluster->GetNext(pBlockEntry);