mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 14:26:43 +00:00
Code Issues 1 Projects Releases Wiki Activity

urisourcebin: Fix issue re-using outputs

Browse source 
When checking whether a no-longer used output could be re-used for another slot,
we only want to do that for streams which are not still used.

Otherwise we end up potentially re-assigning a demuxer stream to a completely
different one

Furthermore, if we *are* re-using an output slot, indicate what the replacement
GstStream will be so slot matching can work properly (which can happen in the
case of demuxers which add/remove all pads even if only a single one changed)

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7949>
This commit is contained in:
Edward Hervey 2024-11-25 10:50:34 +01:00 committed by GStreamer Marge Bot
parent 0878a83860
commit 93e432bccb
1 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
subprojects/gst-plugins-base/gst/playback/gsturisourcebin.c
View file

@ -2892,6 +2892,7 @@ handle_parsebin_collection (ChildSrcPadInfo * info,
{ {
GList *unused_slots = NULL, *iter; GList *unused_slots = NULL, *iter;
GList *streams = NULL; GList *streams = NULL;
GList *unused_streams = NULL;
guint i, nb_streams; guint i, nb_streams;
nb_streams = gst_stream_collection_get_size (collection); nb_streams = gst_stream_collection_get_size (collection);
@ -2900,33 +2901,54 @@ handle_parsebin_collection (ChildSrcPadInfo * info,
g_list_append (streams, gst_stream_collection_get_stream (collection, g_list_append (streams, gst_stream_collection_get_stream (collection,
i)); i));
unused_streams = g_list_copy (streams);
/* Get list of output info slots not present in the collection */ /* Get list of output info slots not present in the collection */
for (iter = info->outputs; iter; iter = iter->next) { for (iter = info->outputs; iter; iter = iter->next) {
OutputSlotInfo *output = iter->data; OutputSlotInfo *output = iter->data;
if (output->stream if (!output->stream)
&& !gst_playback_utils_stream_in_list (streams, output->stream)) { continue;
if (!gst_playback_utils_stream_in_list (streams, output->stream)) {
GST_DEBUG_OBJECT (output->originating_pad, GST_DEBUG_OBJECT (output->originating_pad,
"No longer used in new collection"); "No longer used in new collection");
unused_slots = g_list_append (unused_slots, output); unused_slots = g_list_append (unused_slots, output);
} else {
GList *iter2 = unused_streams;
/* Stream is re-used, remove it from unused streams we will try to
* re-assign further down */
for (iter2 = unused_streams; iter2; iter2 = iter2->next) {
GstStream *stream = iter2->data;
if (!g_strcmp0 (output->stream->stream_id, stream->stream_id)) {
/* Replace the pending stream by the incoming stream */
gst_object_replace ((GstObject **) & output->pending_stream,
(GstObject *) stream);
unused_streams = g_list_remove (unused_streams, stream);
break;
}
}
} }
} }
/* For each of those slots, check if there is a compatible stream from the /* For each of those slots, check if there is a unused compatible stream from
* collection that could be assigned to it */ * the collection that could be assigned to it */
for (iter = unused_slots; iter; iter = iter->next) { for (iter = unused_slots; iter; iter = iter->next) {
OutputSlotInfo *output = iter->data; OutputSlotInfo *output = iter->data;
GstStream *replacement = find_compatible_stream (streams, output->stream); GstStream *replacement =
find_compatible_stream (unused_streams, output->stream);
if (replacement) { if (replacement) {
GST_DEBUG_OBJECT (output->originating_pad, "Assigning stream %s", GST_DEBUG_OBJECT (output->originating_pad, "Assigning stream %s",
gst_stream_get_stream_id (replacement)); gst_stream_get_stream_id (replacement));
output->pending_stream = gst_object_ref (replacement); gst_object_replace ((GstObject **) & output->pending_stream,
streams = g_list_remove (streams, replacement); (GstObject *) replacement);
unused_streams = g_list_remove (unused_streams, replacement);
} }
} }
g_list_free (unused_slots); g_list_free (unused_slots);
g_list_free (streams); g_list_free (streams);
g_list_free (unused_streams);
/* Store the collection */ /* Store the collection */
gst_object_replace ((GstObject **) & info->collection, gst_object_replace ((GstObject **) & info->collection,