mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

adaptivedemux2: Fix sticky event storage.

Browse source 
Use the new gst_event_type_to_sticky_ordering() method to retrieve
the order that sticky events should be sent / stored in, instead
of assuming it's the event type value.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3387>
This commit is contained in:
Jan Schmidt 2022-11-15 21:42:34 +11:00 committed by GStreamer Marge Bot
parent bdaa8f83aa
commit 8b08305ef9
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemuxutils.c
View file

@ -500,6 +500,7 @@ typedef struct
{ {
gboolean delivered; gboolean delivered;
GstEvent *event; GstEvent *event;
guint sticky_order;
} PadEvent; } PadEvent;
void void
@ -541,12 +542,12 @@ gst_event_store_insert_event (GstEventStore * store, GstEvent * event,
gboolean delivered) gboolean delivered)
{ {
guint i, len; guint i, len;
GstEventType type;
GArray *events; GArray *events;
GQuark name_id = 0; GQuark name_id = 0;
gboolean insert = TRUE; gboolean insert = TRUE;
type = GST_EVENT_TYPE (event); GstEventType type = GST_EVENT_TYPE (event);
guint event_sticky_order = gst_event_type_to_sticky_ordering (type);
if (type & GST_EVENT_TYPE_STICKY_MULTI) if (type & GST_EVENT_TYPE_STICKY_MULTI)
name_id = gst_structure_get_name_id (gst_event_get_structure (event)); name_id = gst_structure_get_name_id (gst_event_get_structure (event));
@ -578,23 +579,27 @@ gst_event_store_insert_event (GstEventStore * store, GstEvent * event,
break; break;
} }
if (type < GST_EVENT_TYPE (ev->event) || (type != GST_EVENT_TYPE (ev->event) if (event_sticky_order < ev->sticky_order
|| (type != GST_EVENT_TYPE (ev->event)
&& GST_EVENT_TYPE (ev->event) == GST_EVENT_EOS)) { && GST_EVENT_TYPE (ev->event) == GST_EVENT_EOS)) {
/* STREAM_START, CAPS and SEGMENT must be delivered in this order. By /* STREAM_START, CAPS and SEGMENT must be delivered in this order. By
* storing the sticky ordered we can check that this is respected. */ * storing the sticky ordered we can check that this is respected. */
if (G_UNLIKELY (GST_EVENT_TYPE (ev->event) <= GST_EVENT_SEGMENT if (G_UNLIKELY (ev->sticky_order <=
|| GST_EVENT_TYPE (ev->event) == GST_EVENT_EOS)) gst_event_type_to_sticky_ordering (GST_EVENT_SEGMENT)
|| GST_EVENT_TYPE (ev->event) == GST_EVENT_EOS)) {
g_warning (G_STRLOC g_warning (G_STRLOC
":%s:<store %p> Sticky event misordering, got '%s' before '%s'", ":%s:<store %p> Sticky event misordering, got '%s' before '%s'",
G_STRFUNC, store, G_STRFUNC, store,
gst_event_type_get_name (GST_EVENT_TYPE (ev->event)), gst_event_type_get_name (GST_EVENT_TYPE (ev->event)),
gst_event_type_get_name (type)); gst_event_type_get_name (type));
}
break; break;
} }
} }
if (insert) { if (insert) {
PadEvent ev; PadEvent ev;
ev.event = gst_event_ref (event); ev.event = gst_event_ref (event);
ev.sticky_order = event_sticky_order;
ev.delivered = delivered; ev.delivered = delivered;
g_array_insert_val (events, i, ev); g_array_insert_val (events, i, ev);