mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-06-15 20:40:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'uridecodebin3_no_drain_switch_in_paused' into 'main'

Browse source 
uridecodebin3: Do not wait draining input on URI switch when paused

See merge request gstreamer/gstreamer!5984
This commit is contained in:
Thibault Saunier 2024-05-15 05:55:32 +00:00
parent 64cac1ed99 b63d02a871
commit 0af8a09e32
1 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1381,18 +1381,26 @@ uri_src_block_probe (GstPad * pad, GstPadProbeInfo * info,
handler->play_item);
ret = GST_PAD_PROBE_REMOVE;
} else if (play_item_has_all_pads (handler->play_item)) {
/* We have all expected pads for this play item but the current input
* 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,
&handler->uridecodebin->play_items_lock);
if (g_atomic_int_get (&handler->uridecodebin->shutdown))
goto shutdown;
if (play_item_is_eos (handler->uridecodebin->input_item)) {
GST_DEBUG_OBJECT (handler->uridecodebin,
"We can switch over to the next input item");
switch_and_activate_input_locked (handler->uridecodebin,
handler->play_item);
GstState state, next;
gst_element_get_state (handler->uridecodebin, &state, &next, 0);
if (state > GST_STATE_PAUSED && (next == GST_STATE_VOID_PENDING
|| next > GST_STATE_PAUSED)) {
/* We have all expected pads for this play item but the current input
* play item isn't done yet, wait for it if we are playing, otherwise setup
* next item right away */
GST_DEBUG_OBJECT (pad, "Waiting for input source to be drained");
g_cond_wait (&handler->uridecodebin->input_source_drained,
&handler->uridecodebin->play_items_lock);
if (g_atomic_int_get (&handler->uridecodebin->shutdown))
goto shutdown;
if (play_item_is_eos (handler->uridecodebin->input_item)) {
GST_DEBUG_OBJECT (handler->uridecodebin,
"We can switch over to the next input item");
switch_and_activate_input_locked (handler->uridecodebin,
handler->play_item);
}
}
ret = GST_PAD_PROBE_REMOVE;
}