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

decodebin2: only remove pads that were added

Browse source 
Flag pads that were added so that we can see if we need to remove them later or
not.
This commit is contained in:
Wim Taymans 2009-03-09 15:46:21 +01:00
parent f964c0fc38
commit 72533ecccc
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gst/playback/gstdecodebin2.c
View file

@ -301,6 +301,7 @@ struct _GstDecodePad
GstDecodeGroup *group; GstDecodeGroup *group;
gboolean blocked; gboolean blocked;
gboolean drained; gboolean drained;
gboolean added;
}; };
G_DEFINE_TYPE (GstDecodePad, gst_decode_pad, GST_TYPE_GHOST_PAD); G_DEFINE_TYPE (GstDecodePad, gst_decode_pad, GST_TYPE_GHOST_PAD);
@ -2091,6 +2092,8 @@ gst_decode_group_expose (GstDecodeGroup * group)
if (!gst_element_add_pad (GST_ELEMENT (dbin), GST_PAD (dpad))) if (!gst_element_add_pad (GST_ELEMENT (dbin), GST_PAD (dpad)))
goto name_problem; goto name_problem;
dpad->added = TRUE;
/* 3. emit signal */ /* 3. emit signal */
GST_DEBUG_OBJECT (dbin, "emitting new-decoded-pad"); GST_DEBUG_OBJECT (dbin, "emitting new-decoded-pad");
g_signal_emit (G_OBJECT (dbin), g_signal_emit (G_OBJECT (dbin),
@ -2154,8 +2157,13 @@ gst_decode_group_hide (GstDecodeGroup * group)
GROUP_MUTEX_LOCK (group); GROUP_MUTEX_LOCK (group);
/* Remove ghost pads */ /* Remove ghost pads */
for (tmp = group->endpads; tmp; tmp = g_list_next (tmp)) for (tmp = group->endpads; tmp; tmp = g_list_next (tmp)) {
gst_element_remove_pad (GST_ELEMENT (group->dbin), GST_PAD (tmp->data)); GstDecodePad *dpad = (GstDecodePad *) tmp->data;
if (dpad->added)
gst_element_remove_pad (GST_ELEMENT (group->dbin), GST_PAD (dpad));
dpad->added = FALSE;
}
group->exposed = FALSE; group->exposed = FALSE;
@ -2243,9 +2251,15 @@ gst_decode_group_free (GstDecodeGroup * group)
GROUP_MUTEX_LOCK (group); GROUP_MUTEX_LOCK (group);
/* remove exposed pads */ /* remove exposed pads */
if (group == group->dbin->activegroup) if (group == group->dbin->activegroup) {
for (tmp = group->endpads; tmp; tmp = g_list_next (tmp)) for (tmp = group->endpads; tmp; tmp = g_list_next (tmp)) {
gst_element_remove_pad (GST_ELEMENT (group->dbin), GST_PAD (tmp->data)); GstDecodePad *dpad = (GstDecodePad *) tmp->data;
if (dpad->added)
gst_element_remove_pad (GST_ELEMENT (group->dbin), GST_PAD (dpad));
dpad->added = FALSE;
}
}
/* Clear all GstDecodePad */ /* Clear all GstDecodePad */
for (tmp = group->endpads; tmp; tmp = g_list_next (tmp)) for (tmp = group->endpads; tmp; tmp = g_list_next (tmp))