FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

decodebin3: Rename variable for clarity

Browse Source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6774>
This commit is contained in:
Edward Hervey 2024-03-14 10:39:31 +01:00 committed by GStreamer Marge Bot
parent c0c62388a3
commit 17e385a6ff
1 changed files with 8 additions and 6 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

@ -254,7 +254,9 @@ struct _GstDecodebin3
* it has fully transitioned to active */ * it has fully transitioned to active */
gboolean selection_updated; gboolean selection_updated;
/* End of variables protected by selection_lock */ /* End of variables protected by selection_lock */
gboolean upstream_selected;
/* Upstream handles stream selection */
gboolean upstream_handles_selection;
/* Factories */ /* Factories */
GMutex factories_lock; GMutex factories_lock;
@ -677,7 +679,7 @@ gst_decodebin3_reset (GstDecodebin3 * dbin)
g_object_set (dbin->multiqueue, "min-interleave-time", g_object_set (dbin->multiqueue, "min-interleave-time",
dbin->default_mq_min_interleave, NULL); dbin->default_mq_min_interleave, NULL);
dbin->current_mq_min_interleave = dbin->default_mq_min_interleave; dbin->current_mq_min_interleave = dbin->default_mq_min_interleave;
dbin->upstream_selected = FALSE; dbin->upstream_handles_selection = FALSE;
if (dbin->collection) { if (dbin->collection) {
gst_clear_object (&dbin->collection); gst_clear_object (&dbin->collection);
@ -1401,7 +1403,7 @@ sink_event_function (GstPad * sinkpad, GstDecodebin3 * dbin, GstEvent * event)
/* FIXME : We force `decodebin3` to upstream selection mode if *any* of the /* FIXME : We force `decodebin3` to upstream selection mode if *any* of the
inputs is. This means things might break if there's a mix */ inputs is. This means things might break if there's a mix */
if (input->upstream_selected) if (input->upstream_selected)
dbin->upstream_selected = TRUE; dbin->upstream_handles_selection = TRUE;
input->input_is_parsed = s input->input_is_parsed = s
&& gst_structure_has_field (s, "urisourcebin-parsed-data"); && gst_structure_has_field (s, "urisourcebin-parsed-data");
@ -2286,7 +2288,7 @@ get_output_for_slot (MultiQueueSlot * slot)
/* 3. In default mode check if we should expose */ /* 3. In default mode check if we should expose */
id_in_list = (gchar *) stream_in_list (dbin->requested_selection, stream_id); id_in_list = (gchar *) stream_in_list (dbin->requested_selection, stream_id);
if (id_in_list || dbin->upstream_selected) { if (id_in_list || dbin->upstream_handles_selection) {
/* Check if we can steal an existing output stream we could re-use. /* Check if we can steal an existing output stream we could re-use.
* that is: * that is:
* * an output stream whose slot->stream is not in requested * * an output stream whose slot->stream is not in requested
@ -2334,7 +2336,7 @@ is_selection_done (GstDecodebin3 * dbin)
GST_LOG_OBJECT (dbin, "Checking"); GST_LOG_OBJECT (dbin, "Checking");
if (dbin->upstream_selected) { if (dbin->upstream_handles_selection) {
GST_DEBUG ("Upstream handles stream selection, returning"); GST_DEBUG ("Upstream handles stream selection, returning");
return NULL; return NULL;
} }
@ -3527,7 +3529,7 @@ handle_select_streams (GstDecodebin3 * dbin, GstEvent * event)
GList *streams = NULL; GList *streams = NULL;
guint32 seqnum = gst_event_get_seqnum (event); guint32 seqnum = gst_event_get_seqnum (event);
if (dbin->upstream_selected) { if (dbin->upstream_handles_selection) {
GST_DEBUG_OBJECT (dbin, "Letting select-streams event flow upstream"); GST_DEBUG_OBJECT (dbin, "Letting select-streams event flow upstream");
return FALSE; return FALSE;
} }