mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-09 08:55:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

uridecodebin3: Handle multiple pending pad block probes

Browse source 
It is quite possible to have the blocking probe called from different streaming
threads when all expected pads are present.

* Notify all waiters by using g_cond_broadcast instead of g_cond_signal
* Properly remove the probe after waiting

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3658>
This commit is contained in:
Edward Hervey 2022-12-29 15:58:24 +01:00 committed by Edward Hervey
parent 8ec82f9363
commit a0655d5131
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1160,7 +1160,7 @@ uri_src_probe (GstPad * pad, GstPadProbeInfo * info, GstSourcePad * srcpad)
* pending play item, switch to it */ * pending play item, switch to it */
if (handler->play_item == handler->uridecodebin->input_item && if (handler->play_item == handler->uridecodebin->input_item &&
play_item_is_eos (handler->play_item)) { play_item_is_eos (handler->play_item)) {
g_cond_signal (&handler->uridecodebin->input_source_drained); g_cond_broadcast (&handler->uridecodebin->input_source_drained);
} }
PLAY_ITEMS_UNLOCK (handler->uridecodebin); PLAY_ITEMS_UNLOCK (handler->uridecodebin);
ret = GST_PAD_PROBE_HANDLED; ret = GST_PAD_PROBE_HANDLED;
@ -1245,6 +1245,7 @@ uri_src_block_probe (GstPad * pad, GstPadProbeInfo * info,
} else if (play_item_has_all_pads (handler->play_item)) { } else if (play_item_has_all_pads (handler->play_item)) {
/* We have all expected pads for this play item but the current input /* We have all expected pads for this play item but the current input
* play item isn't done yet, wait for it */ * play item isn't done yet, wait for it */
GST_DEBUG_OBJECT (pad, "Waiting for input source to be drained");
g_cond_wait (&handler->uridecodebin->input_source_drained, g_cond_wait (&handler->uridecodebin->input_source_drained,
&handler->uridecodebin->play_items_lock); &handler->uridecodebin->play_items_lock);
if (g_atomic_int_get (&handler->uridecodebin->shutdown)) if (g_atomic_int_get (&handler->uridecodebin->shutdown))
@ -1254,8 +1255,8 @@ uri_src_block_probe (GstPad * pad, GstPadProbeInfo * info,
"We can switch over to the next input item"); "We can switch over to the next input item");
switch_and_activate_input_locked (handler->uridecodebin, switch_and_activate_input_locked (handler->uridecodebin,
handler->play_item); handler->play_item);
ret = GST_PAD_PROBE_REMOVE;
} }
ret = GST_PAD_PROBE_REMOVE;
} }
PLAY_ITEMS_UNLOCK (handler->uridecodebin); PLAY_ITEMS_UNLOCK (handler->uridecodebin);
@ -1884,7 +1885,7 @@ purge_play_items (GstURIDecodeBin3 * dec)
GST_DEBUG_OBJECT (dec, "Purging play items"); GST_DEBUG_OBJECT (dec, "Purging play items");
PLAY_ITEMS_LOCK (dec); PLAY_ITEMS_LOCK (dec);
g_cond_signal (&dec->input_source_drained); g_cond_broadcast (&dec->input_source_drained);
while (dec->play_items && dec->play_items->next) { while (dec->play_items && dec->play_items->next) {
GstPlayItem *item = dec->play_items->data; GstPlayItem *item = dec->play_items->data;
dec->play_items = g_list_remove (dec->play_items, item); dec->play_items = g_list_remove (dec->play_items, item);
@ -1916,7 +1917,7 @@ gst_uri_decode_bin3_change_state (GstElement * element,
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
PLAY_ITEMS_LOCK (uridecodebin); PLAY_ITEMS_LOCK (uridecodebin);
g_atomic_int_set (&uridecodebin->shutdown, 1); g_atomic_int_set (&uridecodebin->shutdown, 1);
g_cond_signal (&uridecodebin->input_source_drained); g_cond_broadcast (&uridecodebin->input_source_drained);
PLAY_ITEMS_UNLOCK (uridecodebin); PLAY_ITEMS_UNLOCK (uridecodebin);
break; break;
default: default: