mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-02 06:31:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

uridecodebin3: Handle state synchronization failures

Browse source 
Properly reset and remove the failing urisourcebin if we failed bringing them up
to the same state as ourselves.

Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1708

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3720>
This commit is contained in:
Edward Hervey 2023-01-13 16:34:45 +01:00 committed by Edward Hervey
parent c593930055
commit f444e62672
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
subprojects/gst-plugins-base/gst/playback/gsturidecodebin3.c
View file

@ -369,6 +369,8 @@ static void gst_uri_decode_bin3_get_property (GObject * object, guint prop_id,
static void gst_uri_decode_bin3_dispose (GObject * obj); static void gst_uri_decode_bin3_dispose (GObject * obj);
static GstSourceHandler *new_source_handler (GstURIDecodeBin3 * uridecodebin, static GstSourceHandler *new_source_handler (GstURIDecodeBin3 * uridecodebin,
GstPlayItem * item, gboolean is_main); GstPlayItem * item, gboolean is_main);
static void free_source_handler (GstURIDecodeBin3 * uridecodebin,
GstSourceHandler * item);
static void free_source_item (GstURIDecodeBin3 * uridecodebin, static void free_source_item (GstURIDecodeBin3 * uridecodebin,
GstSourceItem * item); GstSourceItem * item);
@ -923,7 +925,8 @@ activate_source_item (GstSourceItem * item)
handler->active = TRUE; handler->active = TRUE;
} }
gst_element_sync_state_with_parent (handler->urisourcebin); if (!gst_element_sync_state_with_parent (handler->urisourcebin))
return GST_STATE_CHANGE_FAILURE;
return GST_STATE_CHANGE_SUCCESS; return GST_STATE_CHANGE_SUCCESS;
} }
@ -976,9 +979,12 @@ link_src_pad_to_db3 (GstURIDecodeBin3 * uridecodebin, GstSourcePad * spad)
handler->play_item->sub_item->handler = handler->play_item->sub_item->handler =
new_source_handler (uridecodebin, handler->play_item, FALSE); new_source_handler (uridecodebin, handler->play_item, FALSE);
ret = activate_source_item (handler->play_item->sub_item); ret = activate_source_item (handler->play_item->sub_item);
if (ret == GST_STATE_CHANGE_FAILURE) if (ret == GST_STATE_CHANGE_FAILURE) {
free_source_handler (uridecodebin, handler->play_item->sub_item->handler);
handler->play_item->sub_item->handler = NULL;
goto sub_item_activation_failed; goto sub_item_activation_failed;
} }
}
return; return;
@ -1890,8 +1896,10 @@ assign_handlers_to_item (GstURIDecodeBin3 * dec, GstPlayItem * item)
if (item->main_item->handler == NULL) { if (item->main_item->handler == NULL) {
item->main_item->handler = new_source_handler (dec, item, TRUE); item->main_item->handler = new_source_handler (dec, item, TRUE);
ret = activate_source_item (item->main_item); ret = activate_source_item (item->main_item);
if (ret == GST_STATE_CHANGE_FAILURE) if (ret == GST_STATE_CHANGE_FAILURE) {
return ret; free_source_handler (dec, item->main_item->handler);
item->main_item->handler = NULL;
}
} }
return ret; return ret;