mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

decodebin2: recover from failing to add a pad

Browse source 
When we cannot add a pad to the decodebin2 for some reason, print a warning but
continue adding the remaining pads.
This commit is contained in:
Wim Taymans 2009-03-19 20:31:01 +01:00
parent 20468a22c9
commit 600a810236
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gst/playback/gstdecodebin2.c
View file

@ -2130,12 +2130,10 @@ gst_decode_group_expose (GstDecodeGroup * group)
GST_LOG ("Exposing group %p", group); GST_LOG ("Exposing group %p", group);
/* re-order pads : video, then audio, then others */ /* re-order pads : video, then audio, then others */
group->endpads = g_list_sort (group->endpads, (GCompareFunc) sort_end_pads); group->endpads = g_list_sort (group->endpads, (GCompareFunc) sort_end_pads);
/* Expose pads */ /* Expose pads */
for (tmp = group->endpads; tmp; tmp = next) { for (tmp = group->endpads; tmp; tmp = next) {
GstDecodePad *dpad = (GstDecodePad *) tmp->data; GstDecodePad *dpad = (GstDecodePad *) tmp->data;
gchar *padname; gchar *padname;
@ -2151,9 +2149,11 @@ gst_decode_group_expose (GstDecodeGroup * group)
g_free (padname); g_free (padname);
/* 2. activate and add */ /* 2. activate and add */
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; /* not really fatal, we can try to add the other pads */
g_warning ("error adding pad to decodebin2");
continue;
}
dpad->added = TRUE; dpad->added = TRUE;
/* 3. emit signal */ /* 3. emit signal */
@ -2162,7 +2162,6 @@ gst_decode_group_expose (GstDecodeGroup * group)
gst_decode_bin_signals[SIGNAL_NEW_DECODED_PAD], 0, dpad, gst_decode_bin_signals[SIGNAL_NEW_DECODED_PAD], 0, dpad,
(next == NULL)); (next == NULL));
GST_DEBUG_OBJECT (dbin, "emitted new-decoded-pad"); GST_DEBUG_OBJECT (dbin, "emitted new-decoded-pad");
} }
/* signal no-more-pads. This allows the application to hook stuff to the /* signal no-more-pads. This allows the application to hook stuff to the
@ -2198,12 +2197,6 @@ gst_decode_group_expose (GstDecodeGroup * group)
GST_LOG_OBJECT (dbin, "Group %p exposed", group); GST_LOG_OBJECT (dbin, "Group %p exposed", group);
return TRUE; return TRUE;
name_problem:
{
g_warning ("error adding pad to decodebin2");
return FALSE;
}
} }
/* must be called with the decodebin lock */ /* must be called with the decodebin lock */