mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 05:16:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

matroskademux: resurrect some flow return handling

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=744572
This commit is contained in:
Mark Nauwelaerts 2015-03-23 20:56:41 +01:00
parent d56b11af56
commit 593cfa086c
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1502,6 +1502,7 @@ gst_matroska_demux_move_to_entry (GstMatroskaDemux * demux,
/* update the time */ /* update the time */
gst_matroska_read_common_reset_streams (&demux->common, entry->time, TRUE); gst_matroska_read_common_reset_streams (&demux->common, entry->time, TRUE);
gst_flow_combiner_reset (demux->flowcombiner);
demux->common.segment.position = entry->time; demux->common.segment.position = entry->time;
demux->seek_block = entry->block; demux->seek_block = entry->block;
demux->seek_first = TRUE; demux->seek_first = TRUE;
@ -3655,7 +3656,8 @@ gst_matroska_demux_parse_blockgroup_or_simpleblock (GstMatroskaDemux * demux,
} }
} }
/* combine flows */ /* combine flows */
ret = gst_flow_combiner_update_flow (demux->flowcombiner, ret); ret = gst_flow_combiner_update_pad_flow (demux->flowcombiner,
stream->pad, ret);
next_lace: next_lace:
size -= lace_size[n]; size -= lace_size[n];
@ -3681,7 +3683,8 @@ eos:
stream->eos = TRUE; stream->eos = TRUE;
ret = GST_FLOW_OK; ret = GST_FLOW_OK;
/* combine flows */ /* combine flows */
ret = gst_flow_combiner_update_flow (demux->flowcombiner, ret); ret = gst_flow_combiner_update_pad_flow (demux->flowcombiner, stream->pad,
ret);
goto done; goto done;
} }
invalid_lacing: invalid_lacing:
@ -4744,6 +4747,7 @@ gst_matroska_demux_handle_sink_event (GstPad * pad, GstObject * parent,
GST_OBJECT_LOCK (demux); GST_OBJECT_LOCK (demux);
gst_matroska_read_common_reset_streams (&demux->common, gst_matroska_read_common_reset_streams (&demux->common,
GST_CLOCK_TIME_NONE, TRUE); GST_CLOCK_TIME_NONE, TRUE);
gst_flow_combiner_reset (demux->flowcombiner);
dur = demux->common.segment.duration; dur = demux->common.segment.duration;
gst_segment_init (&demux->common.segment, GST_FORMAT_TIME); gst_segment_init (&demux->common.segment, GST_FORMAT_TIME);
demux->common.segment.duration = dur; demux->common.segment.duration = dur;