libwebm: change version to 1.0.0.21

Change-Id: Ic8ef4e8f02a3dc5b07939f0b09903d31dc4a403f

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;
@@ -247,7 +240,11 @@ public:
     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
@@ -273,7 +270,11 @@ 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;
@@ -295,7 +296,11 @@ 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;
@@ -318,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;
@@ -329,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;
@@ -345,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;
@@ -362,22 +388,68 @@ private:
     char* m_pTitleAsUTF8;
 };
 
+
+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
 {
     friend class Cues;
 
-    CuePoint(size_t, long long);
+    CuePoint(long, long long);
     ~CuePoint();
 
     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
     {
@@ -394,7 +466,7 @@ public:
     const TrackPosition* Find(const Track*) const;
 
 private:
-    const size_t m_index;
+    const long m_index;
     long long m_timecode;
     TrackPosition* m_track_positions;
     size_t m_track_positions_count;
@@ -406,7 +478,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&);
@@ -416,6 +493,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,
@@ -439,14 +518,18 @@ public:
                         const CuePoint*,
                         const CuePoint::TrackPosition*) const;
 
+    bool LoadCuePoint() const;
+    long GetCount() const;  //loaded only
+    //long GetTotal() const;  //loaded + preloaded
+    bool DoneParsing() const;
+
 private:
     void Init() const;
-    bool LoadCuePoint() const;
-    void PreloadCuePoint(size_t&, long long) const;
+    void PreloadCuePoint(long&, long long) const;
 
     mutable CuePoint** m_cue_points;
-    mutable size_t m_count;
-    mutable size_t m_preload_count;
+    mutable long m_count;
+    mutable long m_preload_count;
     mutable long long m_pos;
 
 };
@@ -454,6 +537,8 @@ private:
 
 class Cluster
 {
+    friend class Segment;
+
     Cluster(const Cluster&);
     Cluster& operator=(const Cluster&);
 
@@ -461,7 +546,11 @@ public:
     Segment* const m_pSegment;
 
 public:
-    static Cluster* Parse(Segment*, long, 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();
@@ -480,28 +569,59 @@ public:
     const BlockEntry* GetEntry(
         const CuePoint&,
         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;
+
+    //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*, long, long long off);
+    Cluster(
+        Segment*,
+        long index,
+        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;
+    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 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() const;
-    void LoadBlockEntries() const;
-    void ParseBlockGroup(long long, long long, size_t) const;
-    void ParseSimpleBlock(long long, long long, size_t) const;
+    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;
 
 };
 
@@ -530,18 +650,28 @@ public:
     long Load();  //loads headers and all clusters
 
     //for incremental loading
-    long long Unparsed() const;
+    //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();
 
+    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
 
-    Tracks* GetTracks() const;
+    const SeekHead* GetSeekHead() const;
+    const Tracks* GetTracks() const;
     const SegmentInfo* GetInfo() const;
     const Cues* GetCues() const;
 
@@ -555,9 +685,19 @@ public:
     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;
@@ -566,12 +706,16 @@ private:
     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);
-    void ParseSeekEntry(long long pos, long long size);
-    void ParseCues(long long);
+    //void ParseSeekHead(long long pos, long long size);
+    //void ParseSeekEntry(long long pos, long long size);
+    //void ParseCues(long long);
 
     const BlockEntry* GetBlock(
         const CuePoint&,

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();
@@ -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);