From bfb8a04d4f85e042abd9be91063bfacde112daa4 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Thu, 9 Feb 2012 16:14:55 +0100
Subject: [PATCH] sidplay: fix negotiation

---
 ext/sidplay/gstsiddec.cc | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/ext/sidplay/gstsiddec.cc b/ext/sidplay/gstsiddec.cc
index d44c0a77d4..4b9784d146 100644
--- a/ext/sidplay/gstsiddec.cc
+++ b/ext/sidplay/gstsiddec.cc
@@ -77,13 +77,14 @@ static GstStaticPadTemplate sink_templ = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_STATIC_CAPS ("audio/x-sid")
     );
 
-#define FORMATS "{ S8, U8, "GST_AUDIO_NE(S16)","GST_AUDIO_NE(U16)" }"
+#define FORMATS "{ "GST_AUDIO_NE(S16)","GST_AUDIO_NE(U16)", S8, U8 }"
 
 static GstStaticPadTemplate src_templ = GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("audio/x-raw, "
         "format = (string) " FORMATS ", "
+        "layout = (string) interleaved, "
         "rate = (int) [ 8000, 48000 ], " "channels = (int) [ 1, 2 ]")
     );
 
@@ -278,7 +279,7 @@ update_tags (GstSidDec * siddec)
 static gboolean
 siddec_negotiate (GstSidDec * siddec)
 {
-  GstCaps *allowed;
+  GstCaps *allowed, *tmp;
   GstStructure *structure;
   int rate = 44100;
   int channels = 1;
@@ -292,6 +293,10 @@ siddec_negotiate (GstSidDec * siddec)
 
   GST_DEBUG_OBJECT (siddec, "allowed caps: %" GST_PTR_FORMAT, allowed);
 
+  tmp = gst_caps_normalize (allowed);
+  gst_caps_unref (allowed);
+  allowed = tmp;
+
   structure = gst_caps_get_structure (allowed, 0);
 
   str = gst_structure_get_string (structure, "format");
@@ -327,6 +332,7 @@ siddec_negotiate (GstSidDec * siddec)
 
   caps = gst_caps_new_simple ("audio/x-raw",
       "format", G_TYPE_STRING, gst_audio_format_to_string (format),
+      "layout", G_TYPE_STRING, "interleaved",
       "rate", G_TYPE_INT, siddec->config->frequency,
       "channels", G_TYPE_INT, siddec->config->channels, NULL);
   gst_pad_set_caps (siddec->srcpad, caps);
@@ -483,10 +489,10 @@ gst_siddec_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
       res = start_play_tune (siddec);
       break;
     case GST_EVENT_SEGMENT:
-      res = FALSE;
+      res = TRUE;
       break;
     default:
-      res = FALSE;
+      res = TRUE;
       break;
   }
   gst_event_unref (event);