FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

tsdemux: Activate pads only when receiving data for the stream

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=670921
This commit is contained in:
Thibault Saunier 2012-02-29 11:14:15 -03:00 committed by Edward Hervey
parent 4b48c43b31
commit ece4dfc3c6
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gst/mpegtsdemux/tsdemux.c
View File

@ -114,6 +114,8 @@ struct _TSDemuxStream
MpegTSBaseStream stream; MpegTSBaseStream stream;
GstPad *pad; GstPad *pad;
/* Whether the pad was added or not */
gboolean active;
/* the return of the latest push */ /* the return of the latest push */
GstFlowReturn flow_return; GstFlowReturn flow_return;
@ -956,6 +958,7 @@ gst_ts_demux_stream_added (MpegTSBase * base, MpegTSBaseStream * bstream,
/* 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);
stream->active = FALSE;
stream->need_newsegment = TRUE; stream->need_newsegment = TRUE;
stream->pts = GST_CLOCK_TIME_NONE; stream->pts = GST_CLOCK_TIME_NONE;
@ -976,7 +979,7 @@ gst_ts_demux_stream_removed (MpegTSBase * base, MpegTSBaseStream * bstream)
TSDemuxStream *stream = (TSDemuxStream *) bstream; TSDemuxStream *stream = (TSDemuxStream *) bstream;
if (stream->pad) { if (stream->pad) {
if (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");
gst_ts_demux_push_pending_data ((GstTSDemux *) base, stream); gst_ts_demux_push_pending_data ((GstTSDemux *) base, stream);
@ -986,6 +989,7 @@ 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);
stream->active = FALSE;
} }
stream->pad = NULL; stream->pad = NULL;
} }
@ -1000,6 +1004,7 @@ activate_pad_for_stream (GstTSDemux * tsdemux, TSDemuxStream * stream)
GST_DEBUG_PAD_NAME (stream->pad), stream); GST_DEBUG_PAD_NAME (stream->pad), stream);
gst_pad_set_active (stream->pad, TRUE); gst_pad_set_active (stream->pad, TRUE);
gst_element_add_pad ((GstElement *) tsdemux, stream->pad); gst_element_add_pad ((GstElement *) tsdemux, stream->pad);
stream->active = TRUE;
GST_DEBUG_OBJECT (stream->pad, "done adding pad"); GST_DEBUG_OBJECT (stream->pad, "done adding pad");
} else } else
GST_WARNING_OBJECT (tsdemux, GST_WARNING_OBJECT (tsdemux,
@ -1049,7 +1054,6 @@ gst_ts_demux_program_started (MpegTSBase * base, MpegTSBaseProgram * program)
if (demux->program_number == -1 || if (demux->program_number == -1 ||
demux->program_number == program->program_number) { demux->program_number == program->program_number) {
GList *tmp;
GST_LOG ("program %d started", program->program_number); GST_LOG ("program %d started", program->program_number);
demux->program_number = program->program_number; demux->program_number = program->program_number;
@ -1069,12 +1073,7 @@ gst_ts_demux_program_started (MpegTSBase * base, MpegTSBaseProgram * program)
GST_EVENT_SRC (demux->segment_event) = gst_object_ref (demux); GST_EVENT_SRC (demux->segment_event) = gst_object_ref (demux);
} }
/* Activate all stream pads, pads will already have been created */ /* FIXME : When do we emit no_more_pads ? */
if (base->mode != BASE_MODE_SCANNING) {
for (tmp = program->stream_list; tmp; tmp = tmp->next)
activate_pad_for_stream (demux, (TSDemuxStream *) tmp->data);
gst_element_no_more_pads ((GstElement *) demux);
}
/* Inform scanner we have got our program */ /* Inform scanner we have got our program */
demux->current_program_number = program->program_number; demux->current_program_number = program->program_number;
@ -1456,6 +1455,9 @@ gst_ts_demux_push_pending_data (GstTSDemux * demux, TSDemuxStream * stream)
if (G_UNLIKELY (stream->state != PENDING_PACKET_BUFFER)) if (G_UNLIKELY (stream->state != PENDING_PACKET_BUFFER))
goto beach; goto beach;
if (G_UNLIKELY (!stream->active))
activate_pad_for_stream (demux, stream);
if (G_UNLIKELY (stream->pad == NULL)) { if (G_UNLIKELY (stream->pad == NULL)) {
g_list_foreach (stream->currentlist, (GFunc) gst_buffer_unref, NULL); g_list_foreach (stream->currentlist, (GFunc) gst_buffer_unref, NULL);
g_list_free (stream->currentlist); g_list_free (stream->currentlist);