gst/qtdemux/: Add X-QT depayloader that will eventually share code with the demuxer.

Original commit message from CVS:
* gst/qtdemux/Makefile.am:
* gst/qtdemux/gstrtpxqtdepay.c: (gst_rtp_xqt_depay_base_init),
(gst_rtp_xqt_depay_class_init), (gst_rtp_xqt_depay_init),
(gst_rtp_xqt_depay_finalize), (gst_rtp_quicktime_parse_sd),
(gst_rtp_xqt_depay_setcaps), (gst_rtp_xqt_depay_process),
(gst_rtp_xqt_depay_set_property), (gst_rtp_xqt_depay_get_property),
(gst_rtp_xqt_depay_change_state), (gst_rtp_xqt_depay_plugin_init):
* gst/qtdemux/gstrtpxqtdepay.h:
* gst/qtdemux/qtdemux.c: (gst_qtdemux_base_init),
(gst_qtdemux_loop_state_header), (gst_qtdemux_loop),
(qtdemux_parse_moov), (qtdemux_parse_container),
(qtdemux_parse_node), (gst_qtdemux_add_stream),
(qtdemux_parse_trak), (qtdemux_audio_caps):
* gst/qtdemux/qtdemux.h:
* gst/qtdemux/quicktime.c: (plugin_init):
Add X-QT depayloader that will eventually share code with the demuxer.
Make new plugin entry point with quicktime releated stuff.

6 files changed, 839 insertions, 25 deletions

diff --git a/gst/qtdemux/Makefile.am b/gst/qtdemux/Makefile.am
index 5d1792ec..2c4aa52a 100644
--- a/gst/qtdemux/Makefile.am
+++ b/gst/qtdemux/Makefile.am
@@ -1,14 +1,16 @@
 
 plugin_LTLIBRARIES = libgstqtdemux.la
 
-libgstqtdemux_la_CFLAGS = ${GST_CFLAGS}
-libgstqtdemux_la_LIBADD = $(GST_BASE_LIBS) $(ZLIB_LIBS)
+libgstqtdemux_la_CFLAGS = ${GST_CFLAGS} $(GST_PLUGINS_BASE_CFLAGS) 
+libgstqtdemux_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(ZLIB_LIBS) \
+                      -lgstrtp-@GST_MAJORMINOR@
 libgstqtdemux_la_LDFLAGS = ${GST_PLUGIN_LDFLAGS} 
-libgstqtdemux_la_SOURCES = qtdemux.c qtdemux_types.c qtdemux_dump.c
+libgstqtdemux_la_SOURCES = quicktime.c gstrtpxqtdepay.c qtdemux.c qtdemux_types.c qtdemux_dump.c
 
 noinst_HEADERS = \
 	qtdemux.h        \
 	qtdemux_types.h  \
 	qtdemux_dump.h   \
 	qtdemux_fourcc.h \
-	qtpalette.h
+	qtpalette.h      \
+	gstrtpxqtdepay.h
diff --git a/gst/qtdemux/gstrtpxqtdepay.c b/gst/qtdemux/gstrtpxqtdepay.c
new file mode 100644
index 00000000..36b580da
--- /dev/null
+++ b/gst/qtdemux/gstrtpxqtdepay.c
@@ -0,0 +1,714 @@
+/* GStreamer
+ * Copyright (C) <2006> 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.
+ */
+
+/*
+ * based on http://developer.apple.com/quicktime/icefloe/dispatch026.html
+ */
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include <gst/rtp/gstrtpbuffer.h>
+
+#include <string.h>
+#include "gstrtpxqtdepay.h"
+
+#define MAKE_TLV(a,b)  (((a)<<8)|(b))
+
+#define TLV_sd	MAKE_TLV ('s','d')
+#define TLV_qt	MAKE_TLV ('q','t')
+#define TLV_ti	MAKE_TLV ('t','i')
+#define TLV_ly	MAKE_TLV ('l','y')
+#define TLV_vo	MAKE_TLV ('v','o')
+#define TLV_mx	MAKE_TLV ('m','x')
+#define TLV_tr	MAKE_TLV ('t','r')
+#define TLV_tw	MAKE_TLV ('t','w')
+#define TLV_th	MAKE_TLV ('t','h')
+#define TLV_la	MAKE_TLV ('l','a')
+#define TLV_rt	MAKE_TLV ('r','t')
+#define TLV_gm	MAKE_TLV ('g','m')
+#define TLV_oc	MAKE_TLV ('o','c')
+#define TLV_cr	MAKE_TLV ('c','r')
+#define TLV_du	MAKE_TLV ('d','u')
+#define TLV_po	MAKE_TLV ('p','o')
+
+#define QT_UINT32(a)  (GST_READ_UINT32_BE(a))
+#define QT_UINT24(a)  (GST_READ_UINT32_BE(a) >> 8)
+#define QT_UINT16(a)  (GST_READ_UINT16_BE(a))
+#define QT_UINT8(a)   (GST_READ_UINT8(a))
+#define QT_FP32(a)    ((GST_READ_UINT32_BE(a))/65536.0)
+#define QT_FP16(a)    ((GST_READ_UINT16_BE(a))/256.0)
+#define QT_FOURCC(a)  (GST_READ_UINT32_LE(a))
+#define QT_UINT64(a)  ((((guint64)QT_UINT32(a))<<32)|QT_UINT32(((guint8 *)a)+4))
+
+#define FOURCC_avc1     GST_MAKE_FOURCC('a','v','c','1')
+#define FOURCC_avcC     GST_MAKE_FOURCC('a','v','c','C')
+
+GST_DEBUG_CATEGORY_STATIC (rtpxqtdepay_debug);
+#define GST_CAT_DEFAULT (rtpxqtdepay_debug)
+
+/* elementfactory information */
+static const GstElementDetails gst_rtp_xqtdepay_details =
+GST_ELEMENT_DETAILS ("RTP packet depayloader",
+    "Codec/Depayloader/Network",
+    "Extracts Quicktime audio/video from RTP packets",
+    "Wim Taymans <wim@fluendo.com>");
+
+/* RtpXQTDepay signals and args */
+enum
+{
+  /* FILL ME */
+  LAST_SIGNAL
+};
+
+enum
+{
+  ARG_0,
+};
+
+static GstStaticPadTemplate gst_rtp_xqt_depay_src_template =
+GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS_ANY);
+
+static GstStaticPadTemplate gst_rtp_xqt_depay_sink_template =
+    GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("application/x-rtp, "
+        "media = (string) \"video\", clock-rate = (int) [1, MAX], "
+        "encoding-name = (string) \"X-QT\";"
+        "application/x-rtp, "
+        "media = (string) \"video\", clock-rate = (int) [1, MAX], "
+        "encoding-name = (string) \"X-QUICKTIME\"")
+    );
+
+GST_BOILERPLATE (GstRtpXQTDepay, gst_rtp_xqt_depay, GstBaseRTPDepayload,
+    GST_TYPE_BASE_RTP_DEPAYLOAD);
+
+static void gst_rtp_xqt_depay_finalize (GObject * object);
+
+static gboolean gst_rtp_xqt_depay_setcaps (GstBaseRTPDepayload * depayload,
+    GstCaps * caps);
+static GstBuffer *gst_rtp_xqt_depay_process (GstBaseRTPDepayload * depayload,
+    GstBuffer * buf);
+
+static void gst_rtp_xqt_depay_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
+static void gst_rtp_xqt_depay_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+
+static GstStateChangeReturn gst_rtp_xqt_depay_change_state (GstElement *
+    element, GstStateChange transition);
+
+static void
+gst_rtp_xqt_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_xqt_depay_src_template));
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_rtp_xqt_depay_sink_template));
+
+  gst_element_class_set_details (element_class, &gst_rtp_xqtdepay_details);
+}
+
+static void
+gst_rtp_xqt_depay_class_init (GstRtpXQTDepayClass * 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);
+
+  gobject_class->finalize = gst_rtp_xqt_depay_finalize;
+
+  gobject_class->set_property = gst_rtp_xqt_depay_set_property;
+  gobject_class->get_property = gst_rtp_xqt_depay_get_property;
+
+  gstelement_class->change_state = gst_rtp_xqt_depay_change_state;
+
+  gstbasertpdepayload_class->set_caps = gst_rtp_xqt_depay_setcaps;
+  gstbasertpdepayload_class->process = gst_rtp_xqt_depay_process;
+
+  GST_DEBUG_CATEGORY_INIT (rtpxqtdepay_debug, "rtpxqtdepay", 0,
+      "QT Media RTP Depayloader");
+}
+
+static void
+gst_rtp_xqt_depay_init (GstRtpXQTDepay * rtpxqtdepay,
+    GstRtpXQTDepayClass * klass)
+{
+  rtpxqtdepay->adapter = gst_adapter_new ();
+}
+
+static void
+gst_rtp_xqt_depay_finalize (GObject * object)
+{
+  GstRtpXQTDepay *rtpxqtdepay;
+
+  rtpxqtdepay = GST_RTP_XQT_DEPAY (object);
+
+  g_object_unref (rtpxqtdepay->adapter);
+  rtpxqtdepay->adapter = NULL;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gboolean
+gst_rtp_quicktime_parse_sd (GstRtpXQTDepay * rtpxqtdepay, guint8 * data,
+    guint data_len)
+{
+  gint len;
+  guint32 fourcc;
+
+  if (data_len < 8)
+    goto too_short;
+
+  len = (data[0] << 24) | (data[1] << 16) | (data[2] << 8) | data[3];
+  if (len > data_len)
+    goto too_short;
+
+  fourcc = QT_FOURCC (data + 4);
+
+  GST_DEBUG_OBJECT (rtpxqtdepay, "parsing %" GST_FOURCC_FORMAT,
+      GST_FOURCC_ARGS (fourcc));
+
+  switch (fourcc) {
+    case FOURCC_avc1:
+    {
+      guint32 chlen;
+
+      if (len < 0x56)
+        goto too_short;
+      len -= 0x56;
+      data += 0x56;
+
+      /* find avcC */
+      while (len >= 8) {
+        chlen = QT_UINT32 (data);
+        fourcc = QT_FOURCC (data + 4);
+        if (fourcc == FOURCC_avcC) {
+          GstBuffer *buf;
+          gint size;
+          GstCaps *caps;
+
+          GST_DEBUG_OBJECT (rtpxqtdepay, "found avcC codec_data in sd, %u",
+              chlen);
+
+          /* parse, if found */
+          if (chlen < len)
+            size = chlen - 8;
+          else
+            size = len - 8;
+
+          buf = gst_buffer_new_and_alloc (size);
+          memcpy (GST_BUFFER_DATA (buf), data + 8, size);
+          caps = gst_caps_new_simple ("video/x-h264",
+              "codec_data", GST_TYPE_BUFFER, buf, NULL);
+          gst_buffer_unref (buf);
+          gst_pad_set_caps (GST_BASE_RTP_DEPAYLOAD (rtpxqtdepay)->srcpad, caps);
+          gst_caps_unref (caps);
+          break;
+        }
+        len -= chlen;
+        data += chlen;
+      }
+      break;
+    }
+    default:
+      break;
+  }
+  return TRUE;
+
+  /* ERRORS */
+too_short:
+  {
+    return FALSE;
+  }
+}
+
+static gboolean
+gst_rtp_xqt_depay_setcaps (GstBaseRTPDepayload * depayload, GstCaps * caps)
+{
+  GstStructure *structure;
+  GstRtpXQTDepay *rtpxqtdepay;
+  gint clock_rate = 90000;      /* default */
+
+  rtpxqtdepay = GST_RTP_XQT_DEPAY (depayload);
+
+  structure = gst_caps_get_structure (caps, 0);
+
+  gst_structure_get_int (structure, "clock-rate", &clock_rate);
+  depayload->clock_rate = clock_rate;
+
+  return TRUE;
+}
+
+static GstBuffer *
+gst_rtp_xqt_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
+{
+  GstRtpXQTDepay *rtpxqtdepay;
+  GstBuffer *outbuf;
+  gboolean m;
+
+  rtpxqtdepay = GST_RTP_XQT_DEPAY (depayload);
+
+  if (!gst_rtp_buffer_validate (buf))
+    goto bad_packet;
+
+  /* discont, clear adapter */
+  if (GST_BUFFER_IS_DISCONT (buf)) {
+    gst_adapter_clear (rtpxqtdepay->adapter);
+  }
+
+  m = gst_rtp_buffer_get_marker (buf);
+  GST_LOG_OBJECT (rtpxqtdepay, "marker: %d", m);
+
+  {
+    gint payload_len;
+    guint avail;
+    guint8 *payload;
+    guint32 timestamp;
+    guint8 ver, pck;
+    gboolean s, q, l, d;
+
+    payload_len = gst_rtp_buffer_get_payload_len (buf);
+    payload = gst_rtp_buffer_get_payload (buf);
+
+    /*                      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
+     * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+     * | VER   |PCK|S|Q|L| RES         |D| QuickTime Payload ID        |
+     * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+     */
+    if (payload_len <= 4)
+      goto wrong_length;
+
+    ver = (payload[0] & 0xf0) >> 4;
+    if (ver > 1)
+      goto wrong_version;
+
+    pck = (payload[0] & 0x0c) >> 2;
+    if (pck == 0)
+      goto pck_reserved;
+
+    s = (payload[0] & 0x02) != 0;       /* contains sync sample */
+    q = (payload[0] & 0x01) != 0;       /* has payload description */
+    l = (payload[1] & 0x80) != 0;       /* has packet specific information description */
+    d = (payload[2] & 0x80) != 0;       /* don't cache info for payload id */
+    /* id used for caching info */
+    rtpxqtdepay->current_id = ((payload[2] & 0x7f) << 8) | payload[3];
+
+    GST_LOG_OBJECT (rtpxqtdepay,
+        "VER: %d, PCK: %d, S: %d, Q: %d, L: %d, D: %d, ID: %d", ver, pck, s, q,
+        l, d, rtpxqtdepay->current_id);
+
+    payload += 4;
+    payload_len -= 4;
+
+    if (q) {
+      gboolean k, f, a, z;
+      guint pdlen, pdpadded;
+      gint padding;
+      guint32 media_type, timescale;
+
+      /*                      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
+       * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+       * |K|F|A|Z| RES                   | QuickTime Payload Desc Length |
+       * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+       * . QuickTime Payload Desc Data ... . 
+       * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+       */
+      if (payload_len <= 4)
+        goto wrong_length;
+
+      k = (payload[0] & 0x80) != 0;     /* keyframe */
+      f = (payload[0] & 0x40) != 0;     /* sparse */
+      a = (payload[0] & 0x20) != 0;     /* start of payload */
+      z = (payload[0] & 0x10) != 0;     /* end of payload */
+      pdlen = (payload[2] << 8) | payload[3];
+
+      if (pdlen < 12)
+        goto wrong_length;
+
+      /* calc padding */
+      pdpadded = pdlen + 3;
+      pdpadded -= pdpadded % 4;
+      if (payload_len < pdpadded)
+        goto wrong_length;
+
+      padding = pdpadded - pdlen;
+      GST_LOG_OBJECT (rtpxqtdepay,
+          "K: %d, F: %d, A: %d, Z: %d, len: %d, padding %d", k, f, a, z, pdlen,
+          padding);
+
+      payload += 4;
+      payload_len -= 4;
+      /*                      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
+       * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+       * | QuickTime Media Type                                          |
+       * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+       * | Timescale                                                     |
+       * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+       * . QuickTime TLVs ... .
+       * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+       */
+      media_type =
+          (payload[0] << 24) | (payload[1] << 16) | (payload[2] << 8) |
+          payload[3];
+      timescale =
+          (payload[4] << 24) | (payload[5] << 16) | (payload[6] << 8) |
+          payload[7];
+
+      GST_LOG_OBJECT (rtpxqtdepay, "media_type: %c%c%c%c, timescale %u",
+          payload[0], payload[1], payload[2], payload[3], timescale);
+
+      payload += 8;
+      payload_len -= 8;
+      pdlen -= 12;
+
+      /* parse TLV (type-length-value triplets */
+      while (pdlen > 3) {
+        guint16 tlv_len, tlv_type;
+
+        /*                      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
+         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         * | QuickTime TLV Length          | QuickTime TLV Type            |
+         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         * . QuickTime TLV Value ... .
+         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         */
+        tlv_len = (payload[0] << 8) | payload[1];
+        tlv_type = (payload[2] << 8) | payload[3];
+        pdlen -= 4;
+        if (tlv_len > pdlen)
+          goto wrong_length;
+
+        GST_LOG_OBJECT (rtpxqtdepay, "TLV '%c%c', len %d", payload[2],
+            payload[3], tlv_len);
+
+        payload += 4;
+        payload_len -= 4;
+
+        switch (tlv_type) {
+          case TLV_sd:
+            /* Session description */
+            gst_rtp_quicktime_parse_sd (rtpxqtdepay, payload, tlv_len);
+            break;
+          case TLV_qt:
+          case TLV_ti:
+          case TLV_ly:
+          case TLV_vo:
+          case TLV_mx:
+          case TLV_tr:
+          case TLV_tw:
+          case TLV_th:
+          case TLV_la:
+          case TLV_rt:
+          case TLV_gm:
+          case TLV_oc:
+          case TLV_cr:
+          case TLV_du:
+          case TLV_po:
+          default:
+            break;
+        }
+
+        pdlen -= tlv_len;
+        payload += tlv_len;
+        payload_len -= tlv_len;
+      }
+      payload += padding;
+      payload_len -= padding;
+    }
+
+    if (l) {
+      guint ssilen, ssipadded;
+      gint padding;
+
+      /*                      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
+       * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+       * | RES                           | Sample-Specific Info Length   |
+       * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+       * . QuickTime TLVs ... 
+       * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+       */
+      if (payload_len <= 4)
+        goto wrong_length;
+
+      ssilen = (payload[2] << 8) | payload[3];
+      if (ssilen < 4)
+        goto wrong_length;
+
+      /* calc padding */
+      ssipadded = ssilen + 3;
+      ssipadded -= ssipadded % 4;
+      if (payload_len < ssipadded)
+        goto wrong_length;
+
+      padding = ssipadded - ssilen;
+      GST_LOG_OBJECT (rtpxqtdepay, "len: %d, padding %d", ssilen, padding);
+
+      payload += 4;
+      payload_len -= 4;
+      ssilen -= 4;
+
+      /* parse TLV (type-length-value triplets */
+      while (ssilen > 3) {
+        guint16 tlv_len, tlv_type;
+
+        /*                      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
+         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         * | QuickTime TLV Length          | QuickTime TLV Type            |
+         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         * . QuickTime TLV Value ... .
+         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         */
+        tlv_len = (payload[0] << 8) | payload[1];
+        tlv_type = (payload[2] << 8) | payload[3];
+        ssilen -= 4;
+        if (tlv_len > ssilen)
+          goto wrong_length;
+
+        GST_LOG_OBJECT (rtpxqtdepay, "TLV '%c%c', len %d", payload[2],
+            payload[3], tlv_len);
+
+        payload += 4;
+        payload_len -= 4;
+
+        switch (tlv_type) {
+          case TLV_sd:
+          case TLV_qt:
+          case TLV_ti:
+          case TLV_ly:
+          case TLV_vo:
+          case TLV_mx:
+          case TLV_tr:
+          case TLV_tw:
+          case TLV_th:
+          case TLV_la:
+          case TLV_rt:
+          case TLV_gm:
+          case TLV_oc:
+          case TLV_cr:
+          case TLV_du:
+          case TLV_po:
+          default:
+            break;
+        }
+
+        ssilen -= tlv_len;
+        payload += tlv_len;
+        payload_len -= tlv_len;
+      }
+      payload += padding;
+      payload_len -= padding;
+    }
+
+    timestamp = gst_rtp_buffer_get_timestamp (buf);
+    rtpxqtdepay->previous_id = rtpxqtdepay->current_id;
+
+    switch (pck) {
+      case 1:
+      {
+        /* multiple samples per packet. */
+        outbuf = gst_buffer_new_and_alloc (payload_len);
+        memcpy (GST_BUFFER_DATA (outbuf), payload, payload_len);
+        return outbuf;
+      }
+      case 2:
+      {
+        guint slen, timestamp;
+
+        /* multiple samples per packet. 
+         *                      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
+         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         * |S| Reserved                    | Sample Length                 |
+         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         * | Sample Timestamp                                              |
+         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         * . Sample Data ...                                               .
+         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         * |S| Reserved                    | Sample Length                 |
+         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         * | Sample Timestamp                                              |
+         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         * . Sample Data ...                                               .
+         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         * . ......                                                        .
+         * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         */
+        while (payload_len > 8) {
+          s = (payload[0] & 0x80) != 0; /* contains sync sample */
+          slen = (payload[2] << 8) | payload[3];
+          timestamp =
+              (payload[4] << 24) | (payload[5] << 16) | (payload[6] << 8) |
+              payload[7];
+
+          payload += 8;
+          payload_len -= 8;
+
+          if (slen > payload_len)
+            slen = payload_len;
+
+          outbuf = gst_buffer_new_and_alloc (slen);
+          memcpy (GST_BUFFER_DATA (outbuf), payload, slen);
+          if (!s)
+            GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_DELTA_UNIT);
+
+          gst_base_rtp_depayload_push (depayload, outbuf);
+
+          /* aligned on 32 bit boundary */
+          slen = GST_ROUND_UP_4 (slen);
+
+          payload += slen;
+          payload_len -= slen;
+        }
+        break;
+      }
+      case 3:
+      {
+        /* one sample per packet, use adapter to combine based on marker bit. */
+        outbuf = gst_buffer_new_and_alloc (payload_len);
+        memcpy (GST_BUFFER_DATA (outbuf), payload, payload_len);
+
+        gst_adapter_push (rtpxqtdepay->adapter, outbuf);
+
+        if (!m)
+          goto done;
+
+        avail = gst_adapter_available (rtpxqtdepay->adapter);
+        outbuf = gst_adapter_take_buffer (rtpxqtdepay->adapter, avail);
+
+        GST_DEBUG_OBJECT (rtpxqtdepay,
+            "gst_rtp_xqt_depay_chain: pushing buffer of size %u", avail);
+
+        return outbuf;
+      }
+    }
+  }
+
+done:
+  return NULL;
+
+bad_packet:
+  {
+    GST_ELEMENT_WARNING (rtpxqtdepay, STREAM, DECODE,
+        ("Packet did not validate."), (NULL));
+    return NULL;
+  }
+wrong_version:
+  {
+    GST_ELEMENT_WARNING (rtpxqtdepay, STREAM, DECODE,
+        ("Unknown payload version."), (NULL));
+    return NULL;
+  }
+pck_reserved:
+  {
+    GST_ELEMENT_WARNING (rtpxqtdepay, STREAM, DECODE,
+        ("PCK reserved 0."), (NULL));
+    return NULL;
+  }
+wrong_length:
+  {
+    GST_ELEMENT_WARNING (rtpxqtdepay, STREAM, DECODE,
+        ("Wrong payload length."), (NULL));
+    return NULL;
+  }
+}
+
+static void
+gst_rtp_xqt_depay_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstRtpXQTDepay *rtpxqtdepay;
+
+  rtpxqtdepay = GST_RTP_XQT_DEPAY (object);
+
+  switch (prop_id) {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_rtp_xqt_depay_get_property (GObject * object, guint prop_id, GValue * value,
+    GParamSpec * pspec)
+{
+  GstRtpXQTDepay *rtpxqtdepay;
+
+  rtpxqtdepay = GST_RTP_XQT_DEPAY (object);
+
+  switch (prop_id) {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static GstStateChangeReturn
+gst_rtp_xqt_depay_change_state (GstElement * element, GstStateChange transition)
+{
+  GstRtpXQTDepay *rtpxqtdepay;
+  GstStateChangeReturn ret;
+
+  rtpxqtdepay = GST_RTP_XQT_DEPAY (element);
+
+  switch (transition) {
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
+      gst_adapter_clear (rtpxqtdepay->adapter);
+      rtpxqtdepay->previous_id = -1;
+      rtpxqtdepay->current_id = -1;
+      break;
+    default:
+      break;
+  }
+
+  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
+
+  switch (transition) {
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
+      gst_adapter_clear (rtpxqtdepay->adapter);
+    default:
+      break;
+  }
+  return ret;
+}
+
+gboolean
+gst_rtp_xqt_depay_plugin_init (GstPlugin * plugin)
+{
+  return gst_element_register (plugin, "rtpxqtdepay",
+      GST_RANK_MARGINAL, GST_TYPE_RTP_XQT_DEPAY);
+}
diff --git a/gst/qtdemux/gstrtpxqtdepay.h b/gst/qtdemux/gstrtpxqtdepay.h
new file mode 100644
index 00000000..39c5813b
--- /dev/null
+++ b/gst/qtdemux/gstrtpxqtdepay.h
@@ -0,0 +1,62 @@
+/* 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_XQT_DEPAY_H__
+#define __GST_RTP_XQT_DEPAY_H__
+
+#include <gst/gst.h>
+#include <gst/base/gstadapter.h>
+#include <gst/rtp/gstbasertpdepayload.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_RTP_XQT_DEPAY \
+  (gst_rtp_xqt_depay_get_type())
+#define GST_RTP_XQT_DEPAY(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTP_XQT_DEPAY,GstRtpXQTDepay))
+#define GST_RTP_XQT_DEPAY_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTP_XQT_DEPAY,GstRtpXQTDepayClass))
+#define GST_IS_RTP_XQT_DEPAY(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_XQT_DEPAY))
+#define GST_IS_RTP_XQT_DEPAY_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_XQT_DEPAY))
+
+typedef struct _GstRtpXQTDepay GstRtpXQTDepay;
+typedef struct _GstRtpXQTDepayClass GstRtpXQTDepayClass;
+
+struct _GstRtpXQTDepay
+{
+  GstBaseRTPDepayload depayload;
+
+  GstAdapter *adapter;
+
+  guint16 previous_id;
+  guint16 current_id;
+};
+
+struct _GstRtpXQTDepayClass
+{
+  GstBaseRTPDepayloadClass parent_class;
+};
+
+GType gst_rtp_xqt_depay_get_type (void);
+
+G_END_DECLS
+
+#endif /* __GST_RTP_XQT_DEPAY_H__ */
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index 8d29f1d4..ba731580 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -233,7 +233,7 @@ static GstCaps *qtdemux_audio_caps (GstQTDemux * qtdemux,
     QtDemuxStream * stream, guint32 fourcc, const guint8 * data, int len,
     const gchar ** codec_name);
 
-static GType
+GType
 gst_qtdemux_get_type (void)
 {
   static GType qtdemux_type = 0;
@@ -267,6 +267,7 @@ gst_qtdemux_base_init (GstQTDemuxClass * klass)
       gst_static_pad_template_get (&gst_qtdemux_audiosrc_template));
   gst_element_class_set_details (element_class, &gst_qtdemux_details);
 
+  GST_DEBUG_CATEGORY_INIT (qtdemux_debug, "qtdemux", 0, "qtdemux plugin");
 }
 
 static void
@@ -3954,23 +3955,3 @@ qtdemux_audio_caps (GstQTDemux * qtdemux, QtDemuxStream * stream,
     }
   }
 }
-
-static gboolean
-plugin_init (GstPlugin * plugin)
-{
-#ifdef ENABLE_NLS
-  setlocale (LC_ALL, "");
-  bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
-#endif /* ENABLE_NLS */
-
-  GST_DEBUG_CATEGORY_INIT (qtdemux_debug, "qtdemux", 0, "qtdemux plugin");
-
-  return gst_element_register (plugin, "qtdemux",
-      GST_RANK_PRIMARY, GST_TYPE_QTDEMUX);
-}
-
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
-    GST_VERSION_MINOR,
-    "qtdemux",
-    "Quicktime stream demuxer",
-    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
diff --git a/gst/qtdemux/qtdemux.h b/gst/qtdemux/qtdemux.h
index 13316a42..4f6afcdd 100644
--- a/gst/qtdemux/qtdemux.h
+++ b/gst/qtdemux/qtdemux.h
@@ -91,6 +91,8 @@ struct _GstQTDemuxClass {
   GstElementClass parent_class;
 };
 
+GType gst_qtdemux_get_type (void);
+
 G_END_DECLS
 
 #endif /* __GST_QTDEMUX_H__ */
diff --git a/gst/qtdemux/quicktime.c b/gst/qtdemux/quicktime.c
new file mode 100644
index 00000000..f7b880c8
--- /dev/null
+++ b/gst/qtdemux/quicktime.c
@@ -0,0 +1,53 @@
+/* GStreamer
+ * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
+ * Copyright (C) <2003> David A. Schleef <ds@schleef.org>
+ * Copyright (C) <2006> 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 "gst/gst-i18n-plugin.h"
+
+#include "qtdemux.h"
+#include "gstrtpxqtdepay.h"
+
+static gboolean
+plugin_init (GstPlugin * plugin)
+{
+#ifdef ENABLE_NLS
+  setlocale (LC_ALL, "");
+  bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+#endif /* ENABLE_NLS */
+
+  if (!gst_element_register (plugin, "qtdemux",
+          GST_RANK_PRIMARY, GST_TYPE_QTDEMUX))
+    return FALSE;
+
+  if (!gst_element_register (plugin, "rtpxqtdepay",
+          GST_RANK_MARGINAL, GST_TYPE_RTP_XQT_DEPAY))
+    return FALSE;
+
+  return TRUE;
+}
+
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+    GST_VERSION_MINOR,
+    "quicktime",
+    "Quicktime support",
+    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);