mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-10 17:35:59 +00:00
Code Issues 1 Projects Releases Wiki Activity

uridecodebin3: Fix handling of "expected" pads

Browse source 
The number of expected pads was:
* Defaulting to 1
* Or being overriden by GST_MESSAGE_STREAMS_SELECTED

This fails if upstream isn't a selectable source and has multiple streams, and
would therefore cause failures with multi-stream gapless playback

Fixes #1672

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3658>
This commit is contained in:
Edward Hervey 2022-12-29 16:02:38 +01:00 committed by Edward Hervey
parent 80e7c31514
commit 66b96baf23
1 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
subprojects/gst-plugins-base/gst/playback/gsturidecodebin3.c
View file

@ -140,6 +140,9 @@ struct _GstSourceHandler
/* buffering message stored for after switching */ /* buffering message stored for after switching */
GstMessage *pending_buffering_msg; GstMessage *pending_buffering_msg;
/* TRUE if urisourcebin handles stream-selection */
gboolean upstream_selected;
/* Number of expected sourcepads. Default 1, else it's the number of streams /* Number of expected sourcepads. Default 1, else it's the number of streams
* specified by GST_MESSAGE_SELECTED_STREAMS from the source */ * specified by GST_MESSAGE_SELECTED_STREAMS from the source */
guint expected_pads; guint expected_pads;
@ -1222,6 +1225,7 @@ uri_src_block_probe (GstPad * pad, GstPadProbeInfo * info,
GstEvent *event = GST_PAD_PROBE_INFO_EVENT (info); GstEvent *event = GST_PAD_PROBE_INFO_EVENT (info);
if (GST_EVENT_TYPE (event) == GST_EVENT_STREAM_START) { if (GST_EVENT_TYPE (event) == GST_EVENT_STREAM_START) {
GstStream *stream = NULL; GstStream *stream = NULL;
GstQuery *q = gst_query_new_selectable ();
gst_event_parse_stream (event, &stream); gst_event_parse_stream (event, &stream);
if (stream) { if (stream) {
GST_DEBUG_OBJECT (srcpad->src_pad, "Got GstStream %" GST_PTR_FORMAT, GST_DEBUG_OBJECT (srcpad->src_pad, "Got GstStream %" GST_PTR_FORMAT,
@ -1230,7 +1234,32 @@ uri_src_block_probe (GstPad * pad, GstPadProbeInfo * info,
gst_object_unref (srcpad->stream); gst_object_unref (srcpad->stream);
srcpad->stream = stream; srcpad->stream = stream;
} }
if (gst_pad_query (pad, q)) {
PLAY_ITEMS_LOCK (handler->uridecodebin);
gst_query_parse_selectable (q, &handler->upstream_selected);
GST_DEBUG_OBJECT (srcpad->src_pad, "Upstream is selectable : %d",
handler->upstream_selected);
PLAY_ITEMS_UNLOCK (handler->uridecodebin);
} }
gst_query_unref (q);
} else if (GST_EVENT_TYPE (event) == GST_EVENT_STREAM_COLLECTION) {
GstStreamCollection *collection = NULL;
PLAY_ITEMS_LOCK (handler->uridecodebin);
if (!handler->upstream_selected) {
gst_event_parse_stream_collection (event, &collection);
if (collection) {
GST_DEBUG_OBJECT (srcpad->src_pad, "Seen collection with %d streams",
gst_stream_collection_get_size (collection));
if (handler->expected_pads == 1) {
handler->expected_pads =
gst_stream_collection_get_size (collection);
}
gst_object_unref (collection);
}
}
PLAY_ITEMS_UNLOCK (handler->uridecodebin);
}
GST_LOG_OBJECT (pad, "Skiping %" GST_PTR_FORMAT, event); GST_LOG_OBJECT (pad, "Skiping %" GST_PTR_FORMAT, event);
/* We don't want to be repeatedly called for the same event when unlinked, /* We don't want to be repeatedly called for the same event when unlinked,
* so we mark the event as handled */ * so we mark the event as handled */