mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-22 14:06:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

dashdemux: Make sure switch_pads won't leak any pad.

Browse source
This commit is contained in:
Andre Moreira Magalhaes (andrunko) 2013-02-05 01:29:28 -02:00 committed by Thiago Santos
parent e92531c8f6
commit 5efedbff0a
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
ext/dash/gstdashdemux.c
View file

@ -952,16 +952,6 @@ switch_pads (GstDashDemux * demux)
GSList *oldpads = NULL; GSList *oldpads = NULL;
GSList *iter; GSList *iter;
/* Remember old pads */
for (iter = demux->streams; iter; iter = g_slist_next (iter)) {
GstDashDemuxStream *stream = iter->data;
GstPad *oldpad = stream->pad;
if (oldpad) {
oldpads = g_slist_prepend (oldpads, oldpad);
GST_DEBUG_OBJECT (demux,
"Switching pads (oldpad:%p) %" GST_PTR_FORMAT, oldpad, oldpad);
}
}
/* Create and activate new pads */ /* Create and activate new pads */
for (iter = demux->streams; iter; iter = g_slist_next (iter)) { for (iter = demux->streams; iter; iter = g_slist_next (iter)) {
GstDashDemuxStream *stream = iter->data; GstDashDemuxStream *stream = iter->data;
@ -969,11 +959,11 @@ switch_pads (GstDashDemux * demux)
GstEvent *event; GstEvent *event;
const GstStructure *structure; const GstStructure *structure;
GstCaps *caps = NULL; GstCaps *caps = NULL;
GstPad *oldpad;
if (!gst_data_queue_pop (stream->queue, &item)) { if (!gst_data_queue_pop (stream->queue, &item)) {
if (demux->cancelled) { if (demux->cancelled) {
g_slist_free (oldpads); break;
return;
} }
g_assert_not_reached (); g_assert_not_reached ();
} }
@ -988,6 +978,10 @@ switch_pads (GstDashDemux * demux)
g_assert (caps != NULL); g_assert (caps != NULL);
stream->need_segment = TRUE; stream->need_segment = TRUE;
oldpad = stream->pad;
if (oldpad)
oldpads = g_slist_prepend (oldpads, oldpad);
stream->pad = gst_pad_new_from_static_template (&srctemplate, NULL); stream->pad = gst_pad_new_from_static_template (&srctemplate, NULL);
gst_pad_set_event_function (stream->pad, gst_pad_set_event_function (stream->pad,
GST_DEBUG_FUNCPTR (gst_dash_demux_src_event)); GST_DEBUG_FUNCPTR (gst_dash_demux_src_event));
@ -997,6 +991,9 @@ switch_pads (GstDashDemux * demux)
gst_pad_set_active (stream->pad, TRUE); gst_pad_set_active (stream->pad, TRUE);
gst_pad_set_caps (stream->pad, caps); gst_pad_set_caps (stream->pad, caps);
gst_element_add_pad (GST_ELEMENT (demux), gst_object_ref (stream->pad)); gst_element_add_pad (GST_ELEMENT (demux), gst_object_ref (stream->pad));
GST_DEBUG_OBJECT (demux,
"Switching pads (oldpad:%s:%s) (newpad:%s:%s)",
GST_DEBUG_PAD_NAME (oldpad), GST_DEBUG_PAD_NAME (stream->pad));
GST_INFO_OBJECT (demux, "Adding srcpad %s:%s with caps %" GST_PTR_FORMAT, GST_INFO_OBJECT (demux, "Adding srcpad %s:%s with caps %" GST_PTR_FORMAT,
GST_DEBUG_PAD_NAME (stream->pad), caps); GST_DEBUG_PAD_NAME (stream->pad), caps);
@ -1010,6 +1007,8 @@ switch_pads (GstDashDemux * demux)
for (iter = oldpads; iter; iter = g_slist_next (iter)) { for (iter = oldpads; iter; iter = g_slist_next (iter)) {
GstPad *pad = iter->data; GstPad *pad = iter->data;
GST_INFO_OBJECT (demux, "Removing old srcpad %s:%s",
GST_DEBUG_PAD_NAME (pad));
gst_pad_push_event (pad, gst_event_new_eos ()); gst_pad_push_event (pad, gst_event_new_eos ());
gst_pad_set_active (pad, FALSE); gst_pad_set_active (pad, FALSE);
gst_element_remove_pad (GST_ELEMENT (demux), pad); gst_element_remove_pad (GST_ELEMENT (demux), pad);
@ -1227,8 +1226,11 @@ gst_dash_demux_reset (GstDashDemux * demux, gboolean dispose)
for (iter = demux->streams; iter; iter = g_slist_next (iter)) { for (iter = demux->streams; iter; iter = g_slist_next (iter)) {
GstDashDemuxStream *stream = iter->data; GstDashDemuxStream *stream = iter->data;
if (stream->pad) if (stream->pad) {
GST_INFO_OBJECT (demux, "Removing stream pad %s:%s",
GST_DEBUG_PAD_NAME (stream->pad));
gst_element_remove_pad (GST_ELEMENT (demux), stream->pad); gst_element_remove_pad (GST_ELEMENT (demux), stream->pad);
}
gst_dash_demux_stream_free (stream); gst_dash_demux_stream_free (stream);
} }
g_slist_free (demux->streams); g_slist_free (demux->streams);