[vlc-devel] commit: mkv: retrieve 2nd seekhead pos, when parsing first seekhead, and add a debug if an Unknown element was seen there. (Derk-Jan Hartman )

git version control git at videolan.org
Tue Aug 12 10:29:43 CEST 2008


vlc | branch: master | Derk-Jan Hartman <hartman at veda.student.utwente.nl> | Tue Aug 12 10:27:06 2008 +0200| [7758e05fd7397a93d99fa88256b1e84135dedfe8] | committer: Derk-Jan Hartman 

mkv: retrieve 2nd seekhead pos, when parsing first seekhead, and add a debug if an Unknown element was seen there.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7758e05fd7397a93d99fa88256b1e84135dedfe8
---

 modules/demux/mkv.cpp |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp
index b339780..ceaa77a 100644
--- a/modules/demux/mkv.cpp
+++ b/modules/demux/mkv.cpp
@@ -1029,6 +1029,7 @@ public:
         ,i_cues_position(-1)
         ,i_chapters_position(-1)
         ,i_tags_position(-1)
+        ,i_seekhead_position(-1)
         ,cluster(NULL)
         ,i_block_pos(0)
         ,i_cluster_pos(0)
@@ -1113,6 +1114,7 @@ public:
     int64_t                 i_cues_position;
     int64_t                 i_chapters_position;
     int64_t                 i_tags_position;
+    int64_t                 i_seekhead_position;
 
     KaxCluster              *cluster;
     uint64                  i_block_pos;
@@ -1122,7 +1124,7 @@ public:
     KaxPrevUID              *p_prev_segment_uid;
     KaxNextUID              *p_next_segment_uid;
 
-    bool              b_cues;
+    bool                    b_cues;
     int                     i_index;
     int                     i_index_max;
     mkv_index_t             *p_indexes;
@@ -4238,6 +4240,13 @@ void matroska_segment_c::ParseSeekHead( KaxSeekHead *seekhead )
                     msg_Dbg( &sys.demuxer, "|   |   |   = tags at %"PRId64, i_pos );
                     i_tags_position = segment->GetGlobalPosition( i_pos );
                 }
+                else if( id == KaxSeekHead::ClassInfos.GlobalId )
+                {
+                    msg_Dbg( &sys.demuxer, "|   |   |   = seekhead at %"PRId64, i_pos );
+                    i_seekhead_position = segment->GetGlobalPosition( i_pos );
+                }
+                else
+                    msg_Dbg( &sys.demuxer, "|   |   |   = unknown at %"PRId64, i_pos );
             }
         }
         else




More information about the vlc-devel mailing list