mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

decodebin3: Rename multiqueue related functions

Browse source 
To make clear on what they apply

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6774>
This commit is contained in:
Edward Hervey 2024-03-22 12:01:06 +01:00 committed by GStreamer Marge Bot
parent fc96e29606
commit ceeea8afd6
1 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -161,7 +161,7 @@
* stream is in the REQUESTED selection. * stream is in the REQUESTED selection.
* 2) Deactivating a stream (i.e. unlinking a slot from an output) is also done * 2) Deactivating a stream (i.e. unlinking a slot from an output) is also done
* within the stream thread, but only in a purposefully called IDLE probe * within the stream thread, but only in a purposefully called IDLE probe
* that calls reassign_slot(). * that calls mq_slot_reassign().
* *
* Based on those two principles, 3 "selection" of streams (stream-id) are used: * Based on those two principles, 3 "selection" of streams (stream-id) are used:
* 1) requested_selection * 1) requested_selection
@ -170,7 +170,7 @@
* List of streams that are exposed by decodebin * List of streams that are exposed by decodebin
* 3) to_activate * 3) to_activate
* List of streams that will be moved to requested_selection in the * List of streams that will be moved to requested_selection in the
* reassign_slot() method (i.e. once a stream was deactivated, and the output * mq_slot_reassign() method (i.e. once a stream was deactivated, and the output
* was retargetted) * was retargetted)
*/ */
@ -551,15 +551,15 @@ static void db_output_stream_free (DecodebinOutputStream * output);
static DecodebinOutputStream *db_output_stream_new (GstDecodebin3 * dbin, static DecodebinOutputStream *db_output_stream_new (GstDecodebin3 * dbin,
GstStreamType type); GstStreamType type);
static GstPadProbeReturn slot_unassign_probe (GstPad * pad, static GstPadProbeReturn mq_slot_unassign_probe (GstPad * pad,
GstPadProbeInfo * info, MultiQueueSlot * slot); GstPadProbeInfo * info, MultiQueueSlot * slot);
static gboolean reassign_slot (GstDecodebin3 * dbin, MultiQueueSlot * slot); static void mq_slot_reassign (MultiQueueSlot * slot);
static MultiQueueSlot static MultiQueueSlot
* gst_decodebin_get_slot_for_input_stream_locked (GstDecodebin3 * dbin, * gst_decodebin_get_slot_for_input_stream_locked (GstDecodebin3 * dbin,
DecodebinInputStream * input); DecodebinInputStream * input);
static void link_input_to_slot (DecodebinInputStream * input, static void link_input_to_slot (DecodebinInputStream * input,
MultiQueueSlot * slot); MultiQueueSlot * slot);
static void free_multiqueue_slot (GstDecodebin3 * dbin, MultiQueueSlot * slot); static void mq_slot_free (GstDecodebin3 * dbin, MultiQueueSlot * slot);
static GstStreamCollection *get_merged_collection (GstDecodebin3 * dbin); static GstStreamCollection *get_merged_collection (GstDecodebin3 * dbin);
static void update_requested_selection (GstDecodebin3 * dbin); static void update_requested_selection (GstDecodebin3 * dbin);
@ -702,7 +702,7 @@ gst_decodebin3_reset (GstDecodebin3 * dbin)
/* Free multiqueue slots */ /* Free multiqueue slots */
for (tmp = dbin->slots; tmp; tmp = tmp->next) { for (tmp = dbin->slots; tmp; tmp = tmp->next) {
MultiQueueSlot *slot = (MultiQueueSlot *) tmp->data; MultiQueueSlot *slot = (MultiQueueSlot *) tmp->data;
free_multiqueue_slot (dbin, slot); mq_slot_free (dbin, slot);
} }
g_list_free (dbin->slots); g_list_free (dbin->slots);
dbin->slots = NULL; dbin->slots = NULL;
@ -1418,7 +1418,7 @@ remove_slot_from_streaming_thread (GstDecodebin3 * dbin, MultiQueueSlot * slot)
gst_decodebin3_update_min_interleave (dbin); gst_decodebin3_update_min_interleave (dbin);
gst_element_call_async (GST_ELEMENT_CAST (dbin), gst_element_call_async (GST_ELEMENT_CAST (dbin),
(GstElementCallAsyncFunc) free_multiqueue_slot, slot, NULL); (GstElementCallAsyncFunc) mq_slot_free, slot, NULL);
} }
static void static void
@ -3229,7 +3229,7 @@ check_slot_reconfiguration (GstDecodebin3 * dbin, MultiQueueSlot * slot)
else else
GST_ELEMENT_WARNING (slot->dbin, CORE, MISSING_PLUGIN, (NULL), GST_ELEMENT_WARNING (slot->dbin, CORE, MISSING_PLUGIN, (NULL),
("Some plugins were missing")); ("Some plugins were missing"));
reassign_slot (dbin, slot); mq_slot_reassign (slot);
} else { } else {
GstMessage *selection_msg = is_selection_done (dbin); GstMessage *selection_msg = is_selection_done (dbin);
SELECTION_UNLOCK (dbin); SELECTION_UNLOCK (dbin);
@ -3912,9 +3912,10 @@ find_slot_for_stream_id (GstDecodebin3 * dbin, const gchar * sid)
/* This function handles the reassignment of a slot. Call this from /* This function handles the reassignment of a slot. Call this from
* the streaming thread of a slot. */ * the streaming thread of a slot. */
static gboolean static void
reassign_slot (GstDecodebin3 * dbin, MultiQueueSlot * slot) mq_slot_reassign (MultiQueueSlot * slot)
{ {
GstDecodebin3 *dbin = slot->dbin;
DecodebinOutputStream *output; DecodebinOutputStream *output;
MultiQueueSlot *target_slot = NULL; MultiQueueSlot *target_slot = NULL;
GList *tmp; GList *tmp;
@ -3927,14 +3928,14 @@ reassign_slot (GstDecodebin3 * dbin, MultiQueueSlot * slot)
GST_DEBUG_OBJECT (slot->src_pad, GST_DEBUG_OBJECT (slot->src_pad,
"Called on inactive slot (active_stream == NULL)"); "Called on inactive slot (active_stream == NULL)");
SELECTION_UNLOCK (dbin); SELECTION_UNLOCK (dbin);
return FALSE; return;
} }
if (G_UNLIKELY (output == NULL)) { if (G_UNLIKELY (output == NULL)) {
GST_DEBUG_OBJECT (slot->src_pad, GST_DEBUG_OBJECT (slot->src_pad,
"Slot doesn't have any output to be removed"); "Slot doesn't have any output to be removed");
SELECTION_UNLOCK (dbin); SELECTION_UNLOCK (dbin);
return FALSE; return;
} }
sid = gst_stream_get_stream_id (slot->active_stream); sid = gst_stream_get_stream_id (slot->active_stream);
@ -3946,7 +3947,7 @@ reassign_slot (GstDecodebin3 * dbin, MultiQueueSlot * slot)
SELECTION_UNLOCK (dbin); SELECTION_UNLOCK (dbin);
GST_DEBUG_OBJECT (slot->src_pad, GST_DEBUG_OBJECT (slot->src_pad,
"Stream '%s' doesn't need to be deactivated", sid); "Stream '%s' doesn't need to be deactivated", sid);
return FALSE; return;
} }
/* Unlink slot from output */ /* Unlink slot from output */
@ -4005,8 +4006,6 @@ reassign_slot (GstDecodebin3 * dbin, MultiQueueSlot * slot)
if (msg) if (msg)
gst_element_post_message ((GstElement *) slot->dbin, msg); gst_element_post_message ((GstElement *) slot->dbin, msg);
} }
return TRUE;
} }
/* Idle probe called when a slot should be unassigned from its output stream. /* Idle probe called when a slot should be unassigned from its output stream.
@ -4015,12 +4014,10 @@ reassign_slot (GstDecodebin3 * dbin, MultiQueueSlot * slot)
* Also, this method will search for a pending stream which could re-use * Also, this method will search for a pending stream which could re-use
* the output stream. */ * the output stream. */
static GstPadProbeReturn static GstPadProbeReturn
slot_unassign_probe (GstPad * pad, GstPadProbeInfo * info, mq_slot_unassign_probe (GstPad * pad, GstPadProbeInfo * info,
MultiQueueSlot * slot) MultiQueueSlot * slot)
{ {
GstDecodebin3 *dbin = slot->dbin; mq_slot_reassign (slot);
reassign_slot (dbin, slot);
return GST_PAD_PROBE_REMOVE; return GST_PAD_PROBE_REMOVE;
} }
@ -4220,7 +4217,7 @@ handle_stream_switch (GstDecodebin3 * dbin, GList * select_streams,
for (tmp = slots_to_reassign; tmp; tmp = tmp->next) { for (tmp = slots_to_reassign; tmp; tmp = tmp->next) {
MultiQueueSlot *slot = (MultiQueueSlot *) tmp->data; MultiQueueSlot *slot = (MultiQueueSlot *) tmp->data;
gst_pad_add_probe (slot->src_pad, GST_PAD_PROBE_TYPE_IDLE, gst_pad_add_probe (slot->src_pad, GST_PAD_PROBE_TYPE_IDLE,
(GstPadProbeCallback) slot_unassign_probe, slot, NULL); (GstPadProbeCallback) mq_slot_unassign_probe, slot, NULL);
} }
if (to_deactivate) if (to_deactivate)
@ -4323,9 +4320,8 @@ gst_decodebin3_send_event (GstElement * element, GstEvent * event)
return GST_ELEMENT_CLASS (parent_class)->send_event (element, event); return GST_ELEMENT_CLASS (parent_class)->send_event (element, event);
} }
static void static void
free_multiqueue_slot (GstDecodebin3 * dbin, MultiQueueSlot * slot) mq_slot_free (GstDecodebin3 * dbin, MultiQueueSlot * slot)
{ {
if (slot->probe_id) if (slot->probe_id)
gst_pad_remove_probe (slot->src_pad, slot->probe_id); gst_pad_remove_probe (slot->src_pad, slot->probe_id);