From 5fe6046c20a21900db77cf62e2c5dbb3a5a50274 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Sun, 12 Dec 2010 15:10:47 +0100
Subject: [PATCH] gstdepay: cleanup the cache

---
 gst/rtp/gstrtpgstdepay.c | 63 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 60 insertions(+), 3 deletions(-)

diff --git a/gst/rtp/gstrtpgstdepay.c b/gst/rtp/gstrtpgstdepay.c
index 633971d31b..4e536bafac 100644
--- a/gst/rtp/gstrtpgstdepay.c
+++ b/gst/rtp/gstrtpgstdepay.c
@@ -50,6 +50,10 @@ GST_BOILERPLATE (GstRtpGSTDepay, gst_rtp_gst_depay, GstBaseRTPDepayload,
 
 static void gst_rtp_gst_depay_finalize (GObject * object);
 
+static GstStateChangeReturn gst_rtp_gst_depay_change_state (GstElement *
+    element, GstStateChange transition);
+
+static void gst_rtp_gst_depay_reset (GstRtpGSTDepay * rtpgstdepay);
 static gboolean gst_rtp_gst_depay_setcaps (GstBaseRTPDepayload * depayload,
     GstCaps * caps);
 static GstBuffer *gst_rtp_gst_depay_process (GstBaseRTPDepayload * depayload,
@@ -75,13 +79,17 @@ static void
 gst_rtp_gst_depay_class_init (GstRtpGSTDepayClass * klass)
 {
   GObjectClass *gobject_class;
+  GstElementClass *gstelement_class;
   GstBaseRTPDepayloadClass *gstbasertpdepayload_class;
 
   gobject_class = (GObjectClass *) klass;
+  gstelement_class = (GstElementClass *) klass;
   gstbasertpdepayload_class = (GstBaseRTPDepayloadClass *) klass;
 
   gobject_class->finalize = gst_rtp_gst_depay_finalize;
 
+  gstelement_class->change_state = gst_rtp_gst_depay_change_state;
+
   gstbasertpdepayload_class->set_caps = gst_rtp_gst_depay_setcaps;
   gstbasertpdepayload_class->process = gst_rtp_gst_depay_process;
 
@@ -103,11 +111,31 @@ gst_rtp_gst_depay_finalize (GObject * object)
 
   rtpgstdepay = GST_RTP_GST_DEPAY (object);
 
+  gst_rtp_gst_depay_reset (rtpgstdepay);
   g_object_unref (rtpgstdepay->adapter);
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
+static void
+store_cache (GstRtpGSTDepay * rtpgstdepay, guint CV, GstCaps * caps)
+{
+  if (rtpgstdepay->CV_cache[CV])
+    gst_caps_unref (rtpgstdepay->CV_cache[CV]);
+  rtpgstdepay->CV_cache[CV] = caps;
+}
+
+static void
+gst_rtp_gst_depay_reset (GstRtpGSTDepay * rtpgstdepay)
+{
+  guint i;
+
+  gst_adapter_clear (rtpgstdepay->adapter);
+  rtpgstdepay->current_CV = 0;
+  for (i = 0; i < 8; i++)
+    store_cache (rtpgstdepay, i, NULL);
+}
+
 static gboolean
 gst_rtp_gst_depay_setcaps (GstBaseRTPDepayload * depayload, GstCaps * caps)
 {
@@ -137,6 +165,8 @@ gst_rtp_gst_depay_setcaps (GstBaseRTPDepayload * depayload, GstCaps * caps)
 
     /* we have the SDP caps as output caps */
     rtpgstdepay->current_CV = 0;
+    gst_caps_ref (outcaps);
+    store_cache (rtpgstdepay, 0, outcaps);
   } else {
     outcaps = gst_caps_new_any ();
   }
@@ -220,9 +250,7 @@ gst_rtp_gst_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
 
       /* parse and store in cache */
       outcaps = gst_caps_from_string ((gchar *) & data[offset]);
-      if (rtpgstdepay->CV_cache[CV])
-        gst_caps_unref (rtpgstdepay->CV_cache[CV]);
-      rtpgstdepay->CV_cache[CV] = outcaps;
+      store_cache (rtpgstdepay, CV, outcaps);
 
       /* skip caps */
       offset += csize;
@@ -294,6 +322,35 @@ missing_caps:
   }
 }
 
+static GstStateChangeReturn
+gst_rtp_gst_depay_change_state (GstElement * element, GstStateChange transition)
+{
+  GstRtpGSTDepay *rtpgstdepay;
+  GstStateChangeReturn ret;
+
+  rtpgstdepay = GST_RTP_GST_DEPAY (element);
+
+  switch (transition) {
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
+      gst_rtp_gst_depay_reset (rtpgstdepay);
+      break;
+    default:
+      break;
+  }
+
+  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
+
+  switch (transition) {
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
+      gst_rtp_gst_depay_reset (rtpgstdepay);
+      break;
+    default:
+      break;
+  }
+  return ret;
+}
+
+
 gboolean
 gst_rtp_gst_depay_plugin_init (GstPlugin * plugin)
 {