<div dir="ltr">Looks like Thunderbird is reformating the text coming from git... Here is the right patch code.<br><br>---<br> modules/demux/mkv/matroska_segment.cpp | 4 ++--<br> modules/demux/mkv/matroska_segment.hpp | 2 +-<br> modules/demux/mkv/matroska_segment_parse.cpp | 4 ++--<br> 3 files changed, 5 insertions(+), 5 deletions(-)<br><br>diff --git a/modules/demux/mkv/matroska_segment.cpp b/modules/demux/mkv/matroska_segment.cpp<br>index 904a12f..76459c9 100644<br>--- a/modules/demux/mkv/matroska_segment.cpp<br>+++ b/modules/demux/mkv/matroska_segment.cpp<br>@@ -706,7 +706,7 @@ bool matroska_segment_c::Preload( )<br> cluster = (KaxCluster*)el;<br> <br> i_cluster_pos = i_start_pos = cluster->GetElementPosition();<br>- ParseCluster( );<br>+ ParseCluster( cluster );<br> <br> ep->Down();<br> /* stop pre-parsing the stream */<br>@@ -887,7 +887,7 @@ void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset, int64_t i_<br> ( i_index > 0 &&<br> p_indexes[i_index - 1].i_position < (int64_t)cluster->GetElementPosition() ) )<br> {<br>- ParseCluster(false);<br>+ ParseCluster( cluster, false, SCOPE_NO_DATA );<br> IndexAppendCluster( cluster );<br> }<br> if( es.I_O().getFilePointer() >= (unsigned) i_global_position )<br>diff --git a/modules/demux/mkv/matroska_segment.hpp b/modules/demux/mkv/matroska_segment.hpp<br>index 9245c58..3ef8e37 100644<br>--- a/modules/demux/mkv/matroska_segment.hpp<br>+++ b/modules/demux/mkv/matroska_segment.hpp<br>@@ -158,7 +158,7 @@ private:<br> void ParseTracks( KaxTracks *tracks );<br> void ParseChapterAtom( int i_level, KaxChapterAtom *ca, chapter_item_c & chapters );<br> void ParseTrackEntry( KaxTrackEntry *m );<br>- void ParseCluster( bool b_update_start_time = true );<br>+ void ParseCluster( KaxCluster *cluster, bool b_update_start_time = true, ScopeMode read_fully = SCOPE_ALL_DATA );<br> SimpleTag * ParseSimpleTags( KaxTagSimple *tag, int level = 50 );<br> void IndexAppendCluster( KaxCluster *cluster );<br> int32_t TrackInit( mkv_track_t * p_tk );<br>diff --git a/modules/demux/mkv/matroska_segment_parse.cpp b/modules/demux/mkv/matroska_segment_parse.cpp<br>index d4a065c..751c824 100644<br>--- a/modules/demux/mkv/matroska_segment_parse.cpp<br>+++ b/modules/demux/mkv/matroska_segment_parse.cpp<br>@@ -1237,7 +1237,7 @@ void matroska_segment_c::ParseChapters( KaxChapters *chapters )<br> }<br> }<br> <br>-void matroska_segment_c::ParseCluster( bool b_update_start_time )<br>+void matroska_segment_c::ParseCluster( KaxCluster *cluster, bool b_update_start_time, ScopeMode read_fully )<br> {<br> EbmlElement *el;<br> EbmlMaster *m;<br>@@ -1252,7 +1252,7 @@ void matroska_segment_c::ParseCluster( bool b_update_start_time )<br> }<br> try<br> {<br>- m->Read( es, EBML_CONTEXT(cluster), i_upper_level, el, true );<br>+ m->Read( es, EBML_CONTEXT(cluster), i_upper_level, el, true, read_fully );<br> }<br> catch(...)<br> {<br>-- <br>1.9.5.msysgit.0<br><br><br></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Feb 20, 2015 at 2:36 PM, Steve Lhomme <span dir="ltr"><<a href="mailto:robux4@gmail.com" target="_blank">robux4@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Also pass the cluster to parse, because I will need this interface change for an upcoming patch.<br>
<br>
---<br>
modules/demux/mkv/matroska_<u></u>segment.cpp | 4 ++--<br>
modules/demux/mkv/matroska_<u></u>segment.hpp | 2 +-<br>
modules/demux/mkv/matroska_<u></u>segment_parse.cpp | 4 ++--<br>
3 files changed, 5 insertions(+), 5 deletions(-)<br>
<br>
diff --git a/modules/demux/mkv/matroska_<u></u>segment.cpp b/modules/demux/mkv/matroska_<u></u>segment.cpp<br>
index 904a12f..76459c9 100644<br>
--- a/modules/demux/mkv/matroska_<u></u>segment.cpp<br>
+++ b/modules/demux/mkv/matroska_<u></u>segment.cpp<br>
@@ -706,7 +706,7 @@ bool matroska_segment_c::Preload( )<br>
cluster = (KaxCluster*)el;<br>
<br>
i_cluster_pos = i_start_pos = cluster->GetElementPosition();<br>
- ParseCluster( );<br>
+ ParseCluster( cluster );<br>
<br>
ep->Down();<br>
/* stop pre-parsing the stream */<br>
@@ -887,7 +887,7 @@ void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset, int64_t i_<br>
( i_index > 0 &&<br>
p_indexes[i_index - 1].i_position < (int64_t)cluster-><u></u>GetElementPosition() ) )<br>
{<br>
- ParseCluster(false);<br>
+ ParseCluster( cluster, false, SCOPE_NO_DATA );<br>
IndexAppendCluster( cluster );<br>
}<br>
if( es.I_O().getFilePointer() >= (unsigned) i_global_position )<br>
diff --git a/modules/demux/mkv/matroska_<u></u>segment.hpp b/modules/demux/mkv/matroska_<u></u>segment.hpp<br>
index 9245c58..3ef8e37 100644<br>
--- a/modules/demux/mkv/matroska_<u></u>segment.hpp<br>
+++ b/modules/demux/mkv/matroska_<u></u>segment.hpp<br>
@@ -158,7 +158,7 @@ private:<br>
void ParseTracks( KaxTracks *tracks );<br>
void ParseChapterAtom( int i_level, KaxChapterAtom *ca, chapter_item_c & chapters );<br>
void ParseTrackEntry( KaxTrackEntry *m );<br>
- void ParseCluster( bool b_update_start_time = true );<br>
+ void ParseCluster( KaxCluster *cluster, bool b_update_start_time = true, ScopeMode read_fully = SCOPE_ALL_DATA );<br>
SimpleTag * ParseSimpleTags( KaxTagSimple *tag, int level = 50 );<br>
void IndexAppendCluster( KaxCluster *cluster );<br>
int32_t TrackInit( mkv_track_t * p_tk );<br>
diff --git a/modules/demux/mkv/matroska_<u></u>segment_parse.cpp b/modules/demux/mkv/matroska_<u></u>segment_parse.cpp<br>
index d4a065c..751c824 100644<br>
--- a/modules/demux/mkv/matroska_<u></u>segment_parse.cpp<br>
+++ b/modules/demux/mkv/matroska_<u></u>segment_parse.cpp<br>
@@ -1237,7 +1237,7 @@ void matroska_segment_c::<u></u>ParseChapters( KaxChapters *chapters )<br>
}<br>
}<br>
<br>
-void matroska_segment_c::<u></u>ParseCluster( bool b_update_start_time )<br>
+void matroska_segment_c::<u></u>ParseCluster( KaxCluster *cluster, bool b_update_start_time, ScopeMode read_fully )<br>
{<br>
EbmlElement *el;<br>
EbmlMaster *m;<br>
@@ -1252,7 +1252,7 @@ void matroska_segment_c::<u></u>ParseCluster( bool b_update_start_time )<br>
}<br>
try<br>
{<br>
- m->Read( es, EBML_CONTEXT(cluster), i_upper_level, el, true );<br>
+ m->Read( es, EBML_CONTEXT(cluster), i_upper_level, el, true, read_fully );<br>
}<br>
catch(...)<br>
{<span class="HOEnZb"><font color="#888888"><br>
-- <br>
1.9.5.msysgit.0<br>
<br>
</font></span></blockquote></div><br></div>