summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Normand <philn@igalia.com>2023-07-18 15:15:40 +0100
committerGStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org>2023-07-19 11:48:40 +0000
commit8d486d1398522a6eee0d28563345630b78329b41 (patch)
treed44e9ae586107e5b1aad01ec30681ea5abb758b3
parenteea9f74f955e99515332bafd2cfbfbfc5a75b526 (diff)
decodebin3: Prevent a critical warning when reassigning output slots
Do not attempt to send a streams-selected message when reassigning an output slot in case upstream signalled that it is handling stream selection. In this case decodebin3 doesn't keep track of stream collections (`dbin->collection` is NULL). Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5069>
-rw-r--r--subprojects/gst-plugins-base/gst/playback/gstdecodebin3.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/subprojects/gst-plugins-base/gst/playback/gstdecodebin3.c b/subprojects/gst-plugins-base/gst/playback/gstdecodebin3.c
index ebe749b89c..e67a07934b 100644
--- a/subprojects/gst-plugins-base/gst/playback/gstdecodebin3.c
+++ b/subprojects/gst-plugins-base/gst/playback/gstdecodebin3.c
@@ -2218,6 +2218,11 @@ is_selection_done (GstDecodebin3 * dbin)
GST_LOG_OBJECT (dbin, "Checking");
+ if (dbin->upstream_selected) {
+ GST_DEBUG ("Upstream handles stream selection, returning");
+ return NULL;
+ }
+
if (dbin->to_activate != NULL) {
GST_DEBUG ("Still have streams to activate");
return NULL;