libwebm: changed to version v1.0.0.18

Change-Id: I9f0f0c25fca48cfe18fd16c332bf21265bfef204

mkvparser.hpp

@@ -436,7 +436,7 @@ class CuePoint
 {
     friend class Cues;
 
-    CuePoint(size_t, long long);
+    CuePoint(long, long long);
     ~CuePoint();
 
     CuePoint(const CuePoint&);
@@ -449,7 +449,7 @@ public:
     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
     {
@@ -466,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;
@@ -519,14 +519,17 @@ public:
                         const CuePoint::TrackPosition*) const;
 
     bool LoadCuePoint() const;
+    long GetCount() const;  //loaded only
+    //long GetTotal() const;  //loaded + preloaded
+    bool DoneParsing() const;
 
 private:
     void Init() 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 long m_count;
-    mutable size_t m_preload_count;
+    mutable long m_preload_count;
     mutable long long m_pos;
 
 };
@@ -534,6 +537,8 @@ private:
 
 class Cluster
 {
+    friend class Segment;
+
     Cluster(const Cluster&);
     Cluster& operator=(const Cluster&);
 
@@ -541,12 +546,11 @@ public:
     Segment* const m_pSegment;
 
 public:
-    static Cluster* Parse(
+    static Cluster* Create(
         Segment*,
-        long,
+        long index,       //index in segment
-        long long off,
+        long long off);   //offset relative to segment
-        long long element_start,
+        //long long element_size);
-        long long element_size);
 
     Cluster();  //EndOfStream
     ~Cluster();
@@ -567,35 +571,57 @@ public:
         const CuePoint::TrackPosition&) 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 index,
-        long long off,
+        long long element_start);
-        long long element_start,
+        //long long element_size);
-        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;
+    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 LoadBlockEntries() const;
+    long ParseSimpleBlock(long long, long long&, long&) const;
-    void ParseBlockGroup(long long, long long, size_t) const;
+    long ParseBlockGroup(long long, long long&, long&) const;
-    void ParseSimpleBlock(long long, long long, size_t) 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;
 
 };
 
@@ -636,10 +662,12 @@ public:
             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;
@@ -666,6 +694,7 @@ public:
 private:
 
     long long m_pos;  //absolute file posn; what has been consumed so far
+    Cluster* m_pUnknownSize;
 
     SeekHead* m_pSeekHead;
     SegmentInfo* m_pInfo;
@@ -676,6 +705,10 @@ 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);
 

sample.cpp

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