adding GDP payloader and depayloader. Build integration will follow later when the GDP issues for core are sorted out.

Original commit message from CVS:
* gst/gdp/Makefile.am:
* gst/gdp/gstgdp.c: (plugin_init):
* gst/gdp/gstgdpdepay.c: (gst_gdp_depay_base_init),
(gst_gdp_depay_class_init), (gst_gdp_depay_init),
(gst_gdp_depay_finalize), (gst_gdp_depay_chain),
(gst_gdp_depay_change_state), (gst_gdp_depay_plugin_init):
* gst/gdp/gstgdpdepay.h:
* gst/gdp/gstgdppay.c: (gst_gdp_pay_base_init),
(gst_gdp_pay_class_init), (gst_gdp_pay_init),
(gst_gdp_pay_dispose), (gst_gdp_stamp_buffer),
(gst_gdp_buffer_from_caps), (gst_gdp_pay_buffer_from_buffer),
(gst_gdp_buffer_from_event), (gst_gdp_pay_reset_streamheader),
(gst_gdp_queue_buffer), (gst_gdp_pay_chain),
(gst_gdp_pay_sink_event), (gst_gdp_pay_change_state),
(gst_gdp_pay_plugin_init):
* gst/gdp/gstgdppay.h:
* tests/check/Makefile.am:
* tests/check/elements/gdpdepay.c: (setup_gdpdepay),
(cleanup_gdpdepay), (gdpdepay_push_per_byte), (GST_START_TEST),
(setup_gdpdepay_streamheader), (gdpdepay_suite), (main):
* tests/check/elements/gdppay.c: (setup_gdppay), (cleanup_gdppay),
(GST_START_TEST), (setup_gdppay_streamheader), (gdppay_suite),
(main):
adding GDP payloader and depayloader.  Build integration will
follow later when the GDP issues for core are sorted out.

10 files changed, 1937 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index e36f7577..79c04415 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,27 +1,55 @@
+2006-05-22  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* gst/gdp/Makefile.am:
+	* gst/gdp/gstgdp.c: (plugin_init):
+	* gst/gdp/gstgdpdepay.c: (gst_gdp_depay_base_init),
+	(gst_gdp_depay_class_init), (gst_gdp_depay_init),
+	(gst_gdp_depay_finalize), (gst_gdp_depay_chain),
+	(gst_gdp_depay_change_state), (gst_gdp_depay_plugin_init):
+	* gst/gdp/gstgdpdepay.h:
+	* gst/gdp/gstgdppay.c: (gst_gdp_pay_base_init),
+	(gst_gdp_pay_class_init), (gst_gdp_pay_init),
+	(gst_gdp_pay_dispose), (gst_gdp_stamp_buffer),
+	(gst_gdp_buffer_from_caps), (gst_gdp_pay_buffer_from_buffer),
+	(gst_gdp_buffer_from_event), (gst_gdp_pay_reset_streamheader),
+	(gst_gdp_queue_buffer), (gst_gdp_pay_chain),
+	(gst_gdp_pay_sink_event), (gst_gdp_pay_change_state),
+	(gst_gdp_pay_plugin_init):
+	* gst/gdp/gstgdppay.h:
+	* tests/check/Makefile.am:
+	* tests/check/elements/gdpdepay.c: (setup_gdpdepay),
+	(cleanup_gdpdepay), (gdpdepay_push_per_byte), (GST_START_TEST),
+	(setup_gdpdepay_streamheader), (gdpdepay_suite), (main):
+	* tests/check/elements/gdppay.c: (setup_gdppay), (cleanup_gdppay),
+	(GST_START_TEST), (setup_gdppay_streamheader), (gdppay_suite),
+	(main):
+	  adding GDP payloader and depayloader.  Build integration will
+	  follow later when the GDP issues for core are sorted out.
+
 2006-05-21  Stefan Kost  <ensonic@users.sf.net>
 
 	* gst/spectrum/gstspectrum.c: (gst_spectrum_class_init),
 	(gst_spectrum_init), (gst_spectrum_set_sink_caps),
 	(gst_spectrum_get_sink_caps), (gst_spectrum_chain):
-        Use boilerplate macro, fix strings to match plugin-moval-requirements
+	  Use boilerplate macro, fix strings to match plugin-moval-requirements
 
 2006-05-21  Stefan Kost  <ensonic@users.sf.net>
 
 	* gst/spectrum/Makefile.am:
-        Link to base libraries
-        
+	  Link to base libraries
+
 	* gst/spectrum/demo-osssrc.c: (main):
-        use new threshhold property
-        
+	  use new threshhold property
+
 	* gst/spectrum/gstspectrum.c: (gst_spectrum_class_init),
 	(gst_spectrum_init), (gst_spectrum_dispose),
 	(gst_spectrum_set_property), (gst_spectrum_set_sink_caps),
 	(gst_spectrum_get_sink_caps), (gst_spectrum_chain),
 	(gst_spectrum_change_state):
 	* gst/spectrum/gstspectrum.h:
-        Use gst_adapter, support multiple-channels, add threshold property for
-        result, add docs, fix resulting spectrum range (was including mirrored
-        results)
+	Use gst_adapter, support multiple-channels, add threshold property for
+	result, add docs, fix resulting spectrum range (was including mirrored
+	results)
 
 2006-05-21  Stefan Kost  <ensonic@users.sf.net>
 
@@ -33,7 +61,7 @@
 	(gst_spectrum_init), (gst_spectrum_dispose),
 	(gst_spectrum_set_property), (gst_spectrum_chain):
 	* gst/spectrum/gstspectrum.h:
-        Initial port of the spectrum element
+	Initial port of the spectrum element
 
 2006-05-19  Edgard Lima <edgard.lima@indt.org.br>
 
diff --git a/gst/gdp/Makefile.am b/gst/gdp/Makefile.am
new file mode 100644
index 00000000..73851200
--- /dev/null
+++ b/gst/gdp/Makefile.am
@@ -0,0 +1,13 @@
+plugin_LTLIBRARIES = libgstgdp.la
+
+libgstgdp_la_SOURCES = \
+	gstgdp.c \
+	gstgdppay.c \
+	gstgdpdepay.c
+
+libgstgdp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
+libgstgdp_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_GDP_LIBS)
+
+noinst_HEADERS =			\
+		 gstgdppay.h		\
+		 gstgdpdepay.h
diff --git a/gst/gdp/gstgdp.c b/gst/gdp/gstgdp.c
new file mode 100644
index 00000000..31d32598
--- /dev/null
+++ b/gst/gdp/gstgdp.c
@@ -0,0 +1,46 @@
+/* GStreamer
+ * Copyright (C) 2006 Thomas Vander Stichele <thomas at apestaart dot org>
+ *
+ * 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/dataprotocol/dataprotocol.h>
+
+#include "gstgdppay.h"
+#include "gstgdpdepay.h"
+
+static gboolean
+plugin_init (GstPlugin * plugin)
+{
+  gst_dp_init ();
+
+  if (!gst_gdp_depay_plugin_init (plugin))
+    return FALSE;
+
+  if (!gst_gdp_pay_plugin_init (plugin))
+    return FALSE;
+
+  return TRUE;
+}
+
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR,
+    "gdp",
+    "Payload/depayload GDP packets", plugin_init,
+    VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
diff --git a/gst/gdp/gstgdpdepay.c b/gst/gdp/gstgdpdepay.c
new file mode 100644
index 00000000..5a37d984
--- /dev/null
+++ b/gst/gdp/gstgdpdepay.c
@@ -0,0 +1,322 @@
+/* GStreamer
+ * Copyright (C) 2006 Thomas Vander Stichele <thomas at apestaart dot org>
+ *
+ * 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.
+ */
+
+/**
+ * SECTION:element-gdpdepay
+ * @see_also: videorate, ffmpegcolorspace
+ *
+ * <refsect2>
+ * <para>
+ * This element depayloads GStreamer Data Protocol buffers back to deserialized
+ * buffers and events.
+ * </para>
+ * </refsect2>
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <string.h>
+
+#include <gst/dataprotocol/dataprotocol.h>
+
+#include "gstgdpdepay.h"
+
+/* elementfactory information */
+static const GstElementDetails gdp_depay_details =
+GST_ELEMENT_DETAILS ("GDP Depayloader",
+    "Filter/Effect/Video",
+    "Depayloads GStreamer Data Protocol buffers",
+    "Thomas Vander Stichele <thomas at apestaart dot org>");
+
+enum
+{
+  PROP_0,
+  /* FILL ME */
+};
+
+static GstStaticPadTemplate gdp_depay_sink_template =
+GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("application/x-gdp"));
+
+static GstStaticPadTemplate gdp_depay_src_template =
+GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS_ANY);
+
+GST_DEBUG_CATEGORY (gst_gdp_depay_debug);
+#define GST_CAT_DEFAULT gst_gdp_depay_debug
+
+#define _do_init(x) \
+    GST_DEBUG_CATEGORY_INIT (gst_gdp_depay_debug, "gdpdepay", 0, \
+    "GDP depayloader");
+
+GST_BOILERPLATE_FULL (GstGDPDepay, gst_gdp_depay, GstElement,
+    GST_TYPE_ELEMENT, _do_init);
+
+static GstFlowReturn gst_gdp_depay_chain (GstPad * pad, GstBuffer * buffer);
+static GstStateChangeReturn gst_gdp_depay_change_state (GstElement *
+    element, GstStateChange transition);
+
+static void gst_gdp_depay_finalize (GObject * object);
+
+static void
+gst_gdp_depay_base_init (gpointer g_class)
+{
+  GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
+
+  gst_element_class_set_details (element_class, &gdp_depay_details);
+
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gdp_depay_sink_template));
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gdp_depay_src_template));
+}
+
+static void
+gst_gdp_depay_class_init (GstGDPDepayClass * klass)
+{
+  GObjectClass *gobject_class;
+  GstElementClass *gstelement_class;
+
+  gobject_class = (GObjectClass *) klass;
+  gstelement_class = (GstElementClass *) klass;
+
+  parent_class = g_type_class_peek_parent (klass);
+
+  gstelement_class->change_state =
+      GST_DEBUG_FUNCPTR (gst_gdp_depay_change_state);
+  gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_gdp_depay_finalize);
+}
+
+static void
+gst_gdp_depay_init (GstGDPDepay * gdpdepay, GstGDPDepayClass * g_class)
+{
+  gdpdepay->sinkpad =
+      gst_pad_new_from_static_template (&gdp_depay_sink_template, "sink");
+  gst_pad_set_setcaps_function (gdpdepay->sinkpad,
+      GST_DEBUG_FUNCPTR (gst_pad_proxy_setcaps));
+  gst_pad_set_getcaps_function (gdpdepay->sinkpad,
+      GST_DEBUG_FUNCPTR (gst_pad_proxy_getcaps));
+  gst_pad_set_chain_function (gdpdepay->sinkpad,
+      GST_DEBUG_FUNCPTR (gst_gdp_depay_chain));
+  gst_element_add_pad (GST_ELEMENT (gdpdepay), gdpdepay->sinkpad);
+
+  gdpdepay->srcpad =
+      gst_pad_new_from_static_template (&gdp_depay_src_template, "src");
+  gst_element_add_pad (GST_ELEMENT (gdpdepay), gdpdepay->srcpad);
+
+  /* our caps will always be decided by the incoming GDP caps buffers */
+  gst_pad_use_fixed_caps (gdpdepay->srcpad);
+
+  gdpdepay->adapter = gst_adapter_new ();
+}
+
+static void
+gst_gdp_depay_finalize (GObject * gobject)
+{
+  GstGDPDepay *this;
+
+  this = GST_GDP_DEPAY (gobject);
+  if (this->caps)
+    gst_caps_unref (this->caps);
+  if (this->header)
+    g_free (this->header);
+  gst_adapter_clear (this->adapter);
+  g_object_unref (this->adapter);
+
+  GST_CALL_PARENT (G_OBJECT_CLASS, finalize, (gobject));
+}
+
+static GstFlowReturn
+gst_gdp_depay_chain (GstPad * pad, GstBuffer * buffer)
+{
+  GstGDPDepay *this;
+  GstFlowReturn ret = GST_FLOW_OK;
+  GstCaps *caps;
+  GstBuffer *buf;
+  GstEvent *event;
+  guint8 *header = NULL;
+  guint8 *payload = NULL;
+  guint available;
+  gboolean running = TRUE;
+
+  this = GST_GDP_DEPAY (gst_pad_get_parent (pad));
+
+  gst_adapter_push (this->adapter, buffer);
+
+  while (running) {
+    switch (this->state) {
+      case GST_GDP_DEPAY_STATE_HEADER:
+        available = gst_adapter_available (this->adapter);
+        if (available < GST_DP_HEADER_LENGTH) {
+          running = FALSE;
+          break;
+        }
+
+        if (this->header)
+          g_free (this->header);
+        GST_LOG_OBJECT (this, "reading GDP header from adapter");
+        header = gst_adapter_take (this->adapter, GST_DP_HEADER_LENGTH);
+        if (!gst_dp_validate_header (GST_DP_HEADER_LENGTH, header))
+          goto header_validate_error;
+
+        this->payload_length = gst_dp_header_payload_length (header);
+        this->payload_type = gst_dp_header_payload_type (header);
+        this->header = header;
+        GST_LOG_OBJECT (this,
+            "read GDP header, payload size %d, switching to state PAYLOAD",
+            this->payload_length);
+        this->state = GST_GDP_DEPAY_STATE_PAYLOAD;
+        break;
+
+      case GST_GDP_DEPAY_STATE_PAYLOAD:
+        available = gst_adapter_available (this->adapter);
+        if (available < this->payload_length) {
+          running = FALSE;
+          break;
+        }
+
+        /* change state based on type */
+        if (this->payload_type == GST_DP_PAYLOAD_BUFFER) {
+          GST_LOG_OBJECT (this, "switching to state BUFFER");
+          this->state = GST_GDP_DEPAY_STATE_BUFFER;
+        } else if (this->payload_type == GST_DP_PAYLOAD_CAPS) {
+          GST_LOG_OBJECT (this, "switching to state CAPS");
+          this->state = GST_GDP_DEPAY_STATE_CAPS;
+        } else if (this->payload_type >= GST_DP_PAYLOAD_EVENT_NONE) {
+          GST_LOG_OBJECT (this, "switching to state EVENT");
+          this->state = GST_GDP_DEPAY_STATE_EVENT;
+        } else
+          goto wrong_type;
+        break;
+
+      case GST_GDP_DEPAY_STATE_BUFFER:
+        if (!this->caps) {
+          GST_ELEMENT_ERROR (this, STREAM, DECODE, (NULL),
+              ("Received a buffer without first receiving caps"));
+          ret = GST_FLOW_NOT_NEGOTIATED;
+          goto done;
+        }
+
+        GST_LOG_OBJECT (this, "reading GDP buffer from adapter");
+        buf = gst_dp_buffer_from_header (GST_DP_HEADER_LENGTH, this->header);
+        payload = gst_adapter_take (this->adapter, this->payload_length);
+        memcpy (GST_BUFFER_DATA (buf), payload, this->payload_length);
+        g_free (payload);
+
+        gst_buffer_set_caps (buf, this->caps);
+        ret = gst_pad_push (this->srcpad, buf);
+        if (ret != GST_FLOW_OK) {
+          GST_WARNING_OBJECT (this, "pushing depayloaded buffer returned %d",
+              ret);
+          goto done;
+        }
+
+        GST_LOG_OBJECT (this, "switching to state HEADER");
+        this->state = GST_GDP_DEPAY_STATE_HEADER;
+        break;
+
+      case GST_GDP_DEPAY_STATE_CAPS:
+        GST_LOG_OBJECT (this, "reading GDP caps from adapter");
+        payload = gst_adapter_take (this->adapter, this->payload_length);
+        caps = gst_dp_caps_from_packet (GST_DP_HEADER_LENGTH, this->header,
+            payload);
+        g_free (payload);
+        GST_DEBUG_OBJECT (this, "read caps %" GST_PTR_FORMAT, caps);
+        gst_caps_replace (&(this->caps), caps);
+        gst_pad_set_caps (this->srcpad, caps);
+        /* drop the creation ref we still have */
+        gst_caps_unref (caps);
+
+        GST_LOG_OBJECT (this, "switching to state HEADER");
+        this->state = GST_GDP_DEPAY_STATE_HEADER;
+        break;
+
+      case GST_GDP_DEPAY_STATE_EVENT:
+        GST_LOG_OBJECT (this, "reading GDP event from adapter");
+        /* adapter doesn't like 0 length payload */
+        if (this->payload_length > 0)
+          payload = gst_adapter_take (this->adapter, this->payload_length);
+        event = gst_dp_event_from_packet (GST_DP_HEADER_LENGTH, this->header,
+            payload);
+        /* FIXME: set me as source ? */
+        gst_pad_push_event (this->srcpad, event);
+
+        GST_LOG_OBJECT (this, "switching to state HEADER");
+        this->state = GST_GDP_DEPAY_STATE_HEADER;
+        break;
+    }
+  }
+  goto done;
+
+header_validate_error:
+  GST_ELEMENT_ERROR (this, STREAM, DECODE, (NULL),
+      ("GDP packet header does not validate"));
+  g_free (header);
+  ret = GST_FLOW_ERROR;
+  goto done;
+
+wrong_type:
+  GST_ELEMENT_ERROR (this, STREAM, DECODE, (NULL),
+      ("GDP packet header is of wrong type"));
+  g_free (header);
+  ret = GST_FLOW_ERROR;
+  goto done;
+
+done:
+  gst_object_unref (this);
+  return ret;
+}
+
+static GstStateChangeReturn
+gst_gdp_depay_change_state (GstElement * element, GstStateChange transition)
+{
+  GstStateChangeReturn ret;
+  GstGDPDepay *this = GST_GDP_DEPAY (element);
+
+  switch (transition) {
+    case GST_STATE_CHANGE_READY_TO_NULL:
+      if (this->caps) {
+        gst_caps_unref (this->caps);
+        this->caps = NULL;
+      }
+      break;
+    default:
+      break;
+  }
+
+  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
+
+  return ret;
+}
+
+gboolean
+gst_gdp_depay_plugin_init (GstPlugin * plugin)
+{
+  if (!gst_element_register (plugin, "gdpdepay", GST_RANK_NONE,
+          GST_TYPE_GDP_DEPAY))
+    return FALSE;
+
+  return TRUE;
+}
diff --git a/gst/gdp/gstgdpdepay.h b/gst/gdp/gstgdpdepay.h
new file mode 100644
index 00000000..d39ec5a5
--- /dev/null
+++ b/gst/gdp/gstgdpdepay.h
@@ -0,0 +1,75 @@
+/* Gnome-Streamer
+ * 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_GDP_DEPAY_H__
+#define __GST_GDP_DEPAY_H__
+
+#include <gst/gst.h>
+#include <gst/base/gstadapter.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_GDP_DEPAY \
+  (gst_gdp_depay_get_type())
+#define GST_GDP_DEPAY(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_GDP_DEPAY,GstGDPDepay))
+#define GST_GDP_DEPAY_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_GDP_DEPAY,GstGDPDepay))
+#define GST_IS_GDP_DEPAY(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_GDP_DEPAY))
+#define GST_IS_GDP_DEPAY_CLASS(obj) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_GDP_DEPAY))
+
+typedef enum {
+  GST_GDP_DEPAY_STATE_HEADER = 0,
+  GST_GDP_DEPAY_STATE_PAYLOAD,
+  GST_GDP_DEPAY_STATE_BUFFER,
+  GST_GDP_DEPAY_STATE_CAPS,
+  GST_GDP_DEPAY_STATE_EVENT,
+} GstGDPDepayState;
+
+
+typedef struct _GstGDPDepay GstGDPDepay;
+typedef struct _GstGDPDepayClass GstGDPDepayClass;
+
+struct _GstGDPDepay
+{
+  GstElement element;
+  GstPad *sinkpad;
+  GstPad *srcpad;
+
+  GstAdapter *adapter;
+  GstGDPDepayState state;
+  GstCaps *caps;
+
+  guint8 *header;
+  guint32 payload_length;
+  GstDPPayloadType payload_type;
+};
+
+struct _GstGDPDepayClass
+{
+  GstElementClass parent_class;
+};
+
+gboolean gst_gdp_depay_plugin_init (GstPlugin * plugin);
+
+G_END_DECLS
+
+#endif /* __GST_GDP_DEPAY_H__ */
diff --git a/gst/gdp/gstgdppay.c b/gst/gdp/gstgdppay.c
new file mode 100644
index 00000000..e40d2f1b
--- /dev/null
+++ b/gst/gdp/gstgdppay.c
@@ -0,0 +1,502 @@
+/* GStreamer
+ * Copyright (C) 2006 Thomas Vander Stichele <thomas at apestaart dot org>
+ *
+ * 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.
+ */
+
+/**
+ * SECTION:element-gdppay
+ *
+ * <refsect2>
+ * <para>
+ * This element payloads GStreamer buffers and events using the
+ * GStreamer Data Protocol.
+ * </para>
+ * </refsect2>
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/dataprotocol/dataprotocol.h>
+
+#include "gstgdppay.h"
+
+/* elementfactory information */
+static const GstElementDetails gdp_pay_details =
+GST_ELEMENT_DETAILS ("GDP Payloader",
+    "Filter/Effect/Video",
+    "Payloads GStreamer Data Protocol buffers",
+    "Thomas Vander Stichele <thomas at apestaart dot org>");
+
+enum
+{
+  PROP_0,
+  /* FILL ME */
+};
+
+static GstStaticPadTemplate gdp_pay_sink_template =
+GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS_ANY);
+
+static GstStaticPadTemplate gdp_pay_src_template =
+GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("application/x-gdp"));
+
+GST_DEBUG_CATEGORY (gst_gdp_pay_debug);
+#define GST_CAT_DEFAULT gst_gdp_pay_debug
+
+#define _do_init(x) \
+    GST_DEBUG_CATEGORY_INIT (gst_gdp_pay_debug, "gdppay", 0, \
+    "GDP payloader");
+
+GST_BOILERPLATE_FULL (GstGDPPay, gst_gdp_pay, GstElement,
+    GST_TYPE_ELEMENT, _do_init);
+
+static GstFlowReturn gst_gdp_pay_chain (GstPad * pad, GstBuffer * buffer);
+static gboolean gst_gdp_pay_sink_event (GstPad * pad, GstEvent * event);
+static GstStateChangeReturn gst_gdp_pay_change_state (GstElement *
+    element, GstStateChange transition);
+
+static void gst_gdp_pay_dispose (GObject * gobject);
+
+static void
+gst_gdp_pay_base_init (gpointer g_class)
+{
+  GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
+
+  gst_element_class_set_details (element_class, &gdp_pay_details);
+
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gdp_pay_sink_template));
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gdp_pay_src_template));
+}
+
+static void
+gst_gdp_pay_class_init (GstGDPPayClass * klass)
+{
+  GObjectClass *gobject_class;
+  GstElementClass *gstelement_class;
+
+  gobject_class = (GObjectClass *) klass;
+  gstelement_class = (GstElementClass *) klass;
+
+  parent_class = g_type_class_peek_parent (klass);
+
+  gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_gdp_pay_dispose);
+  gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_gdp_pay_change_state);
+}
+
+static void
+gst_gdp_pay_init (GstGDPPay * gdppay, GstGDPPayClass * g_class)
+{
+  gdppay->sinkpad =
+      gst_pad_new_from_static_template (&gdp_pay_sink_template, "sink");
+  gst_pad_set_chain_function (gdppay->sinkpad,
+      GST_DEBUG_FUNCPTR (gst_gdp_pay_chain));
+  gst_pad_set_event_function (gdppay->sinkpad,
+      GST_DEBUG_FUNCPTR (gst_gdp_pay_sink_event));
+  gst_element_add_pad (GST_ELEMENT (gdppay), gdppay->sinkpad);
+
+  gdppay->srcpad =
+      gst_pad_new_from_static_template (&gdp_pay_src_template, "src");
+  gst_element_add_pad (GST_ELEMENT (gdppay), gdppay->srcpad);
+
+  gdppay->offset = 0;
+}
+
+static void
+gst_gdp_pay_dispose (GObject * gobject)
+{
+  GstGDPPay *this = GST_GDP_PAY (gobject);
+
+  if (this->caps_buf) {
+    gst_buffer_unref (this->caps_buf);
+    this->caps_buf = NULL;
+  }
+  if (this->new_segment_buf) {
+    gst_buffer_unref (this->new_segment_buf);
+    this->new_segment_buf = NULL;
+  }
+  GST_CALL_PARENT (G_OBJECT_CLASS, dispose, (gobject));
+}
+
+/* set OFFSET and OFFSET_END with running count */
+static void
+gst_gdp_stamp_buffer (GstGDPPay * this, GstBuffer * buffer)
+{
+  GST_BUFFER_OFFSET (buffer) = this->offset;
+  GST_BUFFER_OFFSET_END (buffer) = this->offset + GST_BUFFER_SIZE (buffer);
+  this->offset = GST_BUFFER_OFFSET_END (buffer);
+}
+
+static GstBuffer *
+gst_gdp_buffer_from_caps (GstGDPPay * this, GstCaps * caps)
+{
+  GstBuffer *headerbuf;
+  GstBuffer *payloadbuf;
+  guint8 *header, *payload;
+  guint len;
+
+  if (!gst_dp_packet_from_caps (caps, 0, &len, &header, &payload)) {
+    GST_WARNING_OBJECT (this, "could not create GDP header from caps");
+    return NULL;
+  }
+
+  GST_LOG_OBJECT (this, "creating GDP header and payload buffer from caps");
+  headerbuf = gst_buffer_new ();
+  gst_buffer_set_data (headerbuf, header, len);
+  GST_BUFFER_MALLOCDATA (headerbuf) = header;
+
+  payloadbuf = gst_buffer_new ();
+  gst_buffer_set_data (payloadbuf, payload,
+      gst_dp_header_payload_length (header));
+  GST_BUFFER_MALLOCDATA (payloadbuf) = payload;
+
+  return gst_buffer_join (headerbuf, payloadbuf);
+}
+
+static GstBuffer *
+gst_gdp_pay_buffer_from_buffer (GstGDPPay * this, GstBuffer * buffer)
+{
+  GstBuffer *headerbuf;
+  guint8 *header;
+  guint len;
+
+  if (!gst_dp_header_from_buffer (buffer, 0, &len, &header)) {
+    GST_WARNING_OBJECT (this, "could not create GDP header from buffer");
+    return NULL;
+  }
+
+  GST_LOG_OBJECT (this, "creating GDP header and payload buffer from buffer");
+  headerbuf = gst_buffer_new ();
+  gst_buffer_set_data (headerbuf, header, len);
+  GST_BUFFER_MALLOCDATA (headerbuf) = header;
+
+  /* we do not want to lose the ref on the incoming buffer */
+  gst_buffer_ref (buffer);
+  return gst_buffer_join (headerbuf, buffer);
+}
+
+static GstBuffer *
+gst_gdp_buffer_from_event (GstGDPPay * this, GstEvent * event)
+{
+  GstBuffer *headerbuf;
+  GstBuffer *payloadbuf;
+  guint8 *header, *payload;
+  guint len;
+
+  if (!gst_dp_packet_from_event (event, 0, &len, &header, &payload)) {
+    GST_WARNING_OBJECT (this, "could not create GDP header from event");
+    return NULL;
+  }
+
+  GST_LOG_OBJECT (this, "creating GDP header and payload buffer from event");
+  headerbuf = gst_buffer_new ();
+  gst_buffer_set_data (headerbuf, header, len);
+  GST_BUFFER_MALLOCDATA (headerbuf) = header;
+
+  payloadbuf = gst_buffer_new ();
+  gst_buffer_set_data (payloadbuf, payload,
+      gst_dp_header_payload_length (header));
+  GST_BUFFER_MALLOCDATA (payloadbuf) = payload;
+
+  return gst_buffer_join (headerbuf, payloadbuf);
+}
+
+
+/* set our caps with streamheader, based on the latest newsegment and caps,
+ * and (possibly) GDP-serialized buffers of the streamheaders on the src pad */
+static GstFlowReturn
+gst_gdp_pay_reset_streamheader (GstGDPPay * this)
+{
+  GstCaps *caps;
+  GstStructure *structure;
+  GstBuffer *new_segment_buf, *caps_buf;
+  GstFlowReturn r = GST_FLOW_OK;
+
+  GValue array = { 0 };
+  GValue value = { 0 };
+
+  /* we need both new segment and caps before we can set streamheader */
+  if (!this->new_segment_buf || !this->caps_buf)
+    return GST_FLOW_OK;
+
+  /* we copy to avoid circular refcounts */
+  new_segment_buf = gst_buffer_copy (this->new_segment_buf);
+  caps_buf = gst_buffer_copy (this->caps_buf);
+
+  /* put copies of the buffers in a fixed list */
+  g_value_init (&array, GST_TYPE_ARRAY);
+
+  g_value_init (&value, GST_TYPE_BUFFER);
+  gst_value_set_buffer (&value, new_segment_buf);
+  gst_value_array_append_value (&array, &value);
+  g_value_unset (&value);
+
+  g_value_init (&value, GST_TYPE_BUFFER);
+  gst_value_set_buffer (&value, caps_buf);
+  gst_value_array_append_value (&array, &value);
+  g_value_unset (&value);
+
+  /* we also need to add GDP serializations of the streamheaders of the
+   * incoming caps */
+  /* FIXME: HEREIAM */
+
+  structure = gst_caps_get_structure (this->caps, 0);
+  if (gst_structure_has_field (structure, "streamheader")) {
+    const GValue *sh;
+    GArray *buffers;
+    GstBuffer *buffer;
+    int i;
+
+    sh = gst_structure_get_value (structure, "streamheader");
+    buffers = g_value_peek_pointer (sh);
+    GST_DEBUG_OBJECT (this,
+        "Need to serialize %d incoming streamheader buffers on our streamheader",
+        buffers->len);
+    for (i = 0; i < buffers->len; ++i) {
+      GValue *bufval;
+      GstBuffer *outbuffer;
+
+      bufval = &g_array_index (buffers, GValue, i);
+      buffer = g_value_peek_pointer (bufval);
+      outbuffer = gst_gdp_pay_buffer_from_buffer (this, buffer);
+      g_value_init (&value, GST_TYPE_BUFFER);
+      gst_value_set_buffer (&value, outbuffer);
+      gst_value_array_append_value (&array, &value);
+      g_value_unset (&value);
+    }
+  }
+
+  caps = gst_caps_from_string ("application/x-gdp");
+  structure = gst_caps_get_structure (caps, 0);
+
+  gst_structure_set_value (structure, "streamheader", &array);
+  g_value_unset (&array);
+
+  /* Unref our copies */
+  gst_buffer_unref (new_segment_buf);
+  gst_buffer_unref (caps_buf);
+
+  GST_DEBUG_OBJECT (this, "Setting caps on src pad %" GST_PTR_FORMAT, caps);
+  gst_pad_set_caps (this->srcpad, caps);
+  gst_buffer_set_caps (this->caps_buf, caps);
+  gst_buffer_set_caps (this->new_segment_buf, caps);
+
+  /* if these are our first ever buffers, send out new_segment first */
+  if (!this->sent_streamheader) {
+    GstEvent *event =
+        gst_event_new_new_segment (TRUE, 1.0, GST_FORMAT_BYTES, 0, -1, 0);
+    GST_DEBUG_OBJECT (this, "Sending out new_segment event %p", event);
+    if (!gst_pad_push_event (this->srcpad, event)) {
+      GST_WARNING_OBJECT (this, "pushing new segment failed");
+      return GST_FLOW_ERROR;
+    }
+  }
+
+  /* push out these streamheader buffers, then flush our internal queue */
+  GST_DEBUG_OBJECT (this, "Pushing GDP new_segment buffer %p",
+      this->new_segment_buf);
+  /* we stored these bufs with refcount 1, so make sure we keep a ref */
+  r = gst_pad_push (this->srcpad, gst_buffer_ref (this->new_segment_buf));
+  if (r != GST_FLOW_OK) {
+    GST_WARNING_OBJECT (this, "pushing GDP newsegment buffer returned %d", r);
+    return r;
+  }
+  GST_DEBUG_OBJECT (this, "Pushing GDP caps buffer %p", this->new_segment_buf);
+  r = gst_pad_push (this->srcpad, gst_buffer_ref (this->caps_buf));
+  if (r != GST_FLOW_OK) {
+    GST_WARNING_OBJECT (this, "pushing GDP caps buffer returned %d", r);
+    return r;
+  }
+  this->sent_streamheader = TRUE;
+  GST_DEBUG_OBJECT (this, "need to push %d queued buffers",
+      g_list_length (this->queue));
+  if (this->queue) {
+    GList *l;
+
+    for (l = this->queue; l; l = g_list_next (l)) {
+      GST_DEBUG_OBJECT (this, "Pushing queued GDP buffer %p", l->data);
+      gst_buffer_set_caps (l->data, caps);
+      r = gst_pad_push (this->srcpad, l->data);
+      if (r != GST_FLOW_OK) {
+        GST_WARNING_OBJECT (this, "pushing queued GDP buffer returned %d", r);
+        return r;
+      }
+    }
+  }
+
+  return r;
+}
+
+/* queue a buffer internally if we haven't sent streamheader buffers yet;
+ * otherwise, just push on */
+static GstFlowReturn
+gst_gdp_queue_buffer (GstGDPPay * this, GstBuffer * buffer)
+{
+  if (this->sent_streamheader) {
+    GST_LOG_OBJECT (this, "Pushing GDP buffer %p", buffer);
+    GST_LOG_OBJECT (this, "set caps %" GST_PTR_FORMAT, this->caps);
+    return gst_pad_push (this->srcpad, buffer);
+  }
+
+  /* store it on an internal queue */
+  this->queue = g_list_append (this->queue, buffer);
+  GST_DEBUG_OBJECT (this, "queued buffer %p, now %d buffers queued",
+      buffer, g_list_length (this->queue));
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_gdp_pay_chain (GstPad * pad, GstBuffer * buffer)
+{
+  GstGDPPay *this;
+  GstCaps *caps;
+  GstBuffer *outbuffer;
+
+  this = GST_GDP_PAY (gst_pad_get_parent (pad));
+
+  caps = gst_buffer_get_caps (buffer);
+
+  /* we should have received a new_segment before, otherwise it's a bug.
+   * fake one in that case */
+  if (!this->new_segment_buf) {
+    GstEvent *event;
+
+    GST_WARNING_OBJECT (this,
+        "did not receive new-segment before first buffer");
+    event = gst_event_new_new_segment (TRUE, 1.0, GST_FORMAT_BYTES, 0, -1, 0);
+    outbuffer = gst_gdp_buffer_from_event (this, event);
+    gst_gdp_stamp_buffer (this, outbuffer);
+    GST_BUFFER_TIMESTAMP (outbuffer) = GST_BUFFER_TIMESTAMP (buffer);
+    GST_BUFFER_DURATION (outbuffer) = 0;
+    this->new_segment_buf = outbuffer;
+    gst_event_unref (event);
+  }
+
+  /* make sure we've received caps before */
+  if (!this->caps && !caps) {
+    GST_WARNING_OBJECT (this, "first received buffer does not have caps set");
+    gst_buffer_unref (buffer);
+    gst_object_unref (this);
+    return GST_FLOW_NOT_NEGOTIATED;
+  }
+  /* if the caps have changed, process caps first */
+  if (caps && !gst_caps_is_equal (this->caps, caps)) {
+    GST_LOG_OBJECT (this, "caps changed to %p, %" GST_PTR_FORMAT, caps, caps);
+    gst_caps_replace (&(this->caps), caps);
+    outbuffer = gst_gdp_buffer_from_caps (this, caps);
+    gst_gdp_stamp_buffer (this, outbuffer);
+    GST_BUFFER_TIMESTAMP (outbuffer) = GST_BUFFER_TIMESTAMP (buffer);
+    GST_BUFFER_DURATION (outbuffer) = 0;
+    GST_BUFFER_FLAG_SET (outbuffer, GST_BUFFER_FLAG_IN_CAPS);
+    this->caps_buf = outbuffer;
+    gst_gdp_pay_reset_streamheader (this);
+  }
+
+  /* create a GDP header packet,
+   * then create a GST buffer of the header packet and the buffer contents */
+  outbuffer = gst_gdp_pay_buffer_from_buffer (this, buffer);
+  gst_gdp_stamp_buffer (this, outbuffer);
+  GST_BUFFER_TIMESTAMP (outbuffer) = GST_BUFFER_TIMESTAMP (buffer);
+  GST_BUFFER_DURATION (outbuffer) = GST_BUFFER_DURATION (buffer);
+  gst_buffer_unref (buffer);
+
+  gst_object_unref (this);
+  return gst_gdp_queue_buffer (this, outbuffer);
+}
+
+static gboolean
+gst_gdp_pay_sink_event (GstPad * pad, GstEvent * event)
+{
+  GstBuffer *outbuffer;
+  GstGDPPay *this = GST_GDP_PAY (gst_pad_get_parent (pad));
+  GstFlowReturn flowret;
+  gboolean ret = TRUE;
+
+  /* now turn the event into a buffer */
+  outbuffer = gst_gdp_buffer_from_event (this, event);
+  gst_gdp_stamp_buffer (this, outbuffer);
+  GST_BUFFER_TIMESTAMP (outbuffer) = GST_EVENT_TIMESTAMP (event);
+  GST_BUFFER_DURATION (outbuffer) = 0;
+
+  /* if we got a new segment, we should put it on our streamheader,
+   * and not send it on */
+  if (GST_EVENT_TYPE (event) == GST_EVENT_NEWSEGMENT) {
+    if (this->new_segment_buf) {
+      gst_buffer_unref (this->new_segment_buf);
+    }
+    this->new_segment_buf = outbuffer;
+    gst_gdp_pay_reset_streamheader (this);
+  } else {
+    flowret = gst_gdp_queue_buffer (this, outbuffer);
+    if (flowret != GST_FLOW_OK) {
+      GST_WARNING_OBJECT (this, "queueing GDP caps buffer returned %d",
+          flowret);
+      ret = FALSE;
+      goto done;
+    }
+  }
+
+  /* if we have EOS, we should send on EOS ourselves */
+  if (GST_EVENT_TYPE (event) == GST_EVENT_EOS) {
+    GST_DEBUG_OBJECT (this, "Sending on EOS event %p", event);
+    return gst_pad_push_event (this->srcpad, event);
+  };
+
+done:
+  gst_object_unref (this);
+  gst_event_unref (event);
+  return ret;
+}
+
+static GstStateChangeReturn
+gst_gdp_pay_change_state (GstElement * element, GstStateChange transition)
+{
+  GstStateChangeReturn ret;
+  GstGDPPay *this = GST_GDP_PAY (element);
+
+  switch (transition) {
+    case GST_STATE_CHANGE_READY_TO_NULL:
+      if (this->caps) {
+        gst_caps_unref (this->caps);
+        this->caps = NULL;
+      }
+      break;
+    default:
+      break;
+  }
+
+  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
+
+  return ret;
+}
+
+gboolean
+gst_gdp_pay_plugin_init (GstPlugin * plugin)
+{
+  if (!gst_element_register (plugin, "gdppay", GST_RANK_NONE, GST_TYPE_GDP_PAY))
+    return FALSE;
+
+  return TRUE;
+}
diff --git a/gst/gdp/gstgdppay.h b/gst/gdp/gstgdppay.h
new file mode 100644
index 00000000..255d6c77
--- /dev/null
+++ b/gst/gdp/gstgdppay.h
@@ -0,0 +1,66 @@
+/* Gnome-Streamer
+ * 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_GDP_PAY_H__
+#define __GST_GDP_PAY_H__
+
+#include <gst/gst.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_GDP_PAY \
+  (gst_gdp_pay_get_type())
+#define GST_GDP_PAY(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_GDP_PAY,GstGDPPay))
+#define GST_GDP_PAY_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_GDP_PAY,GstGDPPay))
+#define GST_IS_GDP_PAY(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_GDP_PAY))
+#define GST_IS_GDP_PAY_CLASS(obj) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_GDP_PAY))
+
+typedef struct _GstGDPPay GstGDPPay;
+typedef struct _GstGDPPayClass GstGDPPayClass;
+
+struct _GstGDPPay
+{
+  GstElement element;
+  GstPad *sinkpad;
+  GstPad *srcpad;
+
+  GstCaps *caps; /* incoming caps */
+
+  GstBuffer *caps_buf;
+  GstBuffer *new_segment_buf;
+
+  gboolean sent_streamheader; /* TRUE after the first streamheaders are sent */
+  GList *queue; /* list of queued buffers before streamheaders are sent */
+  guint64 offset;
+};
+
+struct _GstGDPPayClass
+{
+  GstElementClass parent_class;
+};
+
+gboolean gst_gdp_pay_plugin_init (GstPlugin * plugin);
+
+G_END_DECLS
+
+#endif /* __GST_GDP_PAY_H__ */
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index c1663887..96df1978 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -12,7 +12,7 @@ REGISTRY_ENVIRONMENT = \
 TESTS_ENVIRONMENT = \
         $(REGISTRY_ENVIRONMENT)                                 \
         GST_PLUGIN_SYSTEM_PATH=					\
-        GST_PLUGIN_PATH=$(top_builddir)/ext:$(GSTPB_PLUGINS_DIR)/../gst-plugins-good:$(GSTPB_PLUGINS_DIR):$(GST_PLUGINS_DIR)
+        GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/ext:$(GSTPB_PLUGINS_DIR):$(GST_PLUGINS_DIR)
 
 plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
 
@@ -26,9 +26,13 @@ SUPPRESSIONS = $(top_srcdir)/common/gst.supp
 
 clean-local: clean-local-check
 
-check_PROGRAMS =
+check_PROGRAMS = \
+	elements/gdppay \
+	elements/gdpdepay
 
 TESTS = $(check_PROGRAMS)
 
 AM_CFLAGS = $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS) $(CHECK_CFLAGS)
 LDADD = $(GST_OBJ_LIBS) $(GST_CHECK_LIBS) $(CHECK_LIBS)
+
+elements_gdpdepay_LDFLAGS = $(LDADD) $(GST_GDP_LIBS)
diff --git a/tests/check/elements/gdpdepay.c b/tests/check/elements/gdpdepay.c
new file mode 100644
index 00000000..4e8c9d50
--- /dev/null
+++ b/tests/check/elements/gdpdepay.c
@@ -0,0 +1,400 @@
+/* GStreamer
+ *
+ * Copyright (C) 2006 Thomas Vander Stichele <thomas at apestaart dot org>
+ *
+ * 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.
+ */
+
+#include <string.h>
+#include <unistd.h>
+
+#include <gst/check/gstcheck.h>
+#include <gst/dataprotocol/dataprotocol.h>
+
+GList *buffers = NULL;
+gboolean have_eos = FALSE;
+
+/* For ease of programming we use globals to keep refs for our floating
+ * src and sink pads we create; otherwise we always have to do get_pad,
+ * get_peer, and then remove references in every test function */
+GstPad *mysrcpad, *mysinkpad, *myshsinkpad;
+
+#define AUDIO_CAPS_TEMPLATE_STRING \
+  "audio/x-raw-int, " \
+    "rate = (int) [ 1, MAX ], " \
+    "channels = (int) [ 1, 8 ], " \
+    "endianness = (int) BYTE_ORDER, " \
+    "width = (int) {8, 16}, " \
+    "depth = (int) {8, 16}, " \
+    "signed = (boolean) true"
+
+#define AUDIO_CAPS_STRING \
+  "audio/x-raw-int, " \
+    "rate = (int) 1000, " \
+    "channels = (int) 2, " \
+    "endianness = (int) BYTE_ORDER, " \
+    "width = (int) 16, " \
+    "depth = (int) 16, " \
+    "signed = (boolean) true"
+
+
+static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (AUDIO_CAPS_TEMPLATE_STRING)
+    );
+static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("application/x-gdp")
+    );
+
+/* takes over reference for outcaps */
+GstElement *
+setup_gdpdepay ()
+{
+  GstElement *gdpdepay;
+
+  GST_DEBUG ("setup_gdpdepay");
+  gdpdepay = gst_check_setup_element ("gdpdepay");
+  mysrcpad = gst_check_setup_src_pad (gdpdepay, &srctemplate, NULL);
+  mysinkpad = gst_check_setup_sink_pad (gdpdepay, &sinktemplate, NULL);
+
+  return gdpdepay;
+}
+
+void
+cleanup_gdpdepay (GstElement * gdpdepay)
+{
+  GST_DEBUG ("cleanup_gdpdepay");
+
+  gst_check_teardown_src_pad (gdpdepay);
+  gst_check_teardown_sink_pad (gdpdepay);
+  gst_check_teardown_element (gdpdepay);
+}
+
+static void
+gdpdepay_push_per_byte (gchar * reason, guint8 * bytes, guint length)
+{
+  int i;
+  GstBuffer *inbuffer;
+
+  for (i = 0; i < length; ++i) {
+    inbuffer = gst_buffer_new_and_alloc (1);
+    GST_BUFFER_DATA (inbuffer)[0] = bytes[i];
+    fail_unless (gst_pad_push (mysrcpad, inbuffer) == GST_FLOW_OK,
+        "%s: failed pushing byte buffer", reason);
+  }
+}
+
+GST_START_TEST (test_audio_per_byte)
+{
+  GstCaps *caps;
+  GstPad *srcpad;
+  GstElement *gdpdepay;
+  GstBuffer *buffer, *inbuffer, *outbuffer;
+  gint length;
+  guint8 *header, *payload;
+  guint len;
+  guint i;
+
+  gdpdepay = setup_gdpdepay ();
+  srcpad = gst_element_get_pad (gdpdepay, "src");
+
+  fail_unless (gst_element_set_state (gdpdepay,
+          GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
+      "could not set to playing");
+
+  caps = gst_pad_get_caps (srcpad);
+  fail_unless (gst_caps_is_any (caps));
+  gst_caps_unref (caps);
+  fail_if (gst_pad_get_negotiated_caps (srcpad));
+
+  /* create caps and buffer packets and push them */
+  caps = gst_caps_from_string (AUDIO_CAPS_STRING);
+  fail_unless (gst_dp_packet_from_caps (caps, 0, &len, &header, &payload));
+  gst_caps_unref (caps);
+  gdpdepay_push_per_byte ("caps header", header, len);
+  fail_unless_equals_int (g_list_length (buffers), 0);
+  gdpdepay_push_per_byte ("caps payload", payload,
+      gst_dp_header_payload_length (header));
+  fail_unless_equals_int (g_list_length (buffers), 0);
+  caps = gst_pad_get_caps (srcpad);
+  fail_if (gst_caps_is_any (caps));
+  gst_caps_unref (caps);
+
+  g_free (header);
+  g_free (payload);
+
+  buffer = gst_buffer_new_and_alloc (4);
+  memcpy (GST_BUFFER_DATA (buffer), "f00d", 4);
+  GST_BUFFER_TIMESTAMP (buffer) = GST_SECOND;
+  GST_BUFFER_DURATION (buffer) = GST_SECOND / 10;
+  fail_unless (gst_dp_header_from_buffer (buffer, 0, &len, &header));
+  gdpdepay_push_per_byte ("buffer header", header, len);
+  fail_unless_equals_int (g_list_length (buffers), 0);
+  gdpdepay_push_per_byte ("buffer payload", GST_BUFFER_DATA (buffer),
+      gst_dp_header_payload_length (header));
+  g_free (header);
+  gst_buffer_unref (buffer);
+
+  fail_unless_equals_int (g_list_length (buffers), 1);
+  fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
+  fail_unless_equals_uint64 (GST_BUFFER_TIMESTAMP (outbuffer), GST_SECOND);
+  fail_unless_equals_uint64 (GST_BUFFER_DURATION (outbuffer), GST_SECOND / 10);
+
+  buffers = g_list_remove (buffers, outbuffer);
+  gst_buffer_unref (outbuffer);
+
+  fail_unless (gst_element_set_state (gdpdepay,
+          GST_STATE_NULL) == GST_STATE_CHANGE_SUCCESS, "could not set to null");
+
+  ASSERT_OBJECT_REFCOUNT (gdpdepay, "gdpdepay", 1);
+  gst_object_unref (srcpad);
+  cleanup_gdpdepay (gdpdepay);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_audio_in_one_buffer)
+{
+  GstCaps *caps;
+  GstPad *srcpad;
+  GstElement *gdpdepay;
+  GstBuffer *buffer, *inbuffer, *outbuffer;
+  gint length;
+  guint8 *caps_header, *caps_payload, *buf_header, *buf_payload;
+  guint header_len, payload_len;
+  guint i;
+
+  gdpdepay = setup_gdpdepay ();
+  srcpad = gst_element_get_pad (gdpdepay, "src");
+
+  fail_unless (gst_element_set_state (gdpdepay,
+          GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
+      "could not set to playing");
+
+  /* make sure no caps are set yet */
+  caps = gst_pad_get_caps (srcpad);
+  fail_unless (gst_caps_is_any (caps));
+  gst_caps_unref (caps);
+  fail_if (gst_pad_get_negotiated_caps (srcpad));
+
+  /* create caps and buffer packets and push them as one buffer */
+  caps = gst_caps_from_string (AUDIO_CAPS_STRING);
+  fail_unless (gst_dp_packet_from_caps (caps, 0, &header_len, &caps_header,
+          &caps_payload));
+
+  buffer = gst_buffer_new_and_alloc (4);
+  memcpy (GST_BUFFER_DATA (buffer), "f00d", 4);
+  fail_unless (gst_dp_header_from_buffer (buffer, 0, &header_len, &buf_header));
+
+  payload_len = gst_dp_header_payload_length (caps_header);
+
+  inbuffer = gst_buffer_new_and_alloc (2 * GST_DP_HEADER_LENGTH +
+      payload_len + GST_BUFFER_SIZE (buffer));
+  memcpy (GST_BUFFER_DATA (inbuffer), caps_header, GST_DP_HEADER_LENGTH);
+  i = GST_DP_HEADER_LENGTH;
+  memcpy (GST_BUFFER_DATA (inbuffer) + i, caps_payload, payload_len);
+  i += payload_len;
+  memcpy (GST_BUFFER_DATA (inbuffer) + i, buf_header, GST_DP_HEADER_LENGTH);
+  i += GST_DP_HEADER_LENGTH;
+  memcpy (GST_BUFFER_DATA (inbuffer) + i, GST_BUFFER_DATA (buffer),
+      GST_BUFFER_SIZE (buffer));
+
+  gst_caps_unref (caps);
+  gst_buffer_unref (buffer);
+
+  g_free (caps_header);
+  g_free (caps_payload);
+  g_free (buf_header);
+
+  /* now push it */
+  gst_pad_push (mysrcpad, inbuffer);
+
+  /* the buffer is still queued */
+  fail_unless_equals_int (g_list_length (buffers), 1);
+
+  fail_unless (gst_element_set_state (gdpdepay,
+          GST_STATE_NULL) == GST_STATE_CHANGE_SUCCESS, "could not set to null");
+
+  gst_object_unref (srcpad);
+  ASSERT_OBJECT_REFCOUNT (gdpdepay, "gdpdepay", 1);
+  cleanup_gdpdepay (gdpdepay);
+}
+
+GST_END_TEST;
+
+static GstStaticPadTemplate shsinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("application/x-gst-test-streamheader")
+    );
+
+GstElement *
+setup_gdpdepay_streamheader ()
+{
+  GstElement *gdpdepay;
+
+  GST_DEBUG ("setup_gdpdepay");
+  gdpdepay = gst_check_setup_element ("gdpdepay");
+  mysrcpad = gst_check_setup_src_pad (gdpdepay, &srctemplate, NULL);
+  myshsinkpad = gst_check_setup_sink_pad (gdpdepay, &shsinktemplate, NULL);
+
+  return gdpdepay;
+}
+
+/* this tests deserialization of a GDP stream where the serialized caps
+ * have a streamheader set */
+GST_START_TEST (test_streamheader)
+{
+  GstCaps *caps, *padcaps;
+  GstPad *srcpad;
+  GstElement *gdpdepay;
+  GstBuffer *buffer, *inbuffer, *outbuffer, *shbuffer;
+  gint length;
+  guint8 *caps_header, *caps_payload, *buf_header, *buf_payload;
+  guint header_len, payload_len;
+  guint i;
+  GstStructure *structure;
+  GValue array = { 0 };
+  GValue value = { 0 };
+
+  gdpdepay = setup_gdpdepay_streamheader ();
+  srcpad = gst_element_get_pad (gdpdepay, "src");
+  ASSERT_OBJECT_REFCOUNT (gdpdepay, "gdpdepay", 1);
+
+  fail_unless (gst_element_set_state (gdpdepay,
+          GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
+      "could not set to playing");
+
+  /* make sure no caps are set yet */
+  caps = gst_pad_get_caps (srcpad);
+  fail_unless (gst_caps_is_any (caps));
+  gst_caps_unref (caps);
+  fail_if (gst_pad_get_negotiated_caps (srcpad));
+
+  /* create a streamheader buffer and the caps containing it */
+  caps = gst_caps_from_string ("application/x-gst-test-streamheader");
+  structure = gst_caps_get_structure (caps, 0);
+  buffer = gst_buffer_new_and_alloc (4);
+  memcpy (GST_BUFFER_DATA (buffer), "f00d", 4);
+  GST_BUFFER_FLAG_SET (buffer, GST_BUFFER_FLAG_IN_CAPS);
+  g_value_init (&array, GST_TYPE_ARRAY);
+  g_value_init (&value, GST_TYPE_BUFFER);
+  shbuffer = gst_buffer_copy (buffer);
+  gst_value_set_buffer (&value, shbuffer);
+  gst_buffer_unref (shbuffer);
+  gst_value_array_append_value (&array, &value);
+  g_value_unset (&value);
+  gst_structure_set_value (structure, "streamheader", &array);
+  g_value_unset (&array);
+
+  gst_buffer_set_caps (buffer, caps);
+
+  /* create GDP packets for the caps and the buffer, and put them in one
+   * GDP buffer */
+  fail_unless (gst_dp_packet_from_caps (caps, 0, &header_len, &caps_header,
+          &caps_payload));
+
+  fail_unless (gst_dp_header_from_buffer (buffer, 0, &header_len, &buf_header));
+
+  payload_len = gst_dp_header_payload_length (caps_header);
+
+  inbuffer = gst_buffer_new_and_alloc (2 * GST_DP_HEADER_LENGTH +
+      payload_len + GST_BUFFER_SIZE (buffer));
+  memcpy (GST_BUFFER_DATA (inbuffer), caps_header, GST_DP_HEADER_LENGTH);
+  i = GST_DP_HEADER_LENGTH;
+  memcpy (GST_BUFFER_DATA (inbuffer) + i, caps_payload, payload_len);
+  i += payload_len;
+  memcpy (GST_BUFFER_DATA (inbuffer) + i, buf_header, GST_DP_HEADER_LENGTH);
+  i += GST_DP_HEADER_LENGTH;
+  memcpy (GST_BUFFER_DATA (inbuffer) + i, GST_BUFFER_DATA (buffer),
+      GST_BUFFER_SIZE (buffer));
+
+  gst_caps_unref (caps);
+  gst_buffer_unref (buffer);
+
+  g_free (caps_header);
+  g_free (caps_payload);
+  g_free (buf_header);
+
+  /* now push it */
+  ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1);
+  gst_pad_push (mysrcpad, inbuffer);
+
+  /* our only output buffer is the streamheader buffer */
+  fail_unless_equals_int (g_list_length (buffers), 1);
+  fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
+  buffers = g_list_remove (buffers, outbuffer);
+  ASSERT_BUFFER_REFCOUNT (outbuffer, "outbuffer", 1);
+  fail_unless (GST_BUFFER_FLAG_IS_SET (outbuffer, GST_BUFFER_FLAG_IN_CAPS));
+
+  padcaps = gst_pad_get_negotiated_caps (myshsinkpad);
+  caps = gst_buffer_get_caps (outbuffer);
+  fail_if (caps == NULL);
+  fail_if (padcaps == NULL);
+  GST_DEBUG ("caps: %" GST_PTR_FORMAT ", padcaps: %" GST_PTR_FORMAT, caps,
+      padcaps);
+  fail_unless (gst_caps_is_equal (padcaps, caps));
+
+  /* FIXME: get streamheader, compare data with buffer */
+  gst_buffer_unref (outbuffer);
+  gst_caps_unref (padcaps);
+  gst_caps_unref (caps);
+
+  /* clean up */
+  fail_unless (gst_element_set_state (gdpdepay,
+          GST_STATE_NULL) == GST_STATE_CHANGE_SUCCESS, "could not set to null");
+
+  gst_object_unref (srcpad);
+  ASSERT_OBJECT_REFCOUNT (gdpdepay, "gdpdepay", 1);
+  cleanup_gdpdepay (gdpdepay);
+}
+
+GST_END_TEST;
+
+
+Suite *
+gdpdepay_suite (void)
+{
+  Suite *s = suite_create ("gdpdepay");
+  TCase *tc_chain = tcase_create ("general");
+
+  suite_add_tcase (s, tc_chain);
+  tcase_add_test (tc_chain, test_audio_per_byte);
+  tcase_add_test (tc_chain, test_audio_in_one_buffer);
+  tcase_add_test (tc_chain, test_streamheader);
+
+  return s;
+}
+
+int
+main (int argc, char **argv)
+{
+  int nf;
+
+  Suite *s = gdpdepay_suite ();
+  SRunner *sr = srunner_create (s);
+
+  gst_check_init (&argc, &argv);
+
+  srunner_run_all (sr, CK_NORMAL);
+  nf = srunner_ntests_failed (sr);
+  srunner_free (sr);
+
+  return nf;
+}
diff --git a/tests/check/elements/gdppay.c b/tests/check/elements/gdppay.c
new file mode 100644
index 00000000..5915ef32
--- /dev/null
+++ b/tests/check/elements/gdppay.c
@@ -0,0 +1,470 @@
+/* GStreamer
+ *
+ * Copyright (C) 2006 Thomas Vander Stichele <thomas at apestaart dot org>
+ *
+ * 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.
+ */
+
+#include <string.h>
+#include <unistd.h>
+
+#include <gst/check/gstcheck.h>
+#include <gst/dataprotocol/dataprotocol.h>
+
+GList *buffers = NULL;
+gboolean have_eos = FALSE;
+
+/* For ease of programming we use globals to keep refs for our floating
+ * src and sink pads we create; otherwise we always have to do get_pad,
+ * get_peer, and then remove references in every test function */
+GstPad *mysrcpad, *myshsrcpad, *mysinkpad;
+
+#define AUDIO_CAPS_TEMPLATE_STRING \
+  "audio/x-raw-int, " \
+    "rate = (int) [ 1, MAX ], " \
+    "channels = (int) [ 1, 8 ], " \
+    "endianness = (int) BYTE_ORDER, " \
+    "width = (int) {8, 16}, " \
+    "depth = (int) {8, 16}, " \
+    "signed = (boolean) true"
+
+#define AUDIO_CAPS_STRING \
+  "audio/x-raw-int, " \
+    "rate = (int) 1000, " \
+    "channels = (int) 2, " \
+    "endianness = (int) BYTE_ORDER, " \
+    "width = (int) 16, " \
+    "depth = (int) 16, " \
+    "signed = (boolean) true"
+
+
+static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("application/x-gdp")
+    );
+static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (AUDIO_CAPS_TEMPLATE_STRING)
+    );
+
+/* takes over reference for outcaps */
+GstElement *
+setup_gdppay ()
+{
+  GstElement *gdppay;
+
+  GST_DEBUG ("setup_gdppay");
+  gdppay = gst_check_setup_element ("gdppay");
+  mysrcpad = gst_check_setup_src_pad (gdppay, &srctemplate, NULL);
+  mysinkpad = gst_check_setup_sink_pad (gdppay, &sinktemplate, NULL);
+
+  return gdppay;
+}
+
+void
+cleanup_gdppay (GstElement * gdppay)
+{
+  GST_DEBUG ("cleanup_gdppay");
+
+  gst_check_teardown_src_pad (gdppay);
+  gst_check_teardown_sink_pad (gdppay);
+  gst_check_teardown_element (gdppay);
+}
+
+
+GST_START_TEST (test_audio)
+{
+  GstCaps *caps;
+  GstElement *gdppay;
+  GstBuffer *inbuffer, *outbuffer;
+  GstEvent *event;
+  gchar *caps_string;
+  gint length;
+
+  gdppay = setup_gdppay ();
+
+  fail_unless (gst_element_set_state (gdppay,
+          GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
+      "could not set to playing");
+
+  GST_DEBUG ("new segment");
+  event =
+      gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_TIME, 0, GST_SECOND, 0);
+  fail_unless (gst_pad_push_event (mysrcpad, event));
+
+  /* no buffer should be pushed yet, waiting for caps */
+  fail_unless_equals_int (g_list_length (buffers), 0);
+
+  GST_DEBUG ("first buffer");
+  inbuffer = gst_buffer_new_and_alloc (4);
+  caps = gst_caps_from_string (AUDIO_CAPS_STRING);
+  gst_buffer_set_caps (inbuffer, caps);
+  caps_string = gst_caps_to_string (caps);
+
+  ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1);
+
+  /* pushing gives away my reference */
+  fail_unless (gst_pad_push (mysrcpad, inbuffer) == GST_FLOW_OK);
+
+  /* we should have three buffers now */
+  fail_unless_equals_int (g_list_length (buffers), 3);
+
+  /* first buffer is the serialized new_segment event;
+   * the element also holds a ref to it */
+  fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
+  buffers = g_list_remove (buffers, outbuffer);
+  ASSERT_BUFFER_REFCOUNT (outbuffer, "outbuffer", 2);
+  gst_buffer_unref (outbuffer);
+
+  /* second buffer is the serialized caps;
+   * the element also holds a ref to it */
+  fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
+  buffers = g_list_remove (buffers, outbuffer);
+  ASSERT_BUFFER_REFCOUNT (outbuffer, "outbuffer", 2);
+  length = GST_DP_HEADER_LENGTH + (strlen (caps_string) + 1);
+  fail_unless_equals_int (GST_BUFFER_SIZE (outbuffer), length);
+  gst_buffer_unref (outbuffer);
+
+  /* the third buffer is the GDP buffer for our pushed buffer */
+  fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
+  buffers = g_list_remove (buffers, outbuffer);
+  ASSERT_BUFFER_REFCOUNT (outbuffer, "outbuffer", 1);
+  length = GST_DP_HEADER_LENGTH + 4;
+  fail_unless_equals_int (GST_BUFFER_SIZE (outbuffer), length);
+  gst_buffer_unref (outbuffer);
+
+  /* second buffer */
+  GST_DEBUG ("second buffer");
+  inbuffer = gst_buffer_new_and_alloc (4);
+  gst_buffer_set_caps (inbuffer, caps);
+
+  ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1);
+
+  /* pushing gives away my reference */
+  fail_unless (gst_pad_push (mysrcpad, inbuffer) == GST_FLOW_OK);
+
+  fail_unless_equals_int (g_list_length (buffers), 1);
+  fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
+  buffers = g_list_remove (buffers, outbuffer);
+  ASSERT_BUFFER_REFCOUNT (outbuffer, "outbuffer", 1);
+
+  /* the third output buffer is data */
+  length = GST_DP_HEADER_LENGTH + 4;
+  fail_unless_equals_int (GST_BUFFER_SIZE (outbuffer), length);
+  gst_buffer_unref (outbuffer);
+
+  /* a third buffer without caps set explicitly; should work */
+  GST_DEBUG ("Creating third buffer, no caps set");
+  inbuffer = gst_buffer_new_and_alloc (4);
+
+  ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1);
+
+  /* pushing gives away my reference */
+  fail_unless (gst_pad_push (mysrcpad, inbuffer) == GST_FLOW_OK);
+
+  fail_unless_equals_int (g_list_length (buffers), 1);
+  fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
+  buffers = g_list_remove (buffers, outbuffer);
+  ASSERT_BUFFER_REFCOUNT (outbuffer, "outbuffer", 1);
+
+  /* the fourth output buffer is data */
+  length = GST_DP_HEADER_LENGTH + 4;
+  fail_unless_equals_int (GST_BUFFER_SIZE (outbuffer), length);
+  gst_buffer_unref (outbuffer);
+
+
+  fail_unless (gst_element_set_state (gdppay,
+          GST_STATE_NULL) == GST_STATE_CHANGE_SUCCESS, "could not set to null");
+
+  gst_caps_unref (caps);
+  g_free (caps_string);
+  ASSERT_OBJECT_REFCOUNT (gdppay, "gdppay", 1);
+  gst_object_unref (gdppay);
+}
+
+GST_END_TEST;
+
+static GstStaticPadTemplate shsrctemplate = GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("application/x-gst-test-streamheader")
+    );
+
+
+GstElement *
+setup_gdppay_streamheader ()
+{
+  GstElement *gdppay;
+
+  GST_DEBUG ("setup_gdppay");
+  gdppay = gst_check_setup_element ("gdppay");
+  myshsrcpad = gst_check_setup_src_pad (gdppay, &shsrctemplate, NULL);
+  mysinkpad = gst_check_setup_sink_pad (gdppay, &sinktemplate, NULL);
+
+  return gdppay;
+}
+
+/* this test serializes a stream that already has a streamheader of its own.
+ * the streamheader should then be serialized and put on the GDP stream's
+ * streamheader */
+GST_START_TEST (test_streamheader)
+{
+  GstCaps *caps, *sinkcaps;
+  GstElement *gdppay;
+  GstBuffer *inbuffer, *outbuffer, *shbuffer;
+  GstEvent *event;
+  gchar *caps_string;
+  gint length;
+  GstStructure *structure;
+  GValue array = { 0 };
+  GValue value = { 0 };
+  const GValue *sh;
+  GArray *shbuffers;
+
+
+  gdppay = setup_gdppay_streamheader ();
+
+  fail_unless (gst_element_set_state (gdppay,
+          GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
+      "could not set to playing");
+
+  GST_DEBUG ("new segment");
+  event =
+      gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_TIME, 0, GST_SECOND, 0);
+  fail_unless (gst_pad_push_event (myshsrcpad, event));
+
+  /* no buffer should be pushed yet, still waiting for caps */
+  fail_unless_equals_int (g_list_length (buffers), 0);
+
+  GST_DEBUG ("first buffer");
+  inbuffer = gst_buffer_new_and_alloc (4);
+  memcpy (GST_BUFFER_DATA (inbuffer), "head", 4);
+  caps = gst_caps_from_string ("application/x-gst-test-streamheader");
+  structure = gst_caps_get_structure (caps, 0);
+  GST_BUFFER_FLAG_SET (inbuffer, GST_BUFFER_FLAG_IN_CAPS);
+  g_value_init (&array, GST_TYPE_ARRAY);
+  g_value_init (&value, GST_TYPE_BUFFER);
+  shbuffer = gst_buffer_copy (inbuffer);
+  gst_value_set_buffer (&value, shbuffer);
+  gst_buffer_unref (shbuffer);
+  gst_value_array_append_value (&array, &value);
+  g_value_unset (&value);
+  gst_structure_set_value (structure, "streamheader", &array);
+  g_value_unset (&array);
+  caps_string = gst_caps_to_string (caps);
+
+  gst_buffer_set_caps (inbuffer, caps);
+  ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1);
+
+  /* pushing gives away my reference */
+  fail_unless (gst_pad_push (myshsrcpad, inbuffer) == GST_FLOW_OK);
+
+  /* we should have three buffers now */
+  fail_unless_equals_int (g_list_length (buffers), 3);
+
+  /* our sink pad should now have GDP caps with a streamheader that includes
+   * GDP wrappings of our streamheader */
+  sinkcaps = gst_pad_get_negotiated_caps (mysinkpad);
+  structure = gst_caps_get_structure (sinkcaps, 0);
+  fail_unless_equals_string ((gchar *) gst_structure_get_name (structure),
+      "application/x-gdp");
+  fail_unless (gst_structure_has_field (structure, "streamheader"));
+  sh = gst_structure_get_value (structure, "streamheader");
+  fail_unless (G_VALUE_TYPE (sh) == GST_TYPE_ARRAY);
+  shbuffers = g_value_peek_pointer (sh);
+  /* a serialized new_segment, a serialized caps, and serialization of our
+   * incoming streamheader */
+  fail_unless_equals_int (shbuffers->len, 3);
+
+  gst_caps_unref (sinkcaps);
+
+  /* first buffer is the serialized new_segment event;
+   * the element also holds a ref to it */
+  fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
+  buffers = g_list_remove (buffers, outbuffer);
+  ASSERT_BUFFER_REFCOUNT (outbuffer, "outbuffer", 2);
+  gst_buffer_unref (outbuffer);
+
+  /* second buffer is the serialized caps;
+   * the element also holds a ref to it */
+  fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
+  buffers = g_list_remove (buffers, outbuffer);
+  ASSERT_BUFFER_REFCOUNT (outbuffer, "outbuffer", 2);
+  length = GST_DP_HEADER_LENGTH + (strlen (caps_string) + 1);
+  fail_unless_equals_int (GST_BUFFER_SIZE (outbuffer), length);
+  gst_buffer_unref (outbuffer);
+
+  /* the third buffer is the GDP buffer for our pushed buffer */
+  fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
+  buffers = g_list_remove (buffers, outbuffer);
+  ASSERT_BUFFER_REFCOUNT (outbuffer, "outbuffer", 1);
+  length = GST_DP_HEADER_LENGTH + 4;
+  fail_unless_equals_int (GST_BUFFER_SIZE (outbuffer), length);
+  gst_buffer_unref (outbuffer);
+
+  /* second buffer */
+  GST_DEBUG ("second buffer");
+  inbuffer = gst_buffer_new_and_alloc (4);
+  gst_buffer_set_caps (inbuffer, caps);
+
+  ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1);
+
+  /* pushing gives away my reference */
+  fail_unless (gst_pad_push (myshsrcpad, inbuffer) == GST_FLOW_OK);
+
+  fail_unless_equals_int (g_list_length (buffers), 1);
+  fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
+  buffers = g_list_remove (buffers, outbuffer);
+  ASSERT_BUFFER_REFCOUNT (outbuffer, "outbuffer", 1);
+
+  /* the third output buffer is data */
+  length = GST_DP_HEADER_LENGTH + 4;
+  fail_unless_equals_int (GST_BUFFER_SIZE (outbuffer), length);
+  gst_buffer_unref (outbuffer);
+
+  /* a third buffer without caps set explicitly; should work */
+  GST_DEBUG ("Creating third buffer, no caps set");
+  inbuffer = gst_buffer_new_and_alloc (4);
+
+  ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1);
+
+  /* pushing gives away my reference */
+  fail_unless (gst_pad_push (myshsrcpad, inbuffer) == GST_FLOW_OK);
+
+  fail_unless_equals_int (g_list_length (buffers), 1);
+  fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
+  buffers = g_list_remove (buffers, outbuffer);
+  ASSERT_BUFFER_REFCOUNT (outbuffer, "outbuffer", 1);
+
+  /* the fourth output buffer is data */
+  length = GST_DP_HEADER_LENGTH + 4;
+  fail_unless_equals_int (GST_BUFFER_SIZE (outbuffer), length);
+  gst_buffer_unref (outbuffer);
+
+
+  fail_unless (gst_element_set_state (gdppay,
+          GST_STATE_NULL) == GST_STATE_CHANGE_SUCCESS, "could not set to null");
+
+  gst_caps_unref (caps);
+  g_free (caps_string);
+  ASSERT_OBJECT_REFCOUNT (gdppay, "gdppay", 1);
+  gst_object_unref (gdppay);
+}
+
+GST_END_TEST;
+
+
+GST_START_TEST (test_first_no_caps)
+{
+  GstElement *gdppay;
+  GstBuffer *inbuffer;
+
+  gdppay = setup_gdppay ();
+
+  fail_unless (gst_element_set_state (gdppay,
+          GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
+      "could not set to playing");
+
+  GST_DEBUG ("first buffer");
+  inbuffer = gst_buffer_new_and_alloc (4);
+  ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1);
+
+  /* pushing should trigger an error */
+  fail_unless (gst_pad_push (mysrcpad, inbuffer) == GST_FLOW_NOT_NEGOTIATED);
+
+  fail_unless_equals_int (g_list_length (buffers), 0);
+
+  fail_unless (gst_element_set_state (gdppay,
+          GST_STATE_NULL) == GST_STATE_CHANGE_SUCCESS, "could not set to null");
+
+  ASSERT_OBJECT_REFCOUNT (gdppay, "gdppay", 1);
+  gst_object_unref (gdppay);
+}
+
+GST_END_TEST;
+
+/* element should still work if no new_segment is sent before the first
+ * buffer */
+GST_START_TEST (test_first_no_new_segment)
+{
+  GstElement *gdppay;
+  GstBuffer *inbuffer;
+  GstCaps *caps;
+
+  gdppay = setup_gdppay ();
+
+  fail_unless (gst_element_set_state (gdppay,
+          GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
+      "could not set to playing");
+
+  GST_DEBUG ("first buffer");
+  inbuffer = gst_buffer_new_and_alloc (4);
+  caps = gst_caps_from_string (AUDIO_CAPS_STRING);
+  gst_buffer_set_caps (inbuffer, caps);
+
+  ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1);
+
+  /* pushing gives away my reference */
+  fail_unless (gst_pad_push (mysrcpad, inbuffer) == GST_FLOW_OK);
+
+  /* we should have three buffers now;
+   * one for an "invented" new segment, one for GDP caps, and one with our
+   * buffer */
+  fail_unless_equals_int (g_list_length (buffers), 3);
+
+  fail_unless (gst_element_set_state (gdppay,
+          GST_STATE_NULL) == GST_STATE_CHANGE_SUCCESS, "could not set to null");
+
+  ASSERT_OBJECT_REFCOUNT (gdppay, "gdppay", 1);
+  gst_object_unref (gdppay);
+}
+
+GST_END_TEST;
+
+
+Suite *
+gdppay_suite (void)
+{
+  Suite *s = suite_create ("gdppay");
+  TCase *tc_chain = tcase_create ("general");
+
+  suite_add_tcase (s, tc_chain);
+  tcase_add_test (tc_chain, test_audio);
+  tcase_add_test (tc_chain, test_first_no_caps);
+  tcase_add_test (tc_chain, test_first_no_new_segment);
+  tcase_add_test (tc_chain, test_streamheader);
+
+  return s;
+}
+
+int
+main (int argc, char **argv)
+{
+  int nf;
+
+  Suite *s = gdppay_suite ();
+  SRunner *sr = srunner_create (s);
+
+  gst_check_init (&argc, &argv);
+
+  srunner_run_all (sr, CK_NORMAL);
+  nf = srunner_ntests_failed (sr);
+  srunner_free (sr);
+
+  return nf;
+}