From 9966fdfa756ff2ef5c5dcf541cb9b9dfe3b3d878 Mon Sep 17 00:00:00 2001
From: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
Date: Tue, 10 Jun 2014 15:42:14 -0400
Subject: [PATCH] multipartdemux: Send stream-start event

This event was not sent. Send it before caps, this requires the pad to
be parented. This removes warning like: "Got data flow before
stream-start event".

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=731475
---
 gst/multipart/multipartdemux.c | 39 ++++++++++++++++++++++++++++++----
 gst/multipart/multipartdemux.h |  4 ++++
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/gst/multipart/multipartdemux.c b/gst/multipart/multipartdemux.c
index 7ba880c6ad..b44fee5d81 100644
--- a/gst/multipart/multipartdemux.c
+++ b/gst/multipart/multipartdemux.c
@@ -188,6 +188,8 @@ gst_multipart_demux_init (GstMultipartDemux * multipart)
   multipart->header_completed = FALSE;
   multipart->scanpos = 0;
   multipart->singleStream = DEFAULT_SINGLE_STREAM;
+  multipart->have_group_id = FALSE;
+  multipart->group_id = G_MAXUINT;
 }
 
 static void
@@ -296,6 +298,8 @@ gst_multipart_find_pad_by_mime (GstMultipartDemux * demux, gchar * mime,
     gchar *name;
     const gchar *capsname;
     GstCaps *caps;
+    gchar *stream_id;
+    GstEvent *event;
 
     mppad = g_new0 (GstMultipartPad, 1);
 
@@ -316,17 +320,42 @@ gst_multipart_find_pad_by_mime (GstMultipartDemux * demux, gchar * mime,
     demux->srcpads = g_slist_prepend (demux->srcpads, mppad);
     demux->numpads++;
 
+    gst_pad_use_fixed_caps (pad);
+    gst_pad_set_active (pad, TRUE);
+    gst_element_add_pad (GST_ELEMENT_CAST (demux), pad);
+
+    /* prepare and send stream-start */
+    if (!demux->have_group_id) {
+      event = gst_pad_get_sticky_event (demux->sinkpad,
+          GST_EVENT_STREAM_START, 0);
+
+      if (event) {
+        demux->have_group_id =
+            gst_event_parse_group_id (event, &demux->group_id);
+        gst_event_unref (event);
+      } else if (!demux->have_group_id) {
+        demux->have_group_id = TRUE;
+        demux->group_id = gst_util_group_id_next ();
+      }
+    }
+
+    stream_id = gst_pad_create_stream_id (pad,
+        GST_ELEMENT_CAST (demux), demux->mime_type);
+
+    event = gst_event_new_stream_start (stream_id);
+    if (demux->have_group_id)
+      gst_event_set_group_id (event, demux->group_id);
+
+    gst_pad_push_event (pad, event);
+    g_free (stream_id);
+
     /* take the mime type, convert it to the caps name */
     capsname = gst_multipart_demux_get_gstname (demux, mime);
     caps = gst_caps_from_string (capsname);
     GST_DEBUG_OBJECT (demux, "caps for pad: %s", capsname);
-    gst_pad_use_fixed_caps (pad);
-    gst_pad_set_active (pad, TRUE);
     gst_pad_set_caps (pad, caps);
     gst_caps_unref (caps);
 
-    gst_element_add_pad (GST_ELEMENT_CAST (demux), pad);
-
     if (created) {
       *created = TRUE;
     }
@@ -677,6 +706,8 @@ gst_multipart_demux_change_state (GstElement * element,
       multipart->content_length = -1;
       multipart->scanpos = 0;
       gst_multipart_demux_remove_src_pads (multipart);
+      multipart->have_group_id = FALSE;
+      multipart->group_id = G_MAXUINT;
       break;
     case GST_STATE_CHANGE_READY_TO_NULL:
       break;
diff --git a/gst/multipart/multipartdemux.h b/gst/multipart/multipartdemux.h
index 4db33c2660..cb81a83d12 100644
--- a/gst/multipart/multipartdemux.h
+++ b/gst/multipart/multipartdemux.h
@@ -87,6 +87,10 @@ struct _GstMultipartDemux
   gint scanpos;
 
   gboolean singleStream;
+
+  /* to handle stream-start */
+  gboolean have_group_id;
+  guint group_id;
 };
 
 struct _GstMultipartDemuxClass