mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-08 21:28:45 +00:00
Code Issues 1 Projects Releases Wiki Activity

matroskademux: Fix cluster searching if we search multiple times in one chunk

Browse source 
After finding a cluster id in the byte reader, we skip ahead the reader
position by one further byte to be able to continue searching from there
inside the same chunk if the cluster candidate was a false positive.

We have to accomodate for that additional byte when resuming the search,
otherwise all following pulls are off-by-one for every resume and we run
into an assertion.
This commit is contained in:
Sebastian Dröge 2016-11-22 20:24:59 +02:00
parent c0da05df38
commit 5d4c71d76e
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst/matroska/matroska-demux.c
View file

@ -1766,13 +1766,22 @@ gst_matroska_demux_search_cluster (GstMatroskaDemux * demux, gint64 * pos)
demux->common.offset += length + needed;
ret = gst_matroska_read_common_peek_id_length_pull (&demux->common,
GST_ELEMENT_CAST (demux), &id, &length, &needed);
if (ret != GST_FLOW_OK)
if (ret != GST_FLOW_OK) {
/* we skipped one byte in the reader above, need to accomodate for
* that when resuming skipping from the reader instead of reading a
* new chunk */
newpos += 1;
goto resume;
}
GST_DEBUG_OBJECT (demux, "next element is %scluster",
id == GST_MATROSKA_ID_CLUSTER ? "" : "not ");
if (id == GST_MATROSKA_ID_CLUSTER)
break;
/* not ok, resume */
/* not ok, resume
* we skipped one byte in the reader above, need to accomodate for
* that when resuming skipping from the reader instead of reading a
* new chunk */
newpos += 1;
goto resume;
} else {
/* partial cluster id may have been in tail of buffer */