The pad-template on the sinkpad should be set by the derived classes. Also added...

Original commit message from CVS:
The pad-template on the sinkpad should be set by the derived classes. Also added some usefull macros.

diff --git a/ChangeLog b/ChangeLog
index 3f6d86325acbba17281638d37742d24fc37221bd..6792c2c6700eb92ab72772a6f381d1428c5e345c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-10-25  Zeeshan Ali  <zeenix@gmail.com>
+
+       * gst-libs/gst/rtp/gstbasertpdepayload.c:
+       (gst_base_rtp_depayload_base_init),
+       (gst_base_rtp_depayload_finalize):
+       * gst-libs/gst/rtp/gstbasertpdepayload.h:
+       * gst-libs/gst/rtp/gstbasertppayload.h:
+       The pad-template on the sinkpad should be set by the derived classes. Also
+       added some usefull macros.
+
 2005-10-24  Wim Taymans  <wim@fluendo.com>
 
        * ext/vorbis/vorbisdec.c: (vorbis_handle_data_packet):

diff --git a/gst-libs/gst/rtp/gstbasertpdepayload.c b/gst-libs/gst/rtp/gstbasertpdepayload.c
index 33732e971ef5637f40a42be328cbb67e64b72481..b05f093d802d38b4acc41ec16d6482e8a8196a00 100644 (file)
--- a/gst-libs/gst/rtp/gstbasertpdepayload.c
+++ b/gst-libs/gst/rtp/gstbasertpdepayload.c
@@ -36,12 +36,6 @@ enum
   ARG_QUEUEDELAY,
 };
 
-static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("application/x-rtp")
-    );
-
 static GstElementClass *parent_class = NULL;
 
 static void gst_base_rtp_depayload_base_init (GstBaseRTPDepayloadClass * klass);
@@ -100,10 +94,7 @@ static void gst_base_rtp_depayload_set_gst_timestamp
 static void
 gst_base_rtp_depayload_base_init (GstBaseRTPDepayloadClass * klass)
 {
-  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
-
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&sink_factory));
+  //GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
 }
 
 static void
@@ -176,7 +167,9 @@ gst_base_rtp_depayload_finalize (GObject * object)
 {
   // free our queue
   g_queue_free (GST_BASE_RTP_DEPAYLOAD (object)->queue);
-  G_OBJECT_CLASS (parent_class)->finalize (object);
+
+  if (G_OBJECT_CLASS (parent_class)->finalize)
+    G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 static gboolean

diff --git a/gst-libs/gst/rtp/gstbasertpdepayload.h b/gst-libs/gst/rtp/gstbasertpdepayload.h
index ad9f1a4ec919f97ab62964d5e70e72f62879150d..e199aa83d8cfb3b24726d83430821f2ece257de8 100644 (file)
--- a/gst-libs/gst/rtp/gstbasertpdepayload.h
+++ b/gst-libs/gst/rtp/gstbasertpdepayload.h
@@ -38,6 +38,9 @@ G_BEGIN_DECLS
 #define GST_IS_BASE_RTP_DEPAYLOAD_CLASS(obj) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_BASE_RTP_DEPAYLOAD))
 
+#define GST_BASE_RTP_DEPAYLOAD_SINKPAD(depayload) (GST_BASE_RTP_DEPAYLOAD (depayload)->sinkpad)
+#define GST_BASE_RTP_DEPAYLOAD_SRCPAD(depayload)  (GST_BASE_RTP_DEPAYLOAD (depayload)->srcpad)
+
 // in milliseconds
 #define RTP_QUEUEDELAY 100;
 

diff --git a/gst-libs/gst/rtp/gstbasertppayload.h b/gst-libs/gst/rtp/gstbasertppayload.h
index 9accc1dd1fb0b704384cef9850ceca7d08183b27..786f00efe9d237c84f05c22677a3ca3d96f7b8b4 100644 (file)
--- a/gst-libs/gst/rtp/gstbasertppayload.h
+++ b/gst-libs/gst/rtp/gstbasertppayload.h
@@ -42,7 +42,6 @@ typedef struct _GstBaseRTPPayloadClass GstBaseRTPPayloadClass;
 
 #define GST_BASE_RTP_PAYLOAD_SINKPAD(payload) (GST_BASE_RTP_PAYLOAD (payload)->sinkpad)
 #define GST_BASE_RTP_PAYLOAD_SRCPAD(payload)  (GST_BASE_RTP_PAYLOAD (payload)->srcpad)
-#define GST_BASE_RTP_PAYLOAD_SINKPAD(payload) (GST_BASE_RTP_PAYLOAD (payload)->sinkpad)
 
 #define GST_BASE_RTP_PAYLOAD_PT(payload)  (GST_BASE_RTP_PAYLOAD (payload)->pt)
 #define GST_BASE_RTP_PAYLOAD_MTU(payload) (GST_BASE_RTP_PAYLOAD (payload)->mtu)