libwebm: changed version to 1.0.0.14

Change-Id: Id8147672e7fb761b2a69ff0d1ec05705e34eefc1

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
@@ -5,4 +31,4 @@
 1.0.0.1
  * fixed item 141
  * added item 142
- * added this file, RELEASE.TXT, to repository
+ * added this file, RELEASE.TXT, to repository

mkvparser.hpp

@@ -37,7 +37,7 @@ short Unserialize2SInt(IMkvReader*, long long);
 signed char Unserialize1SInt(IMkvReader*, long long);
 bool Match(IMkvReader*, long long&, unsigned long, long long&);
 bool Match(IMkvReader*, long long&, unsigned long, char*&);
-bool Match(IMkvReader*, long long&, unsigned long,unsigned char*&, size_t&);
+bool Match(IMkvReader*, long long&, unsigned long, unsigned char*&, size_t&);
 bool Match(IMkvReader*, long long&, unsigned long, double&);
 bool Match(IMkvReader*, long long&, unsigned long, short&);
 
@@ -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,10 +196,13 @@ 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;
     long long GetNumber() const;
+    unsigned long long GetUid() const;
     const char* GetNameAsUTF8() const;
     const char* GetCodecNameAsUTF8() const;
     const char* GetCodecId() const;
@@ -227,7 +221,7 @@ public:
     {
         long long type;
         long long number;
-        long long uid;
+        unsigned long long uid;
         char* nameAsUTF8;
         char* codecId;
         unsigned char* codecPrivate;
@@ -243,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
@@ -254,7 +253,7 @@ protected:
         EOSBlock();
 
         bool EOS() const;
-        Cluster* GetCluster() const;
+        const Cluster* GetCluster() const;
         size_t GetIndex() const;
         const Block* GetBlock() const;
         bool IsBFrame() const;
@@ -271,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;
@@ -292,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;
@@ -314,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;
@@ -325,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;
@@ -341,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;
@@ -358,6 +388,49 @@ 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
 {
@@ -370,6 +443,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
@@ -402,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&);
@@ -412,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,
@@ -435,9 +518,10 @@ public:
                         const CuePoint*,
                         const CuePoint::TrackPosition*) const;
 
+    bool LoadCuePoint() const;
+
 private:
     void Init() const;
-    bool LoadCuePoint() const;
     void PreloadCuePoint(size_t&, long long) const;
 
     mutable CuePoint** m_cue_points;
@@ -457,7 +541,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();
@@ -472,28 +561,40 @@ public:
     const BlockEntry* GetFirst() const;
     const BlockEntry* GetLast() const;
     const BlockEntry* GetNext(const BlockEntry*) const;
-    const BlockEntry* GetEntry(const Track*) const;
+    const BlockEntry* GetEntry(const Track*, long long ns = -1) const;
     const BlockEntry* GetEntry(
         const CuePoint&,
         const CuePoint::TrackPosition&) const;
     const BlockEntry* GetMaxKey(const VideoTrack*) const;
 
+    static bool HasBlockEntries(const Segment*, long long);
+    long GetEntryCount() const;
+
+    void Load() const;
+    void LoadBlockEntries() const;
+    long LoadBlockEntries(long long& pos, long& size) 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 size_t m_entriesCount;
+    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;
 
@@ -503,6 +604,8 @@ private:
 class Segment
 {
     friend class Cues;
+    friend class VideoTrack;
+    friend class AudioTrack;
 
     Segment(const Segment&);
     Segment& operator=(const Segment&);
@@ -521,17 +624,26 @@ 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.
     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 SeekHead* GetSeekHead() const;
+    const Tracks* GetTracks() const;
     const SegmentInfo* GetInfo() const;
     const Cues* GetCues() const;
 
@@ -543,11 +655,20 @@ 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;
+
+    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
+
+    SeekHead* m_pSeekHead;
     SegmentInfo* m_pInfo;
     Tracks* m_pTracks;
     Cues* m_pCues;
@@ -559,9 +680,9 @@ private:
     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&,
@@ -569,7 +690,14 @@ private:
 
 };
 
-
 }  //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

@@ -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();
@@ -148,19 +158,22 @@ 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 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)
         {
@@ -220,7 +236,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 +251,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,%15llx\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"