gst/rtp/: Added an H263 depayloader. Fixes #369392.

Original commit message from CVS:
* gst/rtp/Makefile.am:
* gst/rtp/gstrtp.c: (plugin_init):
* gst/rtp/gstrtph263depay.c: (gst_rtp_h263_depay_base_init),
(gst_rtp_h263_depay_class_init), (gst_rtp_h263_depay_init),
(gst_rtp_h263_depay_finalize), (gst_rtp_h263_depay_setcaps),
(gst_rtp_h263_depay_process), (gst_rtp_h263_depay_set_property),
(gst_rtp_h263_depay_get_property),
(gst_rtp_h263_depay_change_state),
(gst_rtp_h263_depay_plugin_init):
* gst/rtp/gstrtph263depay.h:
Added an H263 depayloader. Fixes #369392.
* gst/rtp/gstrtph263pdepay.c: (gst_rtp_h263p_depay_setcaps),
(gst_rtp_h263p_depay_process):
* gst/rtp/gstrtph263ppay.c: (gst_fragmentation_mode_get_type),
(gst_rtp_h263p_pay_class_init), (gst_rtp_h263p_pay_flush):
Make the H263+ pay/depayloader support H263-1998 and H263-2000
payloads.
Also alow plain H263 on the h263p payloaders. Fixes #465040.

ChangeLog

@@ -1,3 +1,25 @@
+2007-08-20  Wim Taymans  <wim.taymans@gmail.com>
+
+	* gst/rtp/Makefile.am:
+	* gst/rtp/gstrtp.c: (plugin_init):
+	* gst/rtp/gstrtph263depay.c: (gst_rtp_h263_depay_base_init),
+	(gst_rtp_h263_depay_class_init), (gst_rtp_h263_depay_init),
+	(gst_rtp_h263_depay_finalize), (gst_rtp_h263_depay_setcaps),
+	(gst_rtp_h263_depay_process), (gst_rtp_h263_depay_set_property),
+	(gst_rtp_h263_depay_get_property),
+	(gst_rtp_h263_depay_change_state),
+	(gst_rtp_h263_depay_plugin_init):
+	* gst/rtp/gstrtph263depay.h:
+	Added an H263 depayloader. Fixes #369392.
+
+	* gst/rtp/gstrtph263pdepay.c: (gst_rtp_h263p_depay_setcaps),
+	(gst_rtp_h263p_depay_process):
+	* gst/rtp/gstrtph263ppay.c: (gst_fragmentation_mode_get_type),
+	(gst_rtp_h263p_pay_class_init), (gst_rtp_h263p_pay_flush):
+	Make the H263+ pay/depayloader support H263-1998 and H263-2000
+	payloads.
+	Also alow plain H263 on the h263p payloaders. Fixes #465040.
+
 2007-08-19  Sebastian Dröge  <slomo@circular-chaos.org>
 
 	* gst/audiofx/audiochebyshevfreqband.c:

common

@@ -1 +1 @@
-Subproject commit b3fe2a25c1cd0f4b021795d0db7330aeb338da7c
+Subproject commit 9c7f1a63dfed1b2770b5fdaa16e0ae114b2177cf

gst/rtp/Makefile.am

@@ -20,6 +20,7 @@ libgstrtp_la_SOURCES = \
 	gstrtpamrpay.c \
 	gstrtph263pdepay.c \
 	gstrtph263ppay.c \
+	gstrtph263depay.c \
 	gstrtph263pay.c \
 	gstrtph264depay.c \
 	gstrtph264pay.c \
@@ -74,6 +75,7 @@ noinst_HEADERS =			\
 		 gstrtpmpvdepay.h       \
 		 gstrtph263pdepay.h 	\
 		 gstrtph263ppay.h 	\
+		 gstrtph263depay.h 	\
 		 gstrtph263pay.h 	\
 		 gstrtph264depay.h 	\
 		 gstrtph264pay.h 	\

gst/rtp/gstrtp.c

@@ -38,6 +38,7 @@
 #include "gstrtpmpvdepay.h"
 #include "gstrtph263pdepay.h"
 #include "gstrtph263ppay.h"
+#include "gstrtph263depay.h"
 #include "gstrtph263pay.h"
 #include "gstrtph264depay.h"
 #include "gstrtph264pay.h"
@@ -113,6 +114,9 @@ plugin_init (GstPlugin * plugin)
   if (!gst_rtp_h263p_depay_plugin_init (plugin))
     return FALSE;
 
+  if (!gst_rtp_h263_depay_plugin_init (plugin))
+    return FALSE;
+
   if (!gst_rtp_h263_pay_plugin_init (plugin))
     return FALSE;
 

gst/rtp/gstrtph263depay.c

@@ -0,0 +1,357 @@
+/* GStreamer
+ *
+ * Copyright 2007 Nokia Corporation
+ * Copyright 2007 Collabora Ltd,
+ *  @author: Philippe Kalaf <philippe.kalaf@collabora.co.uk>
+ *
+ * Copyright (C) <2005> Wim Taymans <wim@fluendo.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include <string.h>
+
+#include <gst/rtp/gstrtpbuffer.h>
+#include "gstrtph263depay.h"
+
+/* elementfactory information */
+static const GstElementDetails gst_rtp_h263depay_details =
+GST_ELEMENT_DETAILS ("RTP H263 packet depayloader",
+    "Codec/Depayloader/Network",
+    "Extracts H263 video from RTP packets (RFC 2190)",
+    "Philippe Kalaf <philippe.kalaf@collabora.co.uk>");
+
+enum
+{
+  /* FILL ME */
+  LAST_SIGNAL
+};
+
+enum
+{
+  ARG_0
+};
+
+#define GST_RFC2190A_HEADER_LEN 4
+#define GST_RFC2190B_HEADER_LEN 8
+#define GST_RFC2190C_HEADER_LEN 12
+
+static GstStaticPadTemplate gst_rtp_h263_depay_src_template =
+GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("video/x-h263, "
+        "variant = (string) \"itu\", " "h263version = (string) \"h263\"")
+    );
+
+static GstStaticPadTemplate gst_rtp_h263_depay_sink_template =
+    GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("application/x-rtp, "
+        "media = (string) \"video\", "
+        "payload = (int) " GST_RTP_PAYLOAD_H263_STRING ", "
+        "clock-rate = (int) 90000, " "encoding-name = (string) \"H263\"; "
+        "application/x-rtp, "
+        "media = (string) \"video\", "
+        "payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
+        "clock-rate = (int) 90000, " "encoding-name = (string) \"H263\"")
+    );
+
+GST_BOILERPLATE (GstRtpH263Depay, gst_rtp_h263_depay, GstBaseRTPDepayload,
+    GST_TYPE_BASE_RTP_DEPAYLOAD);
+
+static void gst_rtp_h263_depay_finalize (GObject * object);
+static void gst_rtp_h263_depay_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
+static void gst_rtp_h263_depay_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+
+static GstStateChangeReturn gst_rtp_h263_depay_change_state (GstElement *
+    element, GstStateChange transition);
+
+static GstBuffer *gst_rtp_h263_depay_process (GstBaseRTPDepayload * depayload,
+    GstBuffer * buf);
+gboolean gst_rtp_h263_depay_setcaps (GstBaseRTPDepayload * filter,
+    GstCaps * caps);
+
+static void
+gst_rtp_h263_depay_base_init (gpointer klass)
+{
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_rtp_h263_depay_src_template));
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_rtp_h263_depay_sink_template));
+
+
+  gst_element_class_set_details (element_class, &gst_rtp_h263depay_details);
+}
+
+static void
+gst_rtp_h263_depay_class_init (GstRtpH263DepayClass * klass)
+{
+  GObjectClass *gobject_class;
+  GstElementClass *gstelement_class;
+  GstBaseRTPDepayloadClass *gstbasertpdepayload_class;
+
+  gobject_class = (GObjectClass *) klass;
+  gstelement_class = (GstElementClass *) klass;
+  gstbasertpdepayload_class = (GstBaseRTPDepayloadClass *) klass;
+
+  parent_class = g_type_class_peek_parent (klass);
+
+  gstbasertpdepayload_class->process = gst_rtp_h263_depay_process;
+  gstbasertpdepayload_class->set_caps = gst_rtp_h263_depay_setcaps;
+
+  gobject_class->finalize = gst_rtp_h263_depay_finalize;
+
+  gobject_class->set_property = gst_rtp_h263_depay_set_property;
+  gobject_class->get_property = gst_rtp_h263_depay_get_property;
+
+  gstelement_class->change_state = gst_rtp_h263_depay_change_state;
+}
+
+static void
+gst_rtp_h263_depay_init (GstRtpH263Depay * rtph263depay,
+    GstRtpH263DepayClass * klass)
+{
+  rtph263depay->adapter = gst_adapter_new ();
+}
+
+static void
+gst_rtp_h263_depay_finalize (GObject * object)
+{
+  GstRtpH263Depay *rtph263depay;
+
+  rtph263depay = GST_RTP_H263_DEPAY (object);
+
+  g_object_unref (rtph263depay->adapter);
+  rtph263depay->adapter = NULL;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+gboolean
+gst_rtp_h263_depay_setcaps (GstBaseRTPDepayload * filter, GstCaps * caps)
+{
+  GstCaps *srccaps;
+  GstStructure *structure = gst_caps_get_structure (caps, 0);
+  gint clock_rate = 90000;      /* default */
+
+  gst_structure_get_int (structure, "clock-rate", &clock_rate);
+  filter->clock_rate = clock_rate;
+
+  srccaps = gst_caps_new_simple ("video/x-h263",
+      "variant", G_TYPE_STRING, "itu",
+      "h263version", G_TYPE_STRING, "h263", NULL);
+  gst_pad_set_caps (GST_BASE_RTP_DEPAYLOAD_SRCPAD (filter), srccaps);
+  gst_caps_unref (srccaps);
+
+  return TRUE;
+}
+
+static GstBuffer *
+gst_rtp_h263_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
+{
+
+  GstRtpH263Depay *rtph263depay;
+  GstBuffer *outbuf;
+
+  rtph263depay = GST_RTP_H263_DEPAY (depayload);
+
+  if (!gst_rtp_buffer_validate (buf))
+    goto bad_packet;
+
+  {
+    gint payload_len;
+    guint8 *payload;
+    guint32 timestamp;
+    guint header_len;
+
+    gboolean F, P, M;
+
+    payload_len = gst_rtp_buffer_get_payload_len (buf);
+    payload = gst_rtp_buffer_get_payload (buf);
+
+    M = gst_rtp_buffer_get_marker (buf);
+
+    /* Let's see what mode we are using */
+    F = (payload[0] & 0x01) == 0x01;
+    P = (payload[0] & 0x02) == 0x02;
+
+    if (F == 0) {
+      /* F == 0 and P == 0 or 1
+       * mode A */
+      header_len = GST_RFC2190A_HEADER_LEN;
+
+      /* 0                   1                   2                   3
+       * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+       * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+       * |F|P|SBIT |EBIT | SRC |I|U|S|A|R      |DBQ| TRB |    TR         |
+       * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+       */
+    } else if (P == 0) {
+      /* F == 1 and P == 0
+       * mode B */
+      header_len = GST_RFC2190B_HEADER_LEN;
+
+      /* 0                   1                   2                   3
+       * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+       * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+       * |F|P|SBIT |EBIT | SRC | QUANT   |  GOBN   |   MBA           |R  |
+       * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+       * |I|U|S|A| HMV1        | VMV1        | HMV2        | VMV2        |
+       * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+       */
+    } else {
+      /* F == 1 and P == 1
+       * mode C */
+      header_len = GST_RFC2190C_HEADER_LEN;
+
+      /* 0                   1                   2                   3
+       * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+       * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+       * |F|P|SBIT |EBIT | SRC | QUANT   |  GOBN   |   MBA           |R  |
+       * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+       * |I|U|S|A| HMV1        | VMV1        | HMV2        | VMV2        |
+       * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+       * | RR                                  |DBQ| TRB |    TR         |
+       * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+       */
+    }
+
+    payload += header_len;
+    payload_len -= header_len;
+
+    timestamp = gst_rtp_buffer_get_timestamp (buf);
+
+    /* FIXME at this point, we just drop the header and don't check for any missing
+     * buffers, proper behaviour is to recreate the appropriate information in the
+     * bitstream if it has been lost */
+    if (M) {
+      /* frame is completed: append to previous, push it out */
+      guint len, padlen;
+      guint avail;
+
+      avail = gst_adapter_available (rtph263depay->adapter);
+
+      len = avail + payload_len;
+      padlen = (len % 4) + 4;
+      outbuf = gst_buffer_new_and_alloc (len + padlen);
+      memset (GST_BUFFER_DATA (outbuf) + len, 0, padlen);
+      GST_BUFFER_SIZE (outbuf) = len;
+
+      /* prepend previous data */
+      if (avail > 0) {
+        gst_adapter_copy (rtph263depay->adapter, GST_BUFFER_DATA (outbuf), 0,
+            avail);
+        gst_adapter_flush (rtph263depay->adapter, avail);
+      }
+      memcpy (GST_BUFFER_DATA (outbuf) + avail, payload, payload_len);
+
+      return outbuf;
+
+    } else {
+      /* frame not completed: store in adapter */
+      outbuf = gst_buffer_new_and_alloc (payload_len);
+
+      memcpy (GST_BUFFER_DATA (outbuf), payload, payload_len);
+
+      gst_adapter_push (rtph263depay->adapter, outbuf);
+    }
+  }
+  return NULL;
+
+bad_packet:
+  {
+    GST_ELEMENT_WARNING (rtph263depay, STREAM, DECODE,
+        ("Packet did not validate"), (NULL));
+    return NULL;
+  }
+}
+
+static void
+gst_rtp_h263_depay_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstRtpH263Depay *rtph263depay;
+
+  rtph263depay = GST_RTP_H263_DEPAY (object);
+
+  switch (prop_id) {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_rtp_h263_depay_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstRtpH263Depay *rtph263depay;
+
+  rtph263depay = GST_RTP_H263_DEPAY (object);
+
+  switch (prop_id) {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static GstStateChangeReturn
+gst_rtp_h263_depay_change_state (GstElement * element,
+    GstStateChange transition)
+{
+  GstRtpH263Depay *rtph263depay;
+  GstStateChangeReturn ret;
+
+  rtph263depay = GST_RTP_H263_DEPAY (element);
+
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
+      break;
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
+      gst_adapter_clear (rtph263depay->adapter);
+      break;
+    default:
+      break;
+  }
+
+  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
+
+  switch (transition) {
+    case GST_STATE_CHANGE_READY_TO_NULL:
+      break;
+    default:
+      break;
+  }
+  return ret;
+}
+
+gboolean
+gst_rtp_h263_depay_plugin_init (GstPlugin * plugin)
+{
+  return gst_element_register (plugin, "rtph263depay",
+      GST_RANK_MARGINAL, GST_TYPE_RTP_H263_DEPAY);
+}

gst/rtp/gstrtph263depay.h

@@ -0,0 +1,60 @@
+/* GStreamer
+ * Copyright (C) <2005> Wim Taymans <wim@fluendo.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GST_RTP_H263_DEPAY_H__
+#define __GST_RTP_H263_DEPAY_H__
+
+#include <gst/gst.h>
+#include <gst/base/gstadapter.h>
+#include <gst/rtp/gstbasertpdepayload.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_RTP_H263_DEPAY \
+  (gst_rtp_h263_depay_get_type())
+#define GST_RTP_H263_DEPAY(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTP_H263_DEPAY,GstRtpH263Depay))
+#define GST_RTP_H263_DEPAY_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTP_H263_DEPAY,GstRtpH263DepayClass))
+#define GST_IS_RTP_H263_DEPAY(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_H263_DEPAY))
+#define GST_IS_RTP_H263_DEPAY_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_H263_DEPAY))
+
+typedef struct _GstRtpH263Depay GstRtpH263Depay;
+typedef struct _GstRtpH263DepayClass GstRtpH263DepayClass;
+
+struct _GstRtpH263Depay
+{
+  GstBaseRTPDepayload depayload;
+
+  GstAdapter *adapter;
+};
+
+struct _GstRtpH263DepayClass
+{
+  GstBaseRTPDepayloadClass parent_class;
+};
+
+gboolean gst_rtp_h263_depay_plugin_init (GstPlugin * plugin);
+
+G_END_DECLS
+
+#endif /* __GST_RTP_H263_DEPAY_H__ */
+

gst/rtp/gstrtph263pdepay.c

@@ -30,7 +30,7 @@
 static const GstElementDetails gst_rtp_h263pdepay_details =
 GST_ELEMENT_DETAILS ("RTP packet depayloader",
     "Codec/Depayloader/Network",
-    "Extracts H263+ video from RTP packets (RFC 2429)",
+    "Extracts H263/+/++ video from RTP packets (RFC 4629)",
     "Wim Taymans <wim@fluendo.com>");
 
 /* RtpH263PDepay signals and args */
@@ -50,18 +50,50 @@ static GstStaticPadTemplate gst_rtp_h263p_depay_src_template =
 GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("video/x-h263, "
+    GST_STATIC_CAPS ("video/x-h263, " "variant = (string) \"itu\" ")
-        "variant = (string) \"itu\", " "h263version = (string) \"h263p\"")
     );
 
 static GstStaticPadTemplate gst_rtp_h263p_depay_sink_template =
-GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("application/x-rtp, "
         "media = (string) \"video\", "
         "payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
-        "clock-rate = (int) 90000, " "encoding-name = (string) \"H263-1998\"")
+        "clock-rate = (int) 90000, " "encoding-name = (string) \"H263-1998\"; "
+        /* optional params */
+        /* NOTE all optional SDP params must be strings in the caps */
+        /*
+           "sqcif = (string) [1, 32], "
+           "qcif = (string) [1, 32], "
+           "cif = (string) [1, 32], "
+           "cif4 = (string) [1, 32], "
+           "cif16 = (string) [1, 32], "
+           "custom = (string) ANY, "
+           "f = (string) {0, 1},"
+           "i = (string) {0, 1},"
+           "j = (string) {0, 1},"
+           "t = (string) {0, 1},"
+           "k = (string) {1, 2, 3, 4},"
+           "n = (string) {1, 2, 3, 4},"
+           "p = (string) ANY,"
+           "par = (string) ANY, "
+           "cpcf = (string) ANY, "
+           "bpp = (string) [0, 65536], "
+           "hrd = (string) {0, 1}; "
+         */
+        "application/x-rtp, "
+        "media = (string) \"video\", "
+        "payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
+        "clock-rate = (int) 90000, " "encoding-name = (string) \"H263-2000\" "
+        /* optional params */
+        /* NOTE all optional SDP params must be strings in the caps */
+        /*
+           "profile = (string) [0, 10], "
+           "level = (string) {10, 20, 30, 40, 45, 50, 60, 70}, "
+           "interlace = (string) {0, 1};"
+         */
+    )
     );
 
 GST_BOILERPLATE (GstRtpH263PDepay, gst_rtp_h263p_depay, GstBaseRTPDepayload,
@@ -142,20 +174,84 @@ gst_rtp_h263p_depay_finalize (GObject * object)
 gboolean
 gst_rtp_h263p_depay_setcaps (GstBaseRTPDepayload * filter, GstCaps * caps)
 {
-  GstCaps *srccaps;
+  GstCaps *srccaps = NULL;
   GstStructure *structure = gst_caps_get_structure (caps, 0);
   gint clock_rate = 90000;      /* default */
+  const gchar *encoding_name = NULL;
 
   gst_structure_get_int (structure, "clock-rate", &clock_rate);
   filter->clock_rate = clock_rate;
 
-  srccaps = gst_caps_new_simple ("video/x-h263",
+  encoding_name = gst_structure_get_string (structure, "encoding-name");
-      "variant", G_TYPE_STRING, "itu",
+  if (encoding_name == NULL)
-      "h263version", G_TYPE_STRING, "h263p", NULL);
+    goto no_encoding_name;
+
+  if (g_ascii_strcasecmp (encoding_name, "H263-2000") == 0) {
+    /* always h263++ */
+    srccaps = gst_caps_new_simple ("video/x-h263",
+        "variant", G_TYPE_STRING, "itu",
+        "h263version", G_TYPE_STRING, "h263pp", NULL);
+  } else if (g_ascii_strcasecmp (encoding_name, "H263-1998") == 0) {
+    /* this can be H263 or H263+ depending on defined appendixes in the optional
+     * SDP params */
+    const gchar *F, *I, *J, *T, *K, *N, *P;
+    gboolean is_h263p = FALSE;
+
+    F = gst_structure_get_string (structure, "f");
+    if (F)
+      if (g_strcasecmp (F, "1") == 0)
+        is_h263p = TRUE;
+    I = gst_structure_get_string (structure, "i");
+    if (I)
+      if (g_strcasecmp (I, "1") == 0)
+        is_h263p = TRUE;
+    J = gst_structure_get_string (structure, "j");
+    if (J)
+      if (g_strcasecmp (J, "1") == 0)
+        is_h263p = TRUE;
+    T = gst_structure_get_string (structure, "t");
+    if (T)
+      if (g_strcasecmp (T, "1") == 0)
+        is_h263p = TRUE;
+    K = gst_structure_get_string (structure, "k");
+    if (K)
+      is_h263p = TRUE;
+    N = gst_structure_get_string (structure, "n");
+    if (N)
+      is_h263p = TRUE;
+    P = gst_structure_get_string (structure, "p");
+    if (P)
+      is_h263p = TRUE;
+
+    if (is_h263p) {
+      srccaps = gst_caps_new_simple ("video/x-h263",
+          "variant", G_TYPE_STRING, "itu",
+          "h263version", G_TYPE_STRING, "h263p", NULL);
+    } else {
+      srccaps = gst_caps_new_simple ("video/x-h263",
+          "variant", G_TYPE_STRING, "itu",
+          "h263version", G_TYPE_STRING, "h263", NULL);
+    }
+  }
+  if (!srccaps)
+    goto no_caps;
+
   gst_pad_set_caps (GST_BASE_RTP_DEPAYLOAD_SRCPAD (filter), srccaps);
   gst_caps_unref (srccaps);
 
   return TRUE;
+
+  /* ERRORS */
+no_encoding_name:
+  {
+    GST_ERROR_OBJECT (filter, "no encoding-name");
+    return FALSE;
+  }
+no_caps:
+  {
+    GST_ERROR_OBJECT (filter, "invalid encoding-name");
+    return FALSE;
+  }
 }
 
 static GstBuffer *
@@ -220,7 +316,8 @@ gst_rtp_h263p_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
       goto waiting_start;
 
     /* FIXME do not ignore the VRC header (See RFC 2429 section 4.2) */
-    /* strip off header */
+    /* FIXME actually use the RTP picture header when it is lost in the network */
+    /* for now strip off header */
     payload += header_len;
     payload_len -= header_len;
 
@@ -247,12 +344,6 @@ gst_rtp_h263p_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
       }
       memcpy (GST_BUFFER_DATA (outbuf) + avail, payload, payload_len);
 
-      GST_BUFFER_TIMESTAMP (outbuf) =
-          timestamp * GST_SECOND / depayload->clock_rate;
-
-      gst_buffer_set_caps (outbuf,
-          (GstCaps *) gst_pad_get_pad_template_caps (depayload->srcpad));
-
       return outbuf;
 
     } else {

gst/rtp/gstrtph263ppay.c

@@ -61,25 +61,28 @@ GST_DEBUG_CATEGORY_STATIC (rtph263ppay_debug);
 static const GstElementDetails gst_rtp_h263ppay_details =
 GST_ELEMENT_DETAILS ("RTP packet payloader",
     "Codec/Payloader/Network",
-    "Payload-encodes H263+ video in RTP packets (RFC 2429)",
+    "Payload-encodes H263/+/++ video in RTP packets (RFC 4629)",
     "Wim Taymans <wim@fluendo.com>");
 
 static GstStaticPadTemplate gst_rtp_h263p_pay_sink_template =
 GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("video/x-h263, "
+    GST_STATIC_CAPS ("video/x-h263, " "variant = (string) \"itu\" ")
-        "variant = (string) \"itu\", " "h263version = (string) \"h263p\"")
     );
 
 static GstStaticPadTemplate gst_rtp_h263p_pay_src_template =
-GST_STATIC_PAD_TEMPLATE ("src",
+    GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("application/x-rtp, "
         "media = (string) \"video\", "
         "payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
-        "clock-rate = (int) 90000, " "encoding-name = (string) \"H263-1998\"")
+        "clock-rate = (int) 90000, " "encoding-name = (string) \"H263-1998\"; "
+        "application/x-rtp, "
+        "media = (string) \"video\", "
+        "payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
+        "clock-rate = (int) 90000, " "encoding-name = (string) \"H263-2000\"")
     );
 
 static void gst_rtp_h263p_pay_class_init (GstRtpH263PPayClass * klass);
@@ -165,7 +168,7 @@ gst_rtp_h263p_pay_class_init (GstRtpH263PPayClass * klass)
           DEFAULT_FRAGMENTATION_MODE, G_PARAM_READWRITE));
 
   GST_DEBUG_CATEGORY_INIT (rtph263ppay_debug, "rtph263ppay",
-      0, "rtph263ppay (RFC 2429)");
+      0, "rtph263ppay (RFC 4629)");
 
 }
 
@@ -250,16 +253,16 @@ gst_rtp_h263p_pay_flush (GstRtpH263PPay * rtph263ppay)
     return GST_FLOW_OK;
 
   fragmented = FALSE;
-  /* This algorithm assumes the H263+ encoder sends complete frames in each
+  /* This algorithm assumes the H263/+/++ encoder sends complete frames in each
    * buffer */
   /* With Fragmentation Mode at GST_FRAGMENTATION_MODE_NORMAL:
    *  This algorithm implements the Follow-on packets method for packetization.
    *  This assumes low packet loss network. 
    * With Fragmentation Mode at GST_FRAGMENTATION_MODE_SYNC:
    *  This algorithm separates large frames at synchronisation points (Segments)
-   *  (See RFC 2429 section 6). It would be interesting to have a property such as network
+   *  (See RFC 4629 section 6). It would be interesting to have a property such as network
    *  quality to select between both packetization methods */
-  /* TODO Add VRC supprt (See RFC 2429 section 4.2) */
+  /* TODO Add VRC supprt (See RFC 4629 section 5.2) */
 
   while (avail > 0) {
     guint towrite;
@@ -278,12 +281,15 @@ gst_rtp_h263p_pay_flush (GstRtpH263PPay * rtph263ppay)
       parse_data = gst_adapter_peek (rtph263ppay->adapter, avail);
 
       /* Check if we have a gob or eos , eossbs */
+      /* FIXME EOS and EOSSBS packets should never contain any gobs and vice-versa */
       if (avail >= 3 && *parse_data == 0 && *(parse_data + 1) == 0
           && *(parse_data + 2) >= 0x80) {
         GST_DEBUG_OBJECT (rtph263ppay, " Found GOB header");
         found_gob = TRUE;
       }
       /* Find next and cut the packet accordingly */
+      /* TODO we should get as many gobs as possible until MTU is reached, this
+       * code seems to just get one GOB per packet */
       while (parsed_len + 2 < avail) {
         if (parse_data[parsed_len] == 0 && parse_data[parsed_len + 1] == 0
             && parse_data[parsed_len + 2] >= 0x80) {