decodebin3: Improve collection merging
authorEdward Hervey <edward@centricular.com>
Mon, 14 Nov 2022 08:37:28 +0000 (09:37 +0100)
committerGStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org>
Wed, 16 Nov 2022 14:01:47 +0000 (14:01 +0000)
If the collections are the same, don't merge them

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2784>

subprojects/gst-plugins-base/gst/playback/gstdecodebin3.c

index 78fedd7..3968929 100644 (file)
@@ -1624,7 +1624,9 @@ get_merged_collection (GstDecodebin3 * dbin)
 
   for (tmp = dbin->other_inputs; tmp; tmp = tmp->next) {
     DecodebinInput *input = (DecodebinInput *) tmp->data;
-    if (input->collection) {
+    GST_LOG_OBJECT (dbin, "Comparing res %p input->collection %p", res,
+        input->collection);
+    if (input->collection && input->collection != res) {
       if (res) {
         needs_merge = TRUE;
         break;