-
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
2 changed files
with
74 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
From ea59c921d692e7626d07e54ac9933cfebf24ebe7 Mon Sep 17 00:00:00 2001 | ||
From: Edward Hervey <[email protected]> | ||
Date: Wed, 21 Aug 2024 16:29:03 +0200 | ||
Subject: [PATCH] decodebin3: Fix collection identity check | ||
|
||
Collections can be auto-generated from upstream and yet have exactly the same | ||
streams in it. | ||
|
||
Therefore do a more in-depth check for equality. | ||
|
||
Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3742 | ||
|
||
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7401> | ||
--- | ||
.../gst/playback/gstdecodebin3.c | 26 ++++++++++++++++++- | ||
1 file changed, 25 insertions(+), 1 deletion(-) | ||
|
||
diff --git a/subprojects/gst-plugins-base/gst/playback/gstdecodebin3.c b/subprojects/gst-plugins-base/gst/playback/gstdecodebin3.c | ||
index 56ef496468ac..78b79c776ba6 100644 | ||
--- a/subprojects/gst-plugins-base/gst/playback/gstdecodebin3.c | ||
+++ b/subprojects/gst-plugins-base/gst/playback/gstdecodebin3.c | ||
@@ -2609,6 +2609,29 @@ db_collection_new (GstStreamCollection * collection) | ||
return db_collection; | ||
} | ||
|
||
+static gboolean | ||
+collections_are_identical (GstStreamCollection * collection, | ||
+ GstStreamCollection * previous) | ||
+{ | ||
+ guint i; | ||
+ | ||
+ if (collection == previous) | ||
+ return TRUE; | ||
+ | ||
+ if (gst_stream_collection_get_size (collection) != | ||
+ gst_stream_collection_get_size (previous)) | ||
+ return FALSE; | ||
+ | ||
+ for (i = 0; i < gst_stream_collection_get_size (previous); i++) { | ||
+ GstStream *stream = gst_stream_collection_get_stream (previous, i); | ||
+ const gchar *sid = gst_stream_get_stream_id (stream); | ||
+ if (!stream_in_collection (collection, (gchar *) sid)) | ||
+ return FALSE; | ||
+ } | ||
+ | ||
+ return TRUE; | ||
+} | ||
+ | ||
/** handle_stream_collection_locked: | ||
* @dbin: | ||
* @collection: (transfer none): The new collection for @input. Can be %NULL. | ||
@@ -2683,12 +2706,13 @@ handle_stream_collection_locked (GstDecodebin3 * dbin, | ||
if (dbin->input_collection) { | ||
GstStreamCollection *previous = dbin->input_collection->collection; | ||
|
||
- if (collection == previous) { | ||
+ if (collections_are_identical (collection, previous)) { | ||
GST_DEBUG_OBJECT (dbin, "Collection didn't change"); | ||
gst_object_unref (collection); | ||
SELECTION_UNLOCK (dbin); | ||
return NULL; | ||
} | ||
+ | ||
/* Check if this collection is an update of the previous one */ | ||
if (gst_stream_collection_get_size (collection) > | ||
gst_stream_collection_get_size (previous)) { | ||
-- | ||
GitLab | ||
|