changed version to 1.0.0.17

Change-Id: I213e1279a25d8b7830e635434723b4770d31662c

mkvparser.hpp

@@ -427,7 +427,7 @@ private:
         IMkvReader*,
         long long pos,
         long long size,
-        Entry*);
+        Entry*&);
 
 };
 
@@ -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
     {
@@ -545,7 +545,7 @@ public:
         Segment*,
         long,
         long long off,
-        long long element_start,
+        //long long element_start,
         long long element_size);
 
     Cluster();  //EndOfStream
@@ -567,11 +567,21 @@ 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;
+
 protected:
     Cluster(
         Segment*,
@@ -586,14 +596,13 @@ public:
     mutable long long m_pos;
     mutable long long m_size;
     const long long m_element_start;
-    const long long m_element_size;
+    mutable long long m_element_size;
 
 private:
     mutable long long m_timecode;
     mutable BlockEntry** m_entries;
     mutable long m_entries_count;
 
-    void LoadBlockEntries() const;
     void ParseBlockGroup(long long, long long, size_t) const;
     void ParseSimpleBlock(long long, long long, size_t) const;
 
@@ -636,10 +645,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;

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