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

hlsdemux: Give a proper name to the srcpads and remove it when resetting the element

Browse Source
This commit is contained in:
Sebastian Dröge 2014-02-12 18:27:21 +01:00
parent d436844434
commit 13997abbf9
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ext/hls/gsthlsdemux.c
View File

@ -645,12 +645,15 @@ switch_pads (GstHLSDemux * demux, GstCaps * newcaps)
GstPad *oldpad = demux->srcpad; GstPad *oldpad = demux->srcpad;
GstEvent *event; GstEvent *event;
gchar *stream_id; gchar *stream_id;
gchar *name;
GST_DEBUG ("Switching pads (oldpad:%p) with caps: %" GST_PTR_FORMAT, oldpad, GST_DEBUG ("Switching pads (oldpad:%p) with caps: %" GST_PTR_FORMAT, oldpad,
newcaps); newcaps);
/* First create and activate new pad */ /* First create and activate new pad */
demux->srcpad = gst_pad_new_from_static_template (&srctemplate, NULL); name = g_strdup_printf ("src_%u", demux->srcpad_counter++);
demux->srcpad = gst_pad_new_from_static_template (&srctemplate, name);
g_free (name);
gst_pad_set_event_function (demux->srcpad, gst_pad_set_event_function (demux->srcpad,
GST_DEBUG_FUNCPTR (gst_hls_demux_src_event)); GST_DEBUG_FUNCPTR (gst_hls_demux_src_event));
gst_pad_set_query_function (demux->srcpad, gst_pad_set_query_function (demux->srcpad,
@ -879,6 +882,12 @@ gst_hls_demux_reset (GstHLSDemux * demux, gboolean dispose)
demux->have_group_id = FALSE; demux->have_group_id = FALSE;
demux->group_id = G_MAXUINT; demux->group_id = G_MAXUINT;
demux->srcpad_counter = 0;
if (demux->srcpad) {
gst_element_remove_pad (GST_ELEMENT_CAST (demux), demux->srcpad);
demux->srcpad = NULL;
}
} }
static gboolean static gboolean

3
ext/hls/gsthlsdemux.h
View File

@ -55,8 +55,9 @@ struct _GstHLSDemux
{ {
GstElement parent; GstElement parent;
GstPad *srcpad;
GstPad *sinkpad; GstPad *sinkpad;
GstPad *srcpad;
gint srcpad_counter;
gboolean have_group_id; gboolean have_group_id;
guint group_id; guint group_id;