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: Only rewrite stream-start event once

Browse source 
If the custom field is already present, we don't want to rewrite the event
again. Otherwise it would cause downstream into believing that a *new*
stream-start event has arrived ... which isn't the case.

Fixes #4097

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8132>
This commit is contained in:
Edward Hervey 2024-12-12 05:51:09 +01:00 committed by Edward Hervey
parent a29591978b
commit 2d92a2ee54
1 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -724,6 +724,24 @@ gst_uri_source_bin_get_property (GObject * object, guint prop_id,
} }
} }
static GstEvent *
add_stream_start_custom_flag (GstEvent ** event)
{
GstStructure *s;
/* This is a temporary hack to notify downstream decodebin3 to *not*
* plug in an extra parsebin */
s = (GstStructure *) gst_event_get_structure (*event);
if (!gst_structure_has_field_typed (s, "urisourcebin-parsed-data",
G_TYPE_BOOLEAN)) {
*event = gst_event_make_writable (*event);
s = (GstStructure *) gst_event_get_structure (*event);
gst_structure_set (s, "urisourcebin-parsed-data", G_TYPE_BOOLEAN, TRUE,
NULL);
}
return *event;
}
typedef struct typedef struct
{ {
GstPad *target_pad; GstPad *target_pad;
@ -738,13 +756,7 @@ copy_sticky_events (GstPad * pad, GstEvent ** event, gpointer user_data)
if (data->rewrite_stream_start && if (data->rewrite_stream_start &&
GST_EVENT_TYPE (*event) == GST_EVENT_STREAM_START) { GST_EVENT_TYPE (*event) == GST_EVENT_STREAM_START) {
GstStructure *s; add_stream_start_custom_flag (event);
/* This is a temporary hack to notify downstream decodebin3 to *not*
* plug in an extra parsebin */
*event = gst_event_make_writable (*event);
s = (GstStructure *) gst_event_get_structure (*event);
gst_structure_set (s, "urisourcebin-parsed-data", G_TYPE_BOOLEAN, TRUE,
NULL);
} }
GST_DEBUG_OBJECT (gpad, GST_DEBUG_OBJECT (gpad,
"store sticky event from %" GST_PTR_FORMAT " %" GST_PTR_FORMAT, pad, "store sticky event from %" GST_PTR_FORMAT " %" GST_PTR_FORMAT, pad,
@ -977,11 +989,7 @@ demux_pad_events (GstPad * pad, GstPadProbeInfo * info, OutputSlotInfo * slot)
* plug in an extra parsebin */ * plug in an extra parsebin */
if (urisrc->is_adaptive || (slot->linked_info if (urisrc->is_adaptive || (slot->linked_info
&& slot->linked_info->demuxer_is_parsebin)) { && slot->linked_info->demuxer_is_parsebin)) {
GstStructure *s; GST_PAD_PROBE_INFO_DATA (info) = add_stream_start_custom_flag (&ev);
GST_PAD_PROBE_INFO_DATA (info) = ev = gst_event_make_writable (ev);
s = (GstStructure *) gst_event_get_structure (ev);
gst_structure_set (s, "urisourcebin-parsed-data", G_TYPE_BOOLEAN, TRUE,
NULL);
} }
} }
/* PASSTHROUGH */ /* PASSTHROUGH */