From 8b08305ef9a1d94f527577b436e29d47035115ad Mon Sep 17 00:00:00 2001
From: Jan Schmidt <jan@centricular.com>
Date: Tue, 15 Nov 2022 21:42:34 +1100
Subject: [PATCH] adaptivedemux2: Fix sticky event storage.

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>
---
 .../ext/adaptivedemux2/gstadaptivedemuxutils.c            | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemuxutils.c b/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemuxutils.c
index b27e029..f959819 100644
--- a/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemuxutils.c
+++ b/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemuxutils.c
@@ -500,6 +500,7 @@ typedef struct
 {
   gboolean delivered;
   GstEvent *event;
+  guint sticky_order;
 } PadEvent;
 
 void
@@ -541,12 +542,12 @@ gst_event_store_insert_event (GstEventStore * store, GstEvent * event,
     gboolean delivered)
 {
   guint i, len;
-  GstEventType type;
   GArray *events;
   GQuark name_id = 0;
   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)
     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;
     }
 
-    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)) {
       /* STREAM_START, CAPS and SEGMENT must be delivered in this order. By
        * storing the sticky ordered we can check that this is respected. */
-      if (G_UNLIKELY (GST_EVENT_TYPE (ev->event) <= GST_EVENT_SEGMENT
-              || GST_EVENT_TYPE (ev->event) == GST_EVENT_EOS))
+      if (G_UNLIKELY (ev->sticky_order <=
+              gst_event_type_to_sticky_ordering (GST_EVENT_SEGMENT)
+              || GST_EVENT_TYPE (ev->event) == GST_EVENT_EOS)) {
         g_warning (G_STRLOC
             ":%s:<store %p> Sticky event misordering, got '%s' before '%s'",
             G_STRFUNC, store,
             gst_event_type_get_name (GST_EVENT_TYPE (ev->event)),
             gst_event_type_get_name (type));
+      }
       break;
     }
   }
   if (insert) {
     PadEvent ev;
     ev.event = gst_event_ref (event);
+    ev.sticky_order = event_sticky_order;
     ev.delivered = delivered;
     g_array_insert_val (events, i, ev);
 
-- 
2.7.4