mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

tsdemux: add/remove pads to flowcombiner differently due to streaming nature

Browse source 
Due to mpegts streaming nature some pads are created but are only added
later to the element. This can cause a scenario where the first stream
doesn't have an available decoder (while the next ones still pending
would have) and tsdemux will fail with not-linked as the first stream
added wouldn't be linked.

To avoid this tsdemux needs to add pads to the flowcombiner
when they are created instead of only when adding them to the
element.
This commit is contained in:
Thiago Santos 2014-05-27 10:21:45 -03:00
parent 1f1bb8bbe3
commit c56a4d54b8
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gst/mpegtsdemux/tsdemux.c
View file

@ -1131,12 +1131,16 @@ static void
gst_ts_demux_stream_added (MpegTSBase * base, MpegTSBaseStream * bstream, gst_ts_demux_stream_added (MpegTSBase * base, MpegTSBaseStream * bstream,
MpegTSBaseProgram * program) MpegTSBaseProgram * program)
{ {
GstTSDemux *demux = (GstTSDemux *) base;
TSDemuxStream *stream = (TSDemuxStream *) bstream; TSDemuxStream *stream = (TSDemuxStream *) bstream;
if (!stream->pad) { if (!stream->pad) {
/* Create the pad */ /* Create the pad */
if (bstream->stream_type != 0xff) if (bstream->stream_type != 0xff) {
stream->pad = create_pad_for_stream (base, bstream, program); stream->pad = create_pad_for_stream (base, bstream, program);
if (stream->pad)
gst_flow_combiner_add_pad (demux->flowcombiner, stream->pad);
}
stream->active = FALSE; stream->active = FALSE;
stream->need_newsegment = TRUE; stream->need_newsegment = TRUE;
@ -1157,6 +1161,8 @@ gst_ts_demux_stream_removed (MpegTSBase * base, MpegTSBaseStream * bstream)
TSDemuxStream *stream = (TSDemuxStream *) bstream; TSDemuxStream *stream = (TSDemuxStream *) bstream;
if (stream->pad) { if (stream->pad) {
gst_flow_combiner_remove_pad (GST_TS_DEMUX_CAST (base)->flowcombiner,
stream->pad);
if (stream->active && gst_pad_is_active (stream->pad)) { if (stream->active && gst_pad_is_active (stream->pad)) {
/* Flush out all data */ /* Flush out all data */
GST_DEBUG_OBJECT (stream->pad, "Flushing out pending data"); GST_DEBUG_OBJECT (stream->pad, "Flushing out pending data");
@ -1167,8 +1173,6 @@ gst_ts_demux_stream_removed (MpegTSBase * base, MpegTSBaseStream * bstream)
GST_DEBUG_OBJECT (stream->pad, "Deactivating and removing pad"); GST_DEBUG_OBJECT (stream->pad, "Deactivating and removing pad");
gst_pad_set_active (stream->pad, FALSE); gst_pad_set_active (stream->pad, FALSE);
gst_element_remove_pad (GST_ELEMENT_CAST (base), stream->pad); gst_element_remove_pad (GST_ELEMENT_CAST (base), stream->pad);
gst_flow_combiner_remove_pad (GST_TS_DEMUX_CAST (base)->flowcombiner,
stream->pad);
stream->active = FALSE; stream->active = FALSE;
} }
stream->pad = NULL; stream->pad = NULL;
@ -1186,7 +1190,6 @@ activate_pad_for_stream (GstTSDemux * tsdemux, TSDemuxStream * stream)
GST_DEBUG_OBJECT (tsdemux, "Activating pad %s:%s for stream %p", GST_DEBUG_OBJECT (tsdemux, "Activating pad %s:%s for stream %p",
GST_DEBUG_PAD_NAME (stream->pad), stream); GST_DEBUG_PAD_NAME (stream->pad), stream);
gst_element_add_pad ((GstElement *) tsdemux, stream->pad); gst_element_add_pad ((GstElement *) tsdemux, stream->pad);
gst_flow_combiner_add_pad (tsdemux->flowcombiner, stream->pad);
stream->active = TRUE; stream->active = TRUE;
GST_DEBUG_OBJECT (stream->pad, "done adding pad"); GST_DEBUG_OBJECT (stream->pad, "done adding pad");