mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-25 23:46:45 +00:00
Code Issues 1 Projects Releases Wiki Activity

decodebin3: Unify collection switching checks

Browse source 
We only want to switch to a selection of an output collection if all streams are
present.

This was previously only done in one place (when triggering by new incoming
streams) but not when triggered by user/application.

Avoid this by moving the check to handle_stream_switch()

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7941>
This commit is contained in:
Edward Hervey 2024-11-22 11:50:05 +01:00 committed by GStreamer Marge Bot
parent 821754e2d5
commit 18b941dfd5
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
subprojects/gst-plugins-base/gst/playback/gstdecodebin3.c
View file

@ -3398,8 +3398,8 @@ mq_slot_handle_stream_start (MultiQueueSlot * slot, GstEvent * stream_event)
} }
check_for_switch: check_for_switch:
if (!dbin->upstream_handles_selection && collection == dbin->output_collection if (!dbin->upstream_handles_selection
&& collection->all_streams_present) { && collection == dbin->output_collection) {
handle_stream_switch (dbin); handle_stream_switch (dbin);
} }
@ -4121,6 +4121,8 @@ mq_slot_unassign_probe (GstPad * pad, GstPadProbeInfo * info,
* *
* Figures out which slots to (de)activate for the given output_collection. * Figures out which slots to (de)activate for the given output_collection.
* *
* Will only take place if all streams of the output collection are present.
*
* Must be called with SELECTION_LOCK taken. * Must be called with SELECTION_LOCK taken.
*/ */
static void static void
@ -4139,6 +4141,12 @@ handle_stream_switch (GstDecodebin3 * dbin)
g_return_if_fail (collection); g_return_if_fail (collection);
if (!collection->all_streams_present) {
GST_DEBUG_OBJECT (dbin,
"Not all streams are present yet. Delaying actual switch");
return;
}
/* COMPARE the requested streams to the active and requested streams /* COMPARE the requested streams to the active and requested streams
* on multiqueue. */ * on multiqueue. */
@ -4367,7 +4375,7 @@ handle_select_streams (GstDecodebin3 * dbin, GstEvent * event)
collection->seqnum = seqnum; collection->seqnum = seqnum;
collection->posted_streams_selected_msg = FALSE; collection->posted_streams_selected_msg = FALSE;
/* If the collection is the current output one, handle the switch */ /* If the collection is the current output one, handle the switch. */
if (collection == dbin->output_collection) if (collection == dbin->output_collection)
handle_stream_switch (dbin); handle_stream_switch (dbin);