From 26f7a1ca667d98abac5717e8708f9cf2c32d1f56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
Date: Thu, 16 Jun 2011 19:06:03 -0400
Subject: [PATCH 001/158] shm: Improve documentation of internal shmpipe

---
 sys/shm/shmpipe.h | 56 +++++++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/sys/shm/shmpipe.h b/sys/shm/shmpipe.h
index c4475b8534..9cf0d6c61c 100644
--- a/sys/shm/shmpipe.h
+++ b/sys/shm/shmpipe.h
@@ -23,35 +23,39 @@
  */
 
 /*
- * None of this code is thread safe, if you want to use it in a multi-threaded
- * context, please protect it with a mutex.
+ * None of this code is thread safe, if you want to use it in a
+ * multi-threaded context, please protect it with a mutex.
  *
- * First, create a writer with sp_writer_create()
- * And selectes() on the socket from sp_get_fd()
- * If the socket is closed or there are errors from any function, the app
- * should call sp_close() and assume the writer is dead
- * The server calls sp_writer_accept_client() when there is something to read
- * from the server fd
- * It then needs to select() on the socket from sp_writer_get_client_fd()
- * If it gets an error on that socket, it call sp_writer_close_client().
- * If there is something to read, it calls sp_writer_recv().
+ * First, create a writer with sp_writer_create(), then select() on
+ * the socket returned by sp_get_fd(). If the socket is closed or any
+ * function returns an error, the app should call sp_close() and
+ * assume the other side is dead. The writer calls
+ * sp_writer_accept_client() when there is something to read from the
+ * main server fd. This returns a new ShmClient (representing a client
+ * connection), the writer needs to do a select() on the socket
+ * returned by sp_writer_get_client_fd(). If it gets an error on that
+ * socket, it calls sp_writer_close_client(). If there is something to
+ * read, it calls sp_writer_recv().
  *
- * The writer allocates buffers with sp_writer_alloc_block(),
- * writes something in the buffer (retrieved with sp_writer_block_get_buf(),
- * then calls  sp_writer_send_buf() to send the buffer or a subsection to
- * the other side. When it is done with the block, it calls
- * sp_writer_free_block().
- * If alloc fails, then the server must wait for events from the clients before
- * trying again.
+ * The writer allocates a block containing a free buffer with
+ * sp_writer_alloc_block(), then writes something in the buffer
+ * (retrieved with sp_writer_block_get_buf(), then calls
+ * sp_writer_send_buf() to send the buffer or a subsection to the
+ * other side. When it is done with the block, it calls
+ * sp_writer_free_block().  If alloc fails, then the server must wait
+ * for events on the client fd (the ones where sp_writer_recv() is
+ * called), and then try to re-alloc.
  *
- *
- * The clients connect with sp_client_open()
- * And select() on the fd from sp_get_fd() until there is something to read.
- * Then they must read using sp_client_recv() which will return > 0 if there
- * is a valid buffer (which is read only). It will return 0 if it is an internal
- * message and <0 if there was an error. If there was an error, one must close
- * it with sp_close(). If was valid buffer was received, the client must release
- * it with sp_client_recv_finish() when it is done reading from it.
+ * The reader (client) connect to the writer with sp_client_open() And
+ * select()s on the fd from sp_get_fd() until there is something to
+ * read.  Then they must read using sp_client_recv() which will return
+ * the size of the buffer (positive) if there is a valid buffer (which
+ * is read only).  It will return 0 if it is an internal message and a
+ * negative number if there was an error.  If there was an error, the
+ * application must close the pipe with sp_close() and assume that all
+ * buffers are no longer valid. If was valid buffer was received, the
+ * client must release it with sp_client_recv_finish() when it is done
+ * reading from it.
  */
 
 

From a1f5b2e0cc549a4509b0baa9be4c60a7ea669fc9 Mon Sep 17 00:00:00 2001
From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Wed, 15 Jun 2011 18:20:48 +0200
Subject: [PATCH 002/158] colorspace: fix odd width and height handling in some
 fastpath cases

---
 gst/colorspace/colorspace.c | 107 ++++++++++++++++++++++++++++++------
 1 file changed, 90 insertions(+), 17 deletions(-)

diff --git a/gst/colorspace/colorspace.c b/gst/colorspace/colorspace.c
index 8bcd2c4295..3fd1ccde9c 100644
--- a/gst/colorspace/colorspace.c
+++ b/gst/colorspace/colorspace.c
@@ -1830,7 +1830,7 @@ convert_I420_YUY2 (ColorspaceConvert * convert, guint8 * dest,
 {
   int i;
 
-  for (i = 0; i < convert->height; i += 2) {
+  for (i = 0; i < GST_ROUND_DOWN_2 (convert->height); i += 2) {
     cogorc_convert_I420_YUY2 (FRAME_GET_LINE (dest, 0, i),
         FRAME_GET_LINE (dest, 0, i + 1),
         FRAME_GET_LINE (src, 0, i),
@@ -1838,6 +1838,12 @@ convert_I420_YUY2 (ColorspaceConvert * convert, guint8 * dest,
         FRAME_GET_LINE (src, 1, i >> 1),
         FRAME_GET_LINE (src, 2, i >> 1), (convert->width + 1) / 2);
   }
+
+  /* now handle last line */
+  if (convert->height & 1) {
+    getline_I420 (convert, convert->tmpline, src, convert->height - 1);
+    putline_YUY2 (convert, dest, convert->tmpline, convert->height - 1);
+  }
 }
 
 static void
@@ -1846,7 +1852,7 @@ convert_I420_UYVY (ColorspaceConvert * convert, guint8 * dest,
 {
   int i;
 
-  for (i = 0; i < convert->height; i += 2) {
+  for (i = 0; i < GST_ROUND_DOWN_2 (convert->height); i += 2) {
     cogorc_convert_I420_UYVY (FRAME_GET_LINE (dest, 0, i),
         FRAME_GET_LINE (dest, 0, i + 1),
         FRAME_GET_LINE (src, 0, i),
@@ -1854,6 +1860,12 @@ convert_I420_UYVY (ColorspaceConvert * convert, guint8 * dest,
         FRAME_GET_LINE (src, 1, i >> 1),
         FRAME_GET_LINE (src, 2, i >> 1), (convert->width + 1) / 2);
   }
+
+  /* now handle last line */
+  if (convert->height & 1) {
+    getline_I420 (convert, convert->tmpline, src, convert->height - 1);
+    putline_UYVY (convert, dest, convert->tmpline, convert->height - 1);
+  }
 }
 
 static void
@@ -1862,7 +1874,7 @@ convert_I420_AYUV (ColorspaceConvert * convert, guint8 * dest,
 {
   int i;
 
-  for (i = 0; i < convert->height; i += 2) {
+  for (i = 0; i < GST_ROUND_DOWN_2 (convert->height); i += 2) {
     cogorc_convert_I420_AYUV (FRAME_GET_LINE (dest, 0, i),
         FRAME_GET_LINE (dest, 0, i + 1),
         FRAME_GET_LINE (src, 0, i),
@@ -1870,6 +1882,12 @@ convert_I420_AYUV (ColorspaceConvert * convert, guint8 * dest,
         FRAME_GET_LINE (src, 1, i >> 1),
         FRAME_GET_LINE (src, 2, i >> 1), convert->width);
   }
+
+  /* now handle last line */
+  if (convert->height & 1) {
+    getline_I420 (convert, convert->tmpline, src, convert->height - 1);
+    putline_AYUV (convert, dest, convert->tmpline, convert->height - 1);
+  }
 }
 
 static void
@@ -1902,23 +1920,31 @@ convert_I420_Y444 (ColorspaceConvert * convert, guint8 * dest,
   cogorc_planar_chroma_420_444 (FRAME_GET_LINE (dest, 1, 0),
       2 * convert->dest_stride[1], FRAME_GET_LINE (dest, 1, 1),
       2 * convert->dest_stride[1], FRAME_GET_LINE (src, 1, 0),
-      convert->src_stride[1], (convert->width + 1) / 2,
-      (convert->height + 1) / 2);
+      convert->src_stride[1], (convert->width + 1) / 2, convert->height / 2);
 
   cogorc_planar_chroma_420_444 (FRAME_GET_LINE (dest, 2, 0),
       2 * convert->dest_stride[2], FRAME_GET_LINE (dest, 2, 1),
       2 * convert->dest_stride[2], FRAME_GET_LINE (src, 2, 0),
-      convert->src_stride[2], (convert->width + 1) / 2,
-      (convert->height + 1) / 2);
+      convert->src_stride[2], (convert->width + 1) / 2, convert->height / 2);
+
+  /* now handle last line */
+  if (convert->height & 1) {
+    getline_I420 (convert, convert->tmpline, src, convert->height - 1);
+    putline_Y444 (convert, dest, convert->tmpline, convert->height - 1);
+  }
 }
 
 static void
 convert_YUY2_I420 (ColorspaceConvert * convert, guint8 * dest,
     const guint8 * src)
 {
-  int i;
+  int i, h;
 
-  for (i = 0; i < convert->height; i += 2) {
+  h = convert->height;
+  if (convert->width & 1)
+    h--;
+
+  for (i = 0; i < h; i += 2) {
     cogorc_convert_YUY2_I420 (FRAME_GET_LINE (dest, 0, i),
         FRAME_GET_LINE (dest, 0, i + 1),
         FRAME_GET_LINE (dest, 1, i >> 1),
@@ -1926,6 +1952,12 @@ convert_YUY2_I420 (ColorspaceConvert * convert, guint8 * dest,
         FRAME_GET_LINE (src, 0, i),
         FRAME_GET_LINE (src, 0, i + 1), (convert->width + 1) / 2);
   }
+
+  /* now handle last line */
+  if (convert->width & 1) {
+    getline_YUY2 (convert, convert->tmpline, src, convert->height - 1);
+    putline_I420 (convert, dest, convert->tmpline, convert->height - 1);
+  }
 }
 
 static void
@@ -1934,7 +1966,14 @@ convert_YUY2_AYUV (ColorspaceConvert * convert, guint8 * dest,
 {
   cogorc_convert_YUY2_AYUV (FRAME_GET_LINE (dest, 0, 0),
       convert->dest_stride[0], FRAME_GET_LINE (src, 0, 0),
-      convert->src_stride[0], (convert->width + 1) / 2, convert->height);
+      convert->src_stride[0], (convert->width + 1) / 2,
+      convert->width & 1 ? convert->height - 1 : convert->height);
+
+  /* now handle last line */
+  if (convert->width & 1) {
+    getline_YUY2 (convert, convert->tmpline, src, convert->height - 1);
+    putline_AYUV (convert, dest, convert->tmpline, convert->height - 1);
+  }
 }
 
 static void
@@ -1966,7 +2005,7 @@ convert_UYVY_I420 (ColorspaceConvert * convert, guint8 * dest,
 {
   int i;
 
-  for (i = 0; i < convert->height; i += 2) {
+  for (i = 0; i < GST_ROUND_DOWN_2 (convert->height); i += 2) {
     cogorc_convert_UYVY_I420 (FRAME_GET_LINE (dest, 0, i),
         FRAME_GET_LINE (dest, 0, i + 1),
         FRAME_GET_LINE (dest, 1, i >> 1),
@@ -1974,6 +2013,12 @@ convert_UYVY_I420 (ColorspaceConvert * convert, guint8 * dest,
         FRAME_GET_LINE (src, 0, i),
         FRAME_GET_LINE (src, 0, i + 1), (convert->width + 1) / 2);
   }
+
+  /* now handle last line */
+  if (convert->height & 1) {
+    getline_UYVY (convert, convert->tmpline, src, convert->height - 1);
+    putline_I420 (convert, dest, convert->tmpline, convert->height - 1);
+  }
 }
 
 static void
@@ -1982,7 +2027,14 @@ convert_UYVY_AYUV (ColorspaceConvert * convert, guint8 * dest,
 {
   cogorc_convert_UYVY_AYUV (FRAME_GET_LINE (dest, 0, 0),
       convert->dest_stride[0], FRAME_GET_LINE (src, 0, 0),
-      convert->src_stride[0], (convert->width + 1) / 2, convert->height);
+      convert->src_stride[0], (convert->width + 1) / 2,
+      convert->width & 1 ? convert->height - 1 : convert->height);
+
+  /* now handle last line */
+  if (convert->width & 1) {
+    getline_UYVY (convert, convert->tmpline, src, convert->height - 1);
+    putline_AYUV (convert, dest, convert->tmpline, convert->height - 1);
+  }
 }
 
 static void
@@ -2055,7 +2107,15 @@ convert_AYUV_Y42B (ColorspaceConvert * convert, guint8 * dest,
       convert->dest_stride[0], FRAME_GET_LINE (dest, 1, 0),
       convert->dest_stride[1], FRAME_GET_LINE (dest, 2, 0),
       convert->dest_stride[2], FRAME_GET_LINE (src, 0, 0),
-      convert->src_stride[0], (convert->width + 1) / 2, convert->height);
+      convert->src_stride[0], (convert->width + 1) / 2,
+      convert->width & 1 ? convert->height - 1 : convert->height);
+
+  /* now handle last line */
+  if (convert->height & 1) {
+    getline_AYUV (convert, convert->tmpline, src, convert->height - 1);
+    putline_Y42B (convert, dest, convert->tmpline, convert->height - 1);
+  }
+
 }
 
 static void
@@ -2081,13 +2141,20 @@ convert_Y42B_I420 (ColorspaceConvert * convert, guint8 * dest,
       convert->dest_stride[1], FRAME_GET_LINE (src, 1, 0),
       2 * convert->src_stride[1], FRAME_GET_LINE (src, 1, 1),
       2 * convert->src_stride[1], (convert->width + 1) / 2,
-      (convert->height + 1) / 2);
+      convert->height / 2);
 
   cogorc_planar_chroma_422_420 (FRAME_GET_LINE (dest, 2, 0),
       convert->dest_stride[2], FRAME_GET_LINE (src, 2, 0),
       2 * convert->src_stride[2], FRAME_GET_LINE (src, 2, 1),
       2 * convert->src_stride[2], (convert->width + 1) / 2,
-      (convert->height + 1) / 2);
+      convert->height / 2);
+
+  /* now handle last line */
+  if (convert->height & 1) {
+    getline_Y42B (convert, convert->tmpline, src, convert->height - 1);
+    putline_I420 (convert, dest, convert->tmpline, convert->height - 1);
+  }
+
 }
 
 static void
@@ -2152,13 +2219,19 @@ convert_Y444_I420 (ColorspaceConvert * convert, guint8 * dest,
       convert->dest_stride[1], FRAME_GET_LINE (src, 1, 0),
       2 * convert->src_stride[1], FRAME_GET_LINE (src, 1, 1),
       2 * convert->src_stride[1], (convert->width + 1) / 2,
-      (convert->height + 1) / 2);
+      convert->height / 2);
 
   cogorc_planar_chroma_444_420 (FRAME_GET_LINE (dest, 2, 0),
       convert->dest_stride[2], FRAME_GET_LINE (src, 2, 0),
       2 * convert->src_stride[2], FRAME_GET_LINE (src, 2, 1),
       2 * convert->src_stride[2], (convert->width + 1) / 2,
-      (convert->height + 1) / 2);
+      convert->height / 2);
+
+  /* now handle last line */
+  if (convert->height & 1) {
+    getline_Y444 (convert, convert->tmpline, src, convert->height - 1);
+    putline_I420 (convert, dest, convert->tmpline, convert->height - 1);
+  }
 }
 
 static void

From 6429ead4bc3b3a6a61d98c2276e6deb7d21553b3 Mon Sep 17 00:00:00 2001
From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Fri, 17 Jun 2011 12:10:06 +0200
Subject: [PATCH 003/158] debugutils: add compare element

---
 gst/debugutils/Makefile.am     |   4 +
 gst/debugutils/debugutilsbad.c |   4 +
 gst/debugutils/gstcompare.c    | 664 +++++++++++++++++++++++++++++++++
 gst/debugutils/gstcompare.h    |  75 ++++
 4 files changed, 747 insertions(+)
 create mode 100644 gst/debugutils/gstcompare.c
 create mode 100644 gst/debugutils/gstcompare.h

diff --git a/gst/debugutils/Makefile.am b/gst/debugutils/Makefile.am
index 9d237a3251..eadb82e9b9 100644
--- a/gst/debugutils/Makefile.am
+++ b/gst/debugutils/Makefile.am
@@ -22,10 +22,14 @@ libgstdebugutilsbad_la_SOURCES = \
 	gstchecksumsink.h \
 	gstchopmydata.c \
 	gstchopmydata.h \
+	gstcompare.c \
+	gstcompare.h \
 	gstdebugspy.h
+
 nodist_libgstdebugutilsbad_la_SOURCES = $(BUILT_SOURCES)
 libgstdebugutilsbad_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
 libgstdebugutilsbad_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
+	-lgstvideo-$(GST_MAJORMINOR) \
 	-lgstinterfaces-$(GST_MAJORMINOR) $(GST_LIBS)
 libgstdebugutilsbad_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstdebugutilsbad_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/gst/debugutils/debugutilsbad.c b/gst/debugutils/debugutilsbad.c
index 09082a72db..2ee7f93c06 100644
--- a/gst/debugutils/debugutilsbad.c
+++ b/gst/debugutils/debugutilsbad.c
@@ -26,6 +26,7 @@
 GType gst_checksum_sink_get_type (void);
 GType fps_display_sink_get_type (void);
 GType gst_chop_my_data_get_type (void);
+GType gst_compare_get_type (void);
 GType gst_debug_spy_get_type (void);
 
 static gboolean
@@ -37,8 +38,11 @@ plugin_init (GstPlugin * plugin)
       fps_display_sink_get_type ());
   gst_element_register (plugin, "chopmydata", GST_RANK_NONE,
       gst_chop_my_data_get_type ());
+  gst_element_register (plugin, "compare", GST_RANK_NONE,
+      gst_compare_get_type ());
   gst_element_register (plugin, "debugspy", GST_RANK_NONE,
       gst_debug_spy_get_type ());
+
   return TRUE;
 }
 
diff --git a/gst/debugutils/gstcompare.c b/gst/debugutils/gstcompare.c
new file mode 100644
index 0000000000..abf563c6c7
--- /dev/null
+++ b/gst/debugutils/gstcompare.c
@@ -0,0 +1,664 @@
+/* GStreamer Element
+ *
+ * Copyright 2011 Collabora Ltd.
+ *  @author: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
+ * Copyright 2011 Nokia Corp.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include <string.h>
+
+#include <gst/gst.h>
+#include <gst/base/gstcollectpads.h>
+#include <gst/video/video.h>
+
+#include "gstcompare.h"
+
+GST_DEBUG_CATEGORY_STATIC (compare_debug);
+#define GST_CAT_DEFAULT   compare_debug
+
+
+static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS_ANY);
+
+static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS_ANY);
+
+static GstStaticPadTemplate check_sink_factory =
+GST_STATIC_PAD_TEMPLATE ("check",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS_ANY);
+
+enum GstCompareMethod
+{
+  GST_COMPARE_METHOD_MEM,
+  GST_COMPARE_METHOD_MAX,
+  GST_COMPARE_METHOD_SSIM
+};
+
+#define GST_COMPARE_METHOD_TYPE (gst_compare_method_get_type())
+static GType
+gst_compare_method_get_type (void)
+{
+  static GType method_type = 0;
+
+  static const GEnumValue method_types[] = {
+    {GST_COMPARE_METHOD_MEM, "Memory", "mem"},
+    {GST_COMPARE_METHOD_MAX, "Maximum metric", "max"},
+    {GST_COMPARE_METHOD_SSIM, "SSIM (raw video)", "ssim"},
+    {0, NULL, NULL}
+  };
+
+  if (!method_type) {
+    method_type = g_enum_register_static ("GstCompareMethod", method_types);
+  }
+  return method_type;
+}
+
+/* Filter signals and args */
+enum
+{
+  /* FILL ME */
+  LAST_SIGNAL
+};
+
+enum
+{
+  PROP_0,
+  PROP_META,
+  PROP_OFFSET_TS,
+  PROP_METHOD,
+  PROP_THRESHOLD,
+  PROP_UPPER,
+  PROP_LAST
+};
+
+#define DEFAULT_META             GST_BUFFER_COPY_ALL
+#define DEFAULT_OFFSET_TS        FALSE
+#define DEFAULT_METHOD           GST_COMPARE_METHOD_MEM
+#define DEFAULT_THRESHOLD        0
+#define DEFAULT_UPPER            TRUE
+
+static void gst_compare_set_property (GObject * object,
+    guint prop_id, const GValue * value, GParamSpec * pspec);
+static void gst_compare_get_property (GObject * object,
+    guint prop_id, GValue * value, GParamSpec * pspec);
+
+static void gst_compare_reset (GstCompare * overlay);
+
+static GstCaps *gst_compare_getcaps (GstPad * pad);
+static GstFlowReturn gst_compare_collect_pads (GstCollectPads * cpads,
+    GstCompare * comp);
+
+static GstStateChangeReturn gst_compare_change_state (GstElement * element,
+    GstStateChange transition);
+
+GST_BOILERPLATE (GstCompare, gst_compare, GstElement, GST_TYPE_ELEMENT);
+
+
+static void
+gst_compare_base_init (gpointer g_class)
+{
+  GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
+
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&src_factory));
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&sink_factory));
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&check_sink_factory));
+  gst_element_class_set_details_simple (element_class, "Compare buffers",
+      "Filter/Debug", "Compares incoming buffers",
+      "Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>");
+}
+
+static void
+gst_compare_finalize (GObject * object)
+{
+  GstCompare *comp = GST_COMPARE (object);
+
+  gst_object_unref (comp->cpads);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_compare_class_init (GstCompareClass * klass)
+{
+  GObjectClass *gobject_class;
+  GstElementClass *gstelement_class;
+
+  gobject_class = (GObjectClass *) klass;
+  gstelement_class = (GstElementClass *) klass;
+
+  GST_DEBUG_CATEGORY_INIT (compare_debug, "compare", 0, "Compare buffers");
+
+  gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_compare_change_state);
+
+  gobject_class->set_property = gst_compare_set_property;
+  gobject_class->get_property = gst_compare_get_property;
+  gobject_class->finalize = gst_compare_finalize;
+
+  g_object_class_install_property (gobject_class, PROP_META,
+      g_param_spec_flags ("meta", "Compare Meta",
+          "Indicates which metadata should be compared",
+          gst_buffer_copy_flags_get_type (), DEFAULT_META,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class, PROP_OFFSET_TS,
+      g_param_spec_boolean ("offset-ts", "Offsets Timestamps",
+          "Consider OFFSET and OFFSET_END part of timestamp metadata",
+          DEFAULT_OFFSET_TS, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class, PROP_METHOD,
+      g_param_spec_enum ("method", "Content Compare Method",
+          "Method to compare buffer content",
+          GST_COMPARE_METHOD_TYPE, DEFAULT_METHOD,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class, PROP_THRESHOLD,
+      g_param_spec_double ("threshold", "Content Threshold",
+          "Threshold beyond which to consider content different as determined by content-method",
+          0, G_MAXDOUBLE, DEFAULT_THRESHOLD,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class, PROP_UPPER,
+      g_param_spec_boolean ("upper", "Threshold Upper Bound",
+          "Whether threshold value is upper bound or lower bound for difference measure",
+          DEFAULT_UPPER, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+}
+
+static void
+gst_compare_init (GstCompare * comp, GstCompareClass * klass)
+{
+  comp->cpads = gst_collect_pads_new ();
+  gst_collect_pads_set_function (comp->cpads,
+      (GstCollectPadsFunction) GST_DEBUG_FUNCPTR (gst_compare_collect_pads),
+      comp);
+
+  comp->sinkpad = gst_pad_new_from_static_template (&sink_factory, "sink");
+  gst_pad_set_getcaps_function (comp->sinkpad, gst_compare_getcaps);
+  gst_element_add_pad (GST_ELEMENT (comp), comp->sinkpad);
+
+  comp->checkpad =
+      gst_pad_new_from_static_template (&check_sink_factory, "check");
+  gst_pad_set_getcaps_function (comp->checkpad, gst_compare_getcaps);
+  gst_element_add_pad (GST_ELEMENT (comp), comp->checkpad);
+
+  gst_collect_pads_add_pad_full (comp->cpads, comp->sinkpad,
+      sizeof (GstCollectData), NULL);
+  gst_collect_pads_add_pad_full (comp->cpads, comp->checkpad,
+      sizeof (GstCollectData), NULL);
+
+  comp->srcpad = gst_pad_new_from_static_template (&src_factory, "src");
+  gst_pad_set_getcaps_function (comp->srcpad, gst_compare_getcaps);
+  gst_element_add_pad (GST_ELEMENT (comp), comp->srcpad);
+
+  /* init properties */
+  comp->meta = DEFAULT_META;
+  comp->offset_ts = DEFAULT_OFFSET_TS;
+  comp->method = DEFAULT_METHOD;
+  comp->threshold = DEFAULT_THRESHOLD;
+  comp->upper = DEFAULT_UPPER;
+
+  gst_compare_reset (comp);
+}
+
+static void
+gst_compare_reset (GstCompare * comp)
+{
+}
+
+static GstCaps *
+gst_compare_getcaps (GstPad * pad)
+{
+  GstCompare *comp;
+  GstPad *otherpad;
+  GstCaps *result;
+
+  comp = GST_COMPARE (gst_pad_get_parent (pad));
+  if (G_UNLIKELY (comp == NULL))
+    return gst_caps_new_any ();
+
+  otherpad = (pad == comp->srcpad ? comp->sinkpad : comp->srcpad);
+  result = gst_pad_peer_get_caps (otherpad);
+  if (result == NULL)
+    result = gst_caps_new_any ();
+
+  gst_object_unref (comp);
+
+  return result;
+}
+
+static void
+gst_compare_meta (GstCompare * comp, GstBuffer * buf1, GstBuffer * buf2)
+{
+  gint flags = 0;
+
+  if (comp->meta & GST_BUFFER_COPY_FLAGS) {
+    if (GST_BUFFER_FLAGS (buf1) != GST_BUFFER_FLAGS (buf2)) {
+      flags |= GST_BUFFER_COPY_FLAGS;
+      GST_DEBUG_OBJECT (comp, "flags %d != flags %d", GST_BUFFER_FLAGS (buf1),
+          GST_BUFFER_FLAGS (buf2));
+    }
+  }
+  if (comp->meta & GST_BUFFER_COPY_TIMESTAMPS) {
+    if (GST_BUFFER_TIMESTAMP (buf1) != GST_BUFFER_TIMESTAMP (buf2)) {
+      flags |= GST_BUFFER_COPY_TIMESTAMPS;
+      GST_DEBUG_OBJECT (comp,
+          "ts %" GST_TIME_FORMAT " != ts %" GST_TIME_FORMAT,
+          GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf1)),
+          GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf2)));
+    }
+    if (GST_BUFFER_DURATION (buf1) != GST_BUFFER_DURATION (buf2)) {
+      flags |= GST_BUFFER_COPY_TIMESTAMPS;
+      GST_DEBUG_OBJECT (comp,
+          "dur %" GST_TIME_FORMAT " != dur %" GST_TIME_FORMAT,
+          GST_TIME_ARGS (GST_BUFFER_DURATION (buf1)),
+          GST_TIME_ARGS (GST_BUFFER_DURATION (buf2)));
+    }
+    if (comp->offset_ts) {
+      if (GST_BUFFER_OFFSET (buf1) != GST_BUFFER_OFFSET (buf2)) {
+        flags |= GST_BUFFER_COPY_TIMESTAMPS;
+        GST_DEBUG_OBJECT (comp,
+            "offset %" G_GINT64_FORMAT " != offset %" G_GINT64_FORMAT,
+            GST_BUFFER_OFFSET (buf1), GST_BUFFER_OFFSET (buf2));
+      }
+      if (GST_BUFFER_OFFSET_END (buf1) != GST_BUFFER_OFFSET_END (buf2)) {
+        flags |= GST_BUFFER_COPY_TIMESTAMPS;
+        GST_DEBUG_OBJECT (comp,
+            "offset_end %" G_GINT64_FORMAT " != offset_end %" G_GINT64_FORMAT,
+            GST_BUFFER_OFFSET_END (buf1), GST_BUFFER_OFFSET_END (buf2));
+      }
+    }
+  }
+  if (comp->meta & GST_BUFFER_COPY_CAPS) {
+    if (!gst_caps_is_equal (GST_BUFFER_CAPS (buf1), GST_BUFFER_CAPS (buf2))) {
+      flags |= GST_BUFFER_COPY_CAPS;
+      GST_DEBUG_OBJECT (comp,
+          "caps %" GST_PTR_FORMAT " != caps %" GST_PTR_FORMAT,
+          GST_BUFFER_CAPS (buf1), GST_BUFFER_CAPS (buf2));
+    }
+  }
+
+  /* signal mismatch by debug and message */
+  if (flags) {
+    GST_WARNING_OBJECT (comp, "buffers %p and %p failed metadata match %d",
+        buf1, buf2, flags);
+
+    gst_element_post_message (GST_ELEMENT (comp),
+        gst_message_new_element (GST_OBJECT (comp),
+            gst_structure_new ("delta", "meta", G_TYPE_INT, flags, NULL)));
+  }
+}
+
+/* when comparing contents, it is already ensured sizes are equal */
+
+static gint
+gst_compare_mem (GstCompare * comp, GstBuffer * buf1, GstBuffer * buf2)
+{
+  return memcmp (GST_BUFFER_DATA (buf1), GST_BUFFER_DATA (buf2),
+      GST_BUFFER_SIZE (buf1)) ? 1 : 0;
+}
+
+static gint
+gst_compare_max (GstCompare * comp, GstBuffer * buf1, GstBuffer * buf2)
+{
+  gint i, delta = 0;
+  gint8 *data1, *data2;
+
+  data1 = (gint8 *) GST_BUFFER_DATA (buf1);
+  data2 = (gint8 *) GST_BUFFER_DATA (buf2);
+
+  /* primitive loop */
+  for (i = 0; i < GST_BUFFER_SIZE (buf1); i++) {
+    gint diff = ABS (*data1 - *data2);
+    if (diff > 0)
+      GST_LOG_OBJECT (comp, "diff at %d = %d", i, diff);
+    delta = MAX (delta, ABS (*data1 - *data2));
+    data1++;
+    data2++;
+  }
+
+  return delta;
+}
+
+static double
+gst_compare_ssim_window (GstCompare * comp, guint8 * data1, guint8 * data2,
+    gint width, gint height, gint step, gint stride)
+{
+  gint count = 0, i, j;
+  gint sum1 = 0, sum2 = 0, ssum1 = 0, ssum2 = 0, acov = 0;
+  gdouble avg1, avg2, var1, var2, cov;
+
+  const gdouble k1 = 0.01;
+  const gdouble k2 = 0.03;
+  const gdouble L = 255.0;
+  const gdouble c1 = (k1 * L) * (k1 * L);
+  const gdouble c2 = (k2 * L) * (k2 * L);
+
+  /* plain and simple; no fancy optimizations */
+  for (i = 0; i < height; i++) {
+    for (j = 0; j < width; j++) {
+      sum1 += *data1;
+      sum2 += *data2;
+      ssum1 += *data1 * *data1;
+      ssum2 += *data2 * *data2;
+      acov += *data1 * *data2;
+      count++;
+      data1 += step;
+      data2 += step;
+    }
+    data1 -= j * step;
+    data2 -= j * step;
+    data1 += stride;
+    data2 += stride;
+  }
+
+  avg1 = sum1 / count;
+  avg2 = sum2 / count;
+  var1 = ssum1 / count - avg1 * avg1;
+  var2 = ssum2 / count - avg2 * avg2;
+  cov = acov / count - avg1 * avg2;
+
+  return (2 * avg1 * avg2 + c1) * (2 * cov + c2) /
+      ((avg1 * avg1 + avg2 * avg2 + c1) * (var1 + var2 + c2));
+}
+
+/* @width etc are for the particular component */
+static gdouble
+gst_compare_ssim_component (GstCompare * comp, guint8 * data1, guint8 * data2,
+    gint width, gint height, gint step, gint stride)
+{
+  const gint window = 16;
+  gdouble ssim_sum = 0;
+  gint count = 0, i, j;
+
+  for (j = 0; j + (window / 2) < height; j += (window / 2)) {
+    for (i = 0; i + (window / 2) < width; i += (window / 2)) {
+      gdouble ssim;
+
+      ssim = gst_compare_ssim_window (comp, data1 + step * i + j * stride,
+          data2 + step * i + j * stride,
+          MIN (window, width - i), MIN (window, height - j), step, stride);
+      GST_LOG_OBJECT (comp, "ssim for %dx%d at (%d, %d) = %f", window, window,
+          i, j, ssim);
+      ssim_sum += ssim;
+      count++;
+    }
+  }
+
+  return (ssim_sum / count);
+}
+
+static gdouble
+gst_compare_ssim (GstCompare * comp, GstBuffer * buf1, GstBuffer * buf2)
+{
+  GstCaps *caps;
+  GstVideoFormat format, f;
+  gint width, height, w, h, i, comps;
+  gdouble cssim[4], ssim, c[4] = { 1.0, 0.0, 0.0, 0.0 };
+  guint8 *data1, *data2;
+
+  caps = GST_BUFFER_CAPS (buf1);
+  if (!caps)
+    goto invalid_input;
+
+  if (!gst_video_format_parse_caps (caps, &format, &width, &height))
+    goto invalid_input;
+
+  caps = GST_BUFFER_CAPS (buf2);
+  if (!caps)
+    goto invalid_input;
+
+  if (!gst_video_format_parse_caps (caps, &f, &w, &h))
+    goto invalid_input;
+
+  if (f != format || w != width || h != height)
+    return comp->threshold + 1;
+
+  comps = gst_video_format_is_gray (format) ? 1 : 3;
+  if (gst_video_format_has_alpha (format))
+    comps += 1;
+
+  /* note that some are reported both yuv and gray */
+  for (i = 0; i < comps; ++i)
+    c[i] = 1.0;
+  /* increase luma weight if yuv */
+  if (gst_video_format_is_yuv (format) && (comps > 1))
+    c[0] = comps - 1;
+  for (i = 0; i < comps; ++i)
+    c[i] /= (gst_video_format_is_yuv (format) && (comps > 1)) ?
+        2 * (comps - 1) : comps;
+
+  data1 = GST_BUFFER_DATA (buf1);
+  data2 = GST_BUFFER_DATA (buf2);
+  for (i = 0; i < comps; i++) {
+    gint offset, cw, ch, step, stride;
+
+    /* only support most common formats */
+    if (gst_video_format_get_component_depth (format, i) != 8)
+      goto unsupported_input;
+    offset = gst_video_format_get_component_offset (format, i, width, height);
+    cw = gst_video_format_get_component_width (format, i, width);
+    ch = gst_video_format_get_component_height (format, i, height);
+    step = gst_video_format_get_pixel_stride (format, i);
+    stride = gst_video_format_get_row_stride (format, i, width);
+
+    GST_LOG_OBJECT (comp, "component %d", i);
+    cssim[i] = gst_compare_ssim_component (comp, data1 + offset, data2 + offset,
+        cw, ch, step, stride);
+    GST_LOG_OBJECT (comp, "ssim[%d] = %f", i, cssim[i]);
+  }
+
+#ifndef GST_DISABLE_GST_DEBUG
+  for (i = 0; i < 4; i++) {
+    GST_DEBUG_OBJECT (comp, "ssim[%d] = %f, c[%d] = %f", i, cssim[i], i, c[i]);
+  }
+#endif
+
+  ssim = cssim[0] * c[0] + cssim[1] * c[1] + cssim[2] * c[2] + cssim[3] * c[3];
+
+  return ssim;
+
+  /* ERRORS */
+invalid_input:
+  {
+    GST_ERROR_OBJECT (comp, "ssim method needs raw video input");
+    return 0;
+  }
+unsupported_input:
+  {
+    GST_ERROR_OBJECT (comp, "raw video format not supported %" GST_PTR_FORMAT,
+        caps);
+    return 0;
+  }
+}
+
+static void
+gst_compare_buffers (GstCompare * comp, GstBuffer * buf1, GstBuffer * buf2)
+{
+  gdouble delta = 0;
+
+  /* first check metadata */
+  gst_compare_meta (comp, buf1, buf2);
+
+  /* check content according to method */
+  /* but at least size should match */
+  if (GST_BUFFER_SIZE (buf1) != GST_BUFFER_SIZE (buf2)) {
+    delta = comp->threshold + 1;
+  } else {
+    GST_MEMDUMP_OBJECT (comp, "buffer 1", GST_BUFFER_DATA (buf1),
+        GST_BUFFER_SIZE (buf1));
+    GST_MEMDUMP_OBJECT (comp, "buffer 2", GST_BUFFER_DATA (buf2),
+        GST_BUFFER_SIZE (buf2));
+    switch (comp->method) {
+      case GST_COMPARE_METHOD_MEM:
+        delta = gst_compare_mem (comp, buf1, buf2);
+        break;
+      case GST_COMPARE_METHOD_MAX:
+        delta = gst_compare_max (comp, buf1, buf2);
+        break;
+      case GST_COMPARE_METHOD_SSIM:
+        delta = gst_compare_ssim (comp, buf1, buf2);
+        break;
+      default:
+        g_assert_not_reached ();
+        break;
+    }
+  }
+
+  if ((comp->upper && delta > comp->threshold) ||
+      (!comp->upper && delta < comp->threshold)) {
+    GST_WARNING_OBJECT (comp, "buffers %p and %p failed content match %f",
+        buf1, buf2, delta);
+
+    gst_element_post_message (GST_ELEMENT (comp),
+        gst_message_new_element (GST_OBJECT (comp),
+            gst_structure_new ("delta", "content", G_TYPE_DOUBLE, delta,
+                NULL)));
+  }
+}
+
+static GstFlowReturn
+gst_compare_collect_pads (GstCollectPads * cpads, GstCompare * comp)
+{
+  GstBuffer *buf1, *buf2;
+
+  buf1 = gst_collect_pads_pop (comp->cpads,
+      gst_pad_get_element_private (comp->sinkpad));
+
+  buf2 = gst_collect_pads_pop (comp->cpads,
+      gst_pad_get_element_private (comp->checkpad));
+
+  if (!buf1 && !buf2) {
+    gst_pad_push_event (comp->srcpad, gst_event_new_eos ());
+    return GST_FLOW_UNEXPECTED;
+  } else if (buf1 && buf2) {
+    gst_compare_buffers (comp, buf1, buf2);
+  } else {
+    GST_WARNING_OBJECT (comp, "buffer %p != NULL", buf1 ? buf1 : buf2);
+
+    comp->count++;
+    gst_element_post_message (GST_ELEMENT (comp),
+        gst_message_new_element (GST_OBJECT (comp),
+            gst_structure_new ("delta", "count", G_TYPE_INT, comp->count,
+                NULL)));
+  }
+
+  if (buf1)
+    gst_pad_push (comp->srcpad, buf1);
+
+  if (buf2)
+    gst_buffer_unref (buf2);
+
+  return GST_FLOW_OK;
+}
+
+static void
+gst_compare_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstCompare *comp = GST_COMPARE (object);
+
+  switch (prop_id) {
+    case PROP_META:
+      comp->meta = g_value_get_flags (value);
+      break;
+    case PROP_OFFSET_TS:
+      comp->offset_ts = g_value_get_boolean (value);
+      break;
+    case PROP_METHOD:
+      comp->method = g_value_get_enum (value);
+      break;
+    case PROP_THRESHOLD:
+      comp->threshold = g_value_get_double (value);
+      break;
+    case PROP_UPPER:
+      comp->upper = g_value_get_boolean (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_compare_get_property (GObject * object, guint prop_id, GValue * value,
+    GParamSpec * pspec)
+{
+  GstCompare *comp = GST_COMPARE (object);
+
+  switch (prop_id) {
+    case PROP_META:
+      g_value_set_flags (value, comp->meta);
+      break;
+    case PROP_OFFSET_TS:
+      g_value_set_boolean (value, comp->offset_ts);
+      break;
+    case PROP_METHOD:
+      g_value_set_enum (value, comp->method);
+      break;
+    case PROP_THRESHOLD:
+      g_value_set_double (value, comp->threshold);
+      break;
+    case PROP_UPPER:
+      g_value_set_boolean (value, comp->upper);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static GstStateChangeReturn
+gst_compare_change_state (GstElement * element, GstStateChange transition)
+{
+  GstCompare *comp = GST_COMPARE (element);
+  GstStateChangeReturn ret;
+
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
+      gst_collect_pads_start (comp->cpads);
+      break;
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
+      gst_collect_pads_stop (comp->cpads);
+      break;
+    default:
+      break;
+  }
+
+  ret = GST_CALL_PARENT_WITH_DEFAULT (GST_ELEMENT_CLASS, change_state,
+      (element, transition), GST_STATE_CHANGE_SUCCESS);
+  if (ret != GST_STATE_CHANGE_SUCCESS)
+    return ret;
+
+  switch (transition) {
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
+      gst_compare_reset (comp);
+      break;
+    default:
+      break;
+  }
+
+  return GST_STATE_CHANGE_SUCCESS;
+}
diff --git a/gst/debugutils/gstcompare.h b/gst/debugutils/gstcompare.h
new file mode 100644
index 0000000000..bee5108e3e
--- /dev/null
+++ b/gst/debugutils/gstcompare.h
@@ -0,0 +1,75 @@
+/* GStreamer Element
+ *
+ * Copyright 2011 Collabora Ltd.
+ *  @author: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
+ * Copyright 2011 Nokia Corp.
+ *
+ * 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_COMPARE_H__
+#define __GST_COMPARE_H__
+
+
+#include <gst/gst.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_COMPARE \
+  (gst_compare_get_type())
+#define GST_COMPARE(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_COMPARE, GstCompare))
+#define GST_COMPARE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_COMPARE, GstCompareClass))
+#define GST_COMPARE_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS((obj), GST_TYPE_COMPARE, GstCompareClass))
+#define GST_IS_COMPARE(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_COMPARE))
+#define GST_IS_COMPARE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_COMPARE))
+
+typedef struct _GstCompare GstCompare;
+typedef struct _GstCompareClass GstCompareClass;
+
+struct _GstCompare {
+  GstElement element;
+
+  GstPad *srcpad;
+  GstPad *sinkpad;
+  GstPad *checkpad;
+
+  GstCollectPads *cpads;
+
+  gint count;
+
+  /* properties */
+  GstBufferCopyFlags meta;
+  gboolean offset_ts;
+  gint method;
+  gdouble threshold;
+  gboolean upper;
+};
+
+struct _GstCompareClass {
+  GstElementClass parent_class;
+};
+
+GType gst_compare_get_type(void);
+
+G_END_DECLS
+
+#endif /* __GST_COMPARE_H__ */

From af1fca6d7db1f5167679e550968a6e5d7b7628f7 Mon Sep 17 00:00:00 2001
From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Thu, 16 Jun 2011 17:17:07 +0200
Subject: [PATCH 004/158] tests: add colorspace unit test

Compares colorspace result with ffmpegcolorspace output using SSIM.
Also probes for possible crashes for odd width and height image by applying
all possible colorspace transformations.
---
 tests/check/Makefile.am            |   4 +-
 tests/check/pipelines/colorspace.c | 310 +++++++++++++++++++++++++++++
 2 files changed, 313 insertions(+), 1 deletion(-)
 create mode 100644 tests/check/pipelines/colorspace.c

diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 8b76b2a2ae..430d5ac6a6 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -138,7 +138,8 @@ endif
 VALGRIND_TO_FIX = \
 	elements/mpeg2enc \
 	elements/mplex    \
-	elements/zbar
+	elements/zbar     \
+	pipeline/colorspace
 
 # valgrind testing
 VALGRIND_TESTS_DISABLE = \
@@ -183,6 +184,7 @@ check_PROGRAMS = \
 	elements/mxfmux \
 	elements/id3mux \
 	pipelines/mxf \
+	pipelines/colorspace \
 	$(check_mimic) \
 	elements/rtpmux \
 	$(check_schro) \
diff --git a/tests/check/pipelines/colorspace.c b/tests/check/pipelines/colorspace.c
new file mode 100644
index 0000000000..3704e86e38
--- /dev/null
+++ b/tests/check/pipelines/colorspace.c
@@ -0,0 +1,310 @@
+/* GStreamer
+ *
+ * unit comparison test for colorspace
+ *
+ * Copyright 2011 Collabora Ltd.
+ *  @author: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
+ * Copyright 2011 Nokia Corp.
+ *
+ * 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 <gst/check/gstcheck.h>
+
+static GMainLoop *loop;
+
+static void
+message_cb (GstBus * bus, GstMessage * message, gpointer user_data)
+{
+  switch (GST_MESSAGE_TYPE (message)) {
+    case GST_MESSAGE_ERROR:
+    case GST_MESSAGE_WARNING:
+      g_assert_not_reached ();
+      break;
+    case GST_MESSAGE_EOS:
+      g_main_loop_quit (loop);
+      break;
+    case GST_MESSAGE_ELEMENT:
+    {
+      const GstStructure *s = gst_message_get_structure (message);
+      const gchar *name = gst_structure_get_name (s);
+
+      fail_unless (strcmp (name, "delta") == 0);
+      break;
+    }
+    default:
+      break;
+  }
+}
+
+/* compare output with ffmpegcolorspace */
+static void
+colorspace_compare (gint width, gint height, gboolean comp)
+{
+  GstBus *bus;
+  GstElement *pipeline, *src, *filter1, *filter2, *csp, *fcsp, *fakesink;
+  GstElement *queue1, *queue2, *tee, *compare;
+  GstCaps *caps, *tcaps, *rcaps, *fcaps;
+  const GstCaps *ccaps;
+  GstPad *pad;
+
+  gint i, j;
+
+  /* create elements */
+  pipeline = gst_pipeline_new ("pipeline");
+  src = gst_element_factory_make ("videotestsrc", "videotestsrc");
+  fail_unless (src != NULL);
+  filter1 = gst_element_factory_make ("capsfilter", "capsfilter1");
+  fail_unless (filter1 != NULL);
+  csp = gst_element_factory_make ("colorspace", "colorspace");
+  fail_unless (csp != NULL);
+  filter2 = gst_element_factory_make ("capsfilter", "capsfilter2");
+  fail_unless (filter2 != NULL);
+
+  if (comp) {
+    fcsp = gst_element_factory_make ("ffmpegcolorspace", "ffmpegcolorspace");
+    fail_unless (fcsp != NULL);
+    tee = gst_element_factory_make ("tee", "tee");
+    fail_unless (tee != NULL);
+    queue1 = gst_element_factory_make ("queue", "queue1");
+    fail_unless (queue1 != NULL);
+    queue2 = gst_element_factory_make ("queue", "queue2");
+    fail_unless (queue2 != NULL);
+    compare = gst_element_factory_make ("compare", "compare");
+    fail_unless (compare != NULL);
+  } else {
+    fcsp = tee = queue1 = queue2 = compare = NULL;
+  }
+
+  fakesink = gst_element_factory_make ("fakesink", "fakesink");
+  fail_unless (fakesink != NULL);
+
+  /* add and link */
+  gst_bin_add_many (GST_BIN (pipeline), src, filter1, filter2, csp, fakesink,
+      tee, queue1, queue2, fcsp, compare, NULL);
+
+  fail_unless (gst_element_link (src, filter1));
+
+  if (comp) {
+    fail_unless (gst_element_link (filter1, tee));
+
+    fail_unless (gst_element_link (tee, queue1));
+    fail_unless (gst_element_link (queue1, fcsp));
+    fail_unless (gst_element_link_pads (fcsp, NULL, compare, "sink"));
+
+    fail_unless (gst_element_link (tee, queue2));
+    fail_unless (gst_element_link (queue2, csp));
+    fail_unless (gst_element_link_pads (csp, NULL, compare, "check"));
+
+    fail_unless (gst_element_link (compare, filter2));
+  } else {
+    fail_unless (gst_element_link (filter1, csp));
+    fail_unless (gst_element_link (csp, filter2));
+  }
+  fail_unless (gst_element_link (filter2, fakesink));
+
+  /* obtain possible caps combinations */
+  if (comp) {
+    pad = gst_element_get_static_pad (fcsp, "sink");
+    fail_unless (pad != NULL);
+    ccaps = gst_pad_get_pad_template_caps (pad);
+    fail_unless (ccaps != NULL);
+    fcaps = gst_caps_copy (ccaps);
+    gst_object_unref (pad);
+  } else {
+    fcaps = gst_caps_new_any ();
+  }
+
+  pad = gst_element_get_static_pad (csp, "sink");
+  fail_unless (pad != NULL);
+  ccaps = gst_pad_get_pad_template_caps (pad);
+  fail_unless (ccaps != NULL);
+  gst_object_unref (pad);
+
+  /* handle videotestsrc limitations */
+  pad = gst_element_get_static_pad (src, "src");
+  fail_unless (pad != NULL);
+  caps = (GstCaps *) gst_pad_get_pad_template_caps (pad);
+  fail_unless (caps != NULL);
+  gst_object_unref (pad);
+
+  rcaps = gst_caps_new_simple ("video/x-raw-yuv",
+      "width", G_TYPE_INT, width, "height", G_TYPE_INT, height,
+      "framerate", GST_TYPE_FRACTION, 25, 1,
+      "color-matrix", G_TYPE_STRING, "sdtv",
+      "chroma-site", G_TYPE_STRING, "mpeg2", NULL);
+  gst_caps_append (rcaps, gst_caps_new_simple ("video/x-raw-rgb",
+          "width", G_TYPE_INT, width, "height", G_TYPE_INT, height,
+          "framerate", GST_TYPE_FRACTION, 25, 1,
+          "depth", G_TYPE_INT, 32, NULL));
+
+  /* FIXME also allow x-raw-gray if/when colorspace actually handles those */
+
+  /* limit to supported compare types */
+  if (comp) {
+    gst_caps_append (rcaps, gst_caps_new_simple ("video/x-raw-rgb",
+            "width", G_TYPE_INT, width, "height", G_TYPE_INT, height,
+            "framerate", GST_TYPE_FRACTION, 25, 1,
+            "depth", G_TYPE_INT, 24, NULL));
+  }
+
+  tcaps = gst_caps_intersect (fcaps, ccaps);
+  gst_caps_unref (fcaps);
+  caps = gst_caps_intersect (tcaps, caps);
+  gst_caps_unref (tcaps);
+  tcaps = caps;
+  caps = gst_caps_intersect (tcaps, rcaps);
+  gst_caps_unref (tcaps);
+  gst_caps_unref (rcaps);
+
+  /* normalize to finally have a list of acceptable fixed formats */
+  gst_caps_do_simplify (caps);
+  tcaps = caps;
+  caps = gst_caps_normalize (tcaps);
+  gst_caps_unref (tcaps);
+
+  /* set up for running stuff */
+  loop = g_main_loop_new (NULL, FALSE);
+  bus = gst_element_get_bus (pipeline);
+  gst_bus_add_signal_watch (bus);
+  g_signal_connect (bus, "message::eos", (GCallback) message_cb, NULL);
+  gst_object_unref (bus);
+
+  g_object_set (src, "num-buffers", 5, NULL);
+  if (comp) {
+    /* set lower bound for ssim comparison, and allow slightly different caps */
+    g_object_set (compare, "method", 2, NULL);
+    g_object_set (compare, "meta", 3, NULL);
+    g_object_set (compare, "threshold", 0.90, NULL);
+    g_object_set (compare, "upper", FALSE, NULL);
+  }
+
+  GST_INFO ("possible caps to check %d", gst_caps_get_size (caps));
+
+  /* loop over all input and output combinations */
+  for (i = 0; i < gst_caps_get_size (caps); i++) {
+    for (j = 0; j < gst_caps_get_size (caps); j++) {
+      GstCaps *in_caps, *out_caps;
+      GstStructure *s;
+      guint32 fourcc;
+
+      in_caps = gst_caps_copy_nth (caps, i);
+      out_caps = gst_caps_copy_nth (caps, j);
+
+      /* FIXME remove if videotestsrc and video format handle these properly */
+      s = gst_caps_get_structure (in_caps, 0);
+      if (gst_structure_get_fourcc (s, "format", &fourcc)) {
+        if (fourcc == GST_MAKE_FOURCC ('Y', 'U', 'V', '9') ||
+            fourcc == GST_MAKE_FOURCC ('Y', 'V', 'U', '9') ||
+            fourcc == GST_MAKE_FOURCC ('v', '2', '1', '6')) {
+          gst_caps_unref (in_caps);
+          gst_caps_unref (out_caps);
+          continue;
+        }
+      }
+
+      GST_INFO ("checking conversion from %" GST_PTR_FORMAT " (%d)"
+          " to %" GST_PTR_FORMAT " (%d)", in_caps, i, out_caps, j);
+
+      g_object_set (filter1, "caps", in_caps, NULL);
+      g_object_set (filter2, "caps", out_caps, NULL);
+
+      fail_unless (gst_element_set_state (pipeline, GST_STATE_PLAYING)
+          != GST_STATE_CHANGE_FAILURE);
+
+      g_main_loop_run (loop);
+
+      fail_unless (gst_element_set_state (pipeline, GST_STATE_NULL)
+          == GST_STATE_CHANGE_SUCCESS);
+
+      gst_caps_unref (in_caps);
+      gst_caps_unref (out_caps);
+    }
+  }
+
+  gst_caps_unref (caps);
+  gst_object_unref (pipeline);
+  g_main_loop_unref (loop);
+}
+
+#define WIDTH  176
+#define HEIGHT 120
+
+GST_START_TEST (test_colorspace_compare)
+{
+  colorspace_compare (WIDTH, HEIGHT, TRUE);
+}
+
+GST_END_TEST;
+
+/* enable if you like stuff (ffmpegcolorspace) crashing */
+#ifdef TEST_ODD
+
+GST_START_TEST (test_colorspace_compare_odd_height)
+{
+  colorspace_compare (WIDTH, HEIGHT + 1, TRUE);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_colorspace_compare_odd_width)
+{
+  colorspace_compare (WIDTH + 1, HEIGHT, TRUE);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_colorspace_compare_odd)
+{
+  colorspace_compare (WIDTH + 1, HEIGHT + 1, TRUE);
+}
+
+GST_END_TEST;
+
+#endif
+
+/* useful for crash and valgrind check */
+
+GST_START_TEST (test_colorspace)
+{
+  colorspace_compare (WIDTH + 1, HEIGHT + 1, FALSE);
+}
+
+GST_END_TEST;
+
+static Suite *
+colorspace_suite (void)
+{
+  Suite *s = suite_create ("colorspace");
+  TCase *tc_chain;
+
+  tc_chain = tcase_create ("colorspace_compare");
+  tcase_add_test (tc_chain, test_colorspace_compare);
+#ifdef TEST_ODD
+  tcase_add_test (tc_chain, test_colorspace_compare_odd_height);
+  tcase_add_test (tc_chain, test_colorspace_compare_odd_width);
+  tcase_add_test (tc_chain, test_colorspace_compare_odd);
+#endif
+  tcase_add_test (tc_chain, test_colorspace);
+  suite_add_tcase (s, tc_chain);
+
+  /* test may take some time */
+  tcase_set_timeout (tc_chain, 600);
+
+  return s;
+}
+
+GST_CHECK_MAIN (colorspace)

From 38bf3169ff0813d2efdf35333caa446441183917 Mon Sep 17 00:00:00 2001
From: Jan Schmidt <thaytan@noraisin.net>
Date: Sat, 18 Jun 2011 01:09:51 +1000
Subject: [PATCH 005/158] RTMP: add rtmpsink element for output to an RTMP
 server

---
 .../plugins/gst-plugins-bad-plugins-docs.sgml |   5 +-
 .../gst-plugins-bad-plugins-sections.txt      |  28 ++
 .../{plugin-rtmpsrc.xml => plugin-rtmp.xml}   |  19 +-
 ext/rtmp/Makefile.am                          |   4 +-
 ext/rtmp/gstrtmp.c                            |  54 +++
 ext/rtmp/gstrtmpsink.c                        | 347 ++++++++++++++++++
 ext/rtmp/gstrtmpsink.h                        |  68 ++++
 ext/rtmp/gstrtmpsrc.c                         |  17 +-
 8 files changed, 522 insertions(+), 20 deletions(-)
 rename docs/plugins/inspect/{plugin-rtmpsrc.xml => plugin-rtmp.xml} (59%)
 create mode 100644 ext/rtmp/gstrtmp.c
 create mode 100644 ext/rtmp/gstrtmpsink.c
 create mode 100644 ext/rtmp/gstrtmpsink.h

diff --git a/docs/plugins/gst-plugins-bad-plugins-docs.sgml b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
index 17acb5739b..db13207c38 100644
--- a/docs/plugins/gst-plugins-bad-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
@@ -89,7 +89,9 @@
     <xi:include href="xml/element-pyramidsegment.xml" />
     <xi:include href="xml/element-rsvgdec.xml" />
     <xi:include href="xml/element-rsvgoverlay.xml" />
-    <xi:include href="xml/element-rtpdtmfdepay.xml" />
+    <xi:include href="xml/element-rtmpsink.xml" />
+    <xi:include href="xml/element-rtmpsrc.xml" />
+    <xi:include href="xml/element-rtpmux.xml" />
     <xi:include href="xml/element-rtpdtmfsrc.xml" />
     <xi:include href="xml/element-rtpdtmfmux.xml" />
     <xi:include href="xml/element-rtpmux.xml" />
@@ -196,6 +198,7 @@
     <xi:include href="xml/plugin-real.xml" />
     <xi:include href="xml/plugin-rfbsrc.xml" />
     <xi:include href="xml/plugin-rsvg.xml" />
+    <xi:include href="xml/plugin-rtmp.xml" />
     <xi:include href="xml/plugin-rtpmux.xml" />
     <xi:include href="xml/plugin-scaletempo.xml" />
     <xi:include href="xml/plugin-sdl.xml" />
diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt
index 5efe2c1166..4a04d6a0cd 100644
--- a/docs/plugins/gst-plugins-bad-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-bad-plugins-sections.txt
@@ -1160,6 +1160,34 @@ GST_TYPE_RSVG_DEC
 gst_rsvg_dec_get_type
 </SECTION>
 
+<SECTION>
+<FILE>element-rtmpsink</FILE>
+<TITLE>rtmpsink</TITLE>
+GstRTMPSink
+<SUBSECTION Standard>
+GstRTMPSinkClass
+GST_RTMP_SINK
+GST_IS_RTMP_SINK
+GST_TYPE_RTMP_SINK
+gst_rtmp_sink_get_type
+GST_RTMP_SINK_CLASS
+GST_IS_RTMP_SINK_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>element-rtmpsrc</FILE>
+<TITLE>rtmpsrc</TITLE>
+GstRTMPSrc
+<SUBSECTION Standard>
+GstRTMPSrcClass
+GST_RTMP_SRC
+GST_IS_RTMP_SRC
+GST_TYPE_RTMP_SRC
+gst_rtmp_src_get_type
+GST_RTMP_SRC_CLASS
+GST_IS_RTMP_SRC_CLASS
+</SECTION>
+
 <SECTION>
 <FILE>element-rtpdtmfdepay</FILE>
 <TITLE>rtpdtmfdepay</TITLE>
diff --git a/docs/plugins/inspect/plugin-rtmpsrc.xml b/docs/plugins/inspect/plugin-rtmp.xml
similarity index 59%
rename from docs/plugins/inspect/plugin-rtmpsrc.xml
rename to docs/plugins/inspect/plugin-rtmp.xml
index c85740938f..7d9ae4fdc9 100644
--- a/docs/plugins/inspect/plugin-rtmpsrc.xml
+++ b/docs/plugins/inspect/plugin-rtmp.xml
@@ -1,6 +1,6 @@
 <plugin>
-  <name>rtmpsrc</name>
-  <description>RTMP source</description>
+  <name>rtmp</name>
+  <description>RTMP source and sink</description>
   <filename>../../ext/rtmp/.libs/libgstrtmp.so</filename>
   <basename>libgstrtmp.so</basename>
   <version>0.10.22.1</version>
@@ -9,6 +9,21 @@
   <package>GStreamer Bad Plug-ins git</package>
   <origin>Unknown package origin</origin>
   <elements>
+    <element>
+      <name>rtmpsink</name>
+      <longname>RTMP output sink</longname>
+      <class>Sink/Network</class>
+      <description>Sends FLV content to a server via RTMP</description>
+      <author>Jan Schmidt &lt;thaytan@noraisin.net&gt;</author>
+      <pads>
+        <caps>
+          <name>sink</name>
+          <direction>sink</direction>
+          <presence>always</presence>
+          <details>video/x-flv</details>
+        </caps>
+      </pads>
+    </element>
     <element>
       <name>rtmpsrc</name>
       <longname>RTMP Source</longname>
diff --git a/ext/rtmp/Makefile.am b/ext/rtmp/Makefile.am
index e97c7a7589..bd2398cab0 100644
--- a/ext/rtmp/Makefile.am
+++ b/ext/rtmp/Makefile.am
@@ -1,8 +1,8 @@
 plugin_LTLIBRARIES = libgstrtmp.la
 
-libgstrtmp_la_SOURCES = gstrtmpsrc.c
+libgstrtmp_la_SOURCES = gstrtmpsrc.c gstrtmpsink.c gstrtmp.c
 
-noinst_HEADERS = gstrtmpsrc.h
+noinst_HEADERS = gstrtmpsrc.h gstrtmpsink.h
 libgstrtmp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(RTMP_CFLAGS)
 libgstrtmp_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(RTMP_LIBS)
 libgstrtmp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
diff --git a/ext/rtmp/gstrtmp.c b/ext/rtmp/gstrtmp.c
new file mode 100644
index 0000000000..7acbea4a90
--- /dev/null
+++ b/ext/rtmp/gstrtmp.c
@@ -0,0 +1,54 @@
+/* GStreamer
+ * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
+ *                    2000 Wim Taymans <wtay@chello.be>
+ *                    2002 Kristian Rietveld <kris@gtk.org>
+ *                    2002,2003 Colin Walters <walters@gnu.org>
+ *                    2001,2010 Bastien Nocera <hadess@hadess.net>
+ *                    2010 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+ *                    2010 Jan Schmidt <thaytan@noraisin.net>
+ *
+ * rtmpsrc.c:
+ *
+ * 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.h>
+
+#include "gstrtmpsrc.h"
+#include "gstrtmpsink.h"
+
+static gboolean
+plugin_init (GstPlugin * plugin)
+{
+  gboolean ret;
+
+  ret = gst_element_register (plugin, "rtmpsrc", GST_RANK_PRIMARY,
+      GST_TYPE_RTMP_SRC);
+  ret &= gst_element_register (plugin, "rtmpsink", GST_RANK_PRIMARY,
+      GST_TYPE_RTMP_SINK);
+
+  return ret;
+}
+
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+    GST_VERSION_MINOR,
+    "rtmp",
+    "RTMP source and sink",
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
diff --git a/ext/rtmp/gstrtmpsink.c b/ext/rtmp/gstrtmpsink.c
new file mode 100644
index 0000000000..e3933b1503
--- /dev/null
+++ b/ext/rtmp/gstrtmpsink.c
@@ -0,0 +1,347 @@
+/*
+ * GStreamer
+ * Copyright (C) 2010 Jan Schmidt <thaytan@noraisin.net>
+ *
+ * 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-rtmpsink
+ *
+ * This element delivers data to a streaming server via RTMP. It uses
+ * librtmp, and supports any protocols/urls that librtmp supports.
+ * The URL/location can contain extra connection or session parameters
+ * for librtmp, such as 'flashver=version'. See the librtmp documentation
+ * for more detail
+ *
+ * <refsect2>
+ * <title>Example launch line</title>
+ * |[
+ * gst-launch -v videotestsrc ! ffenc_flv ! flvmux ! rtmpsink location='rtmp://localhost/path/to/stream live=1'
+ * ]| Encode a test video stream to FLV video format and stream it via RTMP.
+ * </refsect2>
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/gst.h>
+
+#include "gstrtmpsink.h"
+
+GST_DEBUG_CATEGORY_STATIC (gst_rtmp_sink_debug);
+#define GST_CAT_DEFAULT gst_rtmp_sink_debug
+
+/* Filter signals and args */
+enum
+{
+  /* FILL ME */
+  LAST_SIGNAL
+};
+
+enum
+{
+  PROP_0,
+  PROP_LOCATION
+};
+
+static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("video/x-flv")
+    );
+
+static void gst_rtmp_sink_uri_handler_init (gpointer g_iface,
+    gpointer iface_data);
+static void gst_rtmp_sink_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
+static void gst_rtmp_sink_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+static gboolean gst_rtmp_sink_stop (GstBaseSink * sink);
+static gboolean gst_rtmp_sink_start (GstBaseSink * sink);
+static GstFlowReturn gst_rtmp_sink_render (GstBaseSink * sink, GstBuffer * buf);
+
+static void
+_do_init (GType gtype)
+{
+  static const GInterfaceInfo urihandler_info = {
+    gst_rtmp_sink_uri_handler_init,
+    NULL,
+    NULL
+  };
+
+  g_type_add_interface_static (gtype, GST_TYPE_URI_HANDLER, &urihandler_info);
+
+  GST_DEBUG_CATEGORY_INIT (gst_rtmp_sink_debug, "rtmpsink", 0,
+      "RTMP server element");
+}
+
+GST_BOILERPLATE_FULL (GstRTMPSink, gst_rtmp_sink, GstBaseSink,
+    GST_TYPE_BASE_SINK, _do_init);
+
+
+static void
+gst_rtmp_sink_base_init (gpointer klass)
+{
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+
+  gst_element_class_set_details_simple (element_class,
+      "RTMP output sink",
+      "Sink/Network", "Sends FLV content to a server via RTMP",
+      "Jan Schmidt <thaytan@noraisin.net>");
+
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&sink_template));
+}
+
+/* initialize the plugin's class */
+static void
+gst_rtmp_sink_class_init (GstRTMPSinkClass * klass)
+{
+  GObjectClass *gobject_class;
+  GstBaseSinkClass *gstbasesink_class = (GstBaseSinkClass *) klass;
+
+  gobject_class = (GObjectClass *) klass;
+  gobject_class->set_property = gst_rtmp_sink_set_property;
+  gobject_class->get_property = gst_rtmp_sink_get_property;
+
+  gstbasesink_class->start = GST_DEBUG_FUNCPTR (gst_rtmp_sink_start);
+  gstbasesink_class->stop = GST_DEBUG_FUNCPTR (gst_rtmp_sink_stop);
+  gstbasesink_class->render = GST_DEBUG_FUNCPTR (gst_rtmp_sink_render);
+
+  gst_element_class_install_std_props (GST_ELEMENT_CLASS (klass),
+      "location", PROP_LOCATION, G_PARAM_READWRITE, NULL);
+}
+
+/* initialize the new element
+ * initialize instance structure
+ */
+static void
+gst_rtmp_sink_init (GstRTMPSink * sink, GstRTMPSinkClass * klass)
+{
+}
+
+static gboolean
+gst_rtmp_sink_start (GstBaseSink * basesink)
+{
+  GstRTMPSink *sink = GST_RTMP_SINK (basesink);
+
+  if (!sink->uri) {
+    GST_ELEMENT_ERROR (sink, RESOURCE, OPEN_WRITE,
+        ("Please set URI for RTMP output"), ("No URI set before starting"));
+    return FALSE;
+  }
+
+  sink->rtmp_uri = g_strdup (sink->uri);
+  sink->rtmp = RTMP_Alloc ();
+  RTMP_Init (sink->rtmp);
+  if (!RTMP_SetupURL (sink->rtmp, sink->rtmp_uri)) {
+    GST_ELEMENT_ERROR (sink, RESOURCE, OPEN_WRITE, (NULL),
+        ("Failed to setup URL '%s'", sink->uri));
+    RTMP_Free (sink->rtmp);
+    sink->rtmp = NULL;
+    g_free (sink->rtmp_uri);
+    sink->rtmp_uri = NULL;
+    return FALSE;
+  }
+
+  GST_DEBUG_OBJECT (sink, "Created RTMP object");
+
+  /* Mark this as an output connection */
+  RTMP_EnableWrite (sink->rtmp);
+
+  /* open the connection */
+  if (!RTMP_IsConnected (sink->rtmp)) {
+    if (!RTMP_Connect (sink->rtmp, NULL) || !RTMP_ConnectStream (sink->rtmp, 0)) {
+      GST_ELEMENT_ERROR (sink, RESOURCE, OPEN_WRITE, (NULL),
+          ("Could not connect to RTMP stream \"%s\" for writing", sink->uri));
+      RTMP_Free (sink->rtmp);
+      sink->rtmp = NULL;
+      g_free (sink->rtmp_uri);
+      sink->rtmp_uri = NULL;
+      return FALSE;
+    }
+    GST_DEBUG_OBJECT (sink, "Opened connection to %s", sink->rtmp_uri);
+  }
+
+  sink->first = TRUE;
+
+  return TRUE;
+}
+
+static gboolean
+gst_rtmp_sink_stop (GstBaseSink * basesink)
+{
+  GstRTMPSink *sink = GST_RTMP_SINK (basesink);
+
+  gst_buffer_replace (&sink->cache, NULL);
+
+  if (sink->rtmp) {
+    RTMP_Close (sink->rtmp);
+    RTMP_Free (sink->rtmp);
+    sink->rtmp = NULL;
+  }
+  if (sink->rtmp_uri) {
+    g_free (sink->rtmp_uri);
+    sink->rtmp_uri = NULL;
+  }
+
+  return TRUE;
+}
+
+static GstFlowReturn
+gst_rtmp_sink_render (GstBaseSink * bsink, GstBuffer * buf)
+{
+  GstRTMPSink *sink = GST_RTMP_SINK (bsink);
+  GstBuffer *reffed_buf = NULL;
+
+  if (sink->first) {
+    /* FIXME: Parse the first buffer and see if it contains a header plus a packet instead
+     * of just assuming it's only the header */
+    GST_LOG_OBJECT (sink, "Caching first buffer of size %d for concatenation",
+        GST_BUFFER_SIZE (buf));
+    gst_buffer_replace (&sink->cache, buf);
+    sink->first = FALSE;
+    return GST_FLOW_OK;
+  }
+
+  if (sink->cache) {
+    GST_LOG_OBJECT (sink, "Joining 2nd buffer of size %d to cached buf",
+        GST_BUFFER_SIZE (buf));
+    gst_buffer_ref (buf);
+    reffed_buf = buf = gst_buffer_join (sink->cache, buf);
+    sink->cache = NULL;
+  }
+
+  GST_LOG_OBJECT (sink, "Sending %d bytes to RTMP server",
+      GST_BUFFER_SIZE (buf));
+
+  if (!RTMP_Write (sink->rtmp,
+          (char *) GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf))) {
+    GST_ELEMENT_ERROR (sink, RESOURCE, WRITE, (NULL), ("Failed to write data"));
+    if (reffed_buf)
+      gst_buffer_unref (reffed_buf);
+    return GST_FLOW_ERROR;
+  }
+
+  if (reffed_buf)
+    gst_buffer_unref (reffed_buf);
+
+  return GST_FLOW_OK;
+}
+
+/*
+ * URI interface support.
+ */
+static GstURIType
+gst_rtmp_sink_uri_get_type (void)
+{
+  return GST_URI_SINK;
+}
+
+static gchar **
+gst_rtmp_sink_uri_get_protocols (void)
+{
+  static gchar *protocols[] =
+      { (char *) "rtmp", (char *) "rtmpt", (char *) "rtmps", (char *) "rtmpe",
+    (char *) "rtmfp", (char *) "rtmpte", (char *) "rtmpts", NULL
+  };
+  return protocols;
+}
+
+static const gchar *
+gst_rtmp_sink_uri_get_uri (GstURIHandler * handler)
+{
+  GstRTMPSink *sink = GST_RTMP_SINK (handler);
+
+  return sink->uri;
+}
+
+static gboolean
+gst_rtmp_sink_uri_set_uri (GstURIHandler * handler, const gchar * uri)
+{
+  GstRTMPSink *sink = GST_RTMP_SINK (handler);
+
+  if (GST_STATE (sink) >= GST_STATE_PAUSED)
+    return FALSE;
+
+  g_free (sink->uri);
+  sink->uri = NULL;
+
+  if (uri != NULL) {
+    int protocol;
+    AVal host;
+    unsigned int port;
+    AVal playpath, app;
+
+    if (!RTMP_ParseURL (uri, &protocol, &host, &port, &playpath, &app) ||
+        !host.av_len || !playpath.av_len) {
+      GST_ELEMENT_ERROR (sink, RESOURCE, OPEN_WRITE,
+          ("Failed to parse URI %s", uri), (NULL));
+      return FALSE;
+    }
+    sink->uri = g_strdup (uri);
+  }
+
+  GST_DEBUG_OBJECT (sink, "Changed URI to %s", GST_STR_NULL (uri));
+
+  return TRUE;
+}
+
+static void
+gst_rtmp_sink_uri_handler_init (gpointer g_iface, gpointer iface_data)
+{
+  GstURIHandlerInterface *iface = (GstURIHandlerInterface *) g_iface;
+
+  iface->get_type = gst_rtmp_sink_uri_get_type;
+  iface->get_protocols = gst_rtmp_sink_uri_get_protocols;
+  iface->get_uri = gst_rtmp_sink_uri_get_uri;
+  iface->set_uri = gst_rtmp_sink_uri_set_uri;
+}
+
+static void
+gst_rtmp_sink_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstRTMPSink *sink = GST_RTMP_SINK (object);
+
+  switch (prop_id) {
+    case PROP_LOCATION:
+      gst_rtmp_sink_uri_set_uri (GST_URI_HANDLER (sink),
+          g_value_get_string (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_rtmp_sink_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstRTMPSink *sink = GST_RTMP_SINK (object);
+
+  switch (prop_id) {
+    case PROP_LOCATION:
+      g_value_set_string (value, sink->uri);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
diff --git a/ext/rtmp/gstrtmpsink.h b/ext/rtmp/gstrtmpsink.h
new file mode 100644
index 0000000000..cb9315ebb2
--- /dev/null
+++ b/ext/rtmp/gstrtmpsink.h
@@ -0,0 +1,68 @@
+/* 
+ * GStreamer
+ * Copyright (C) 2010 Jan Schmidt <thaytan@noraisin.net>
+ *
+ * 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_RTMP_SINK_H__
+#define __GST_RTMP_SINK_H__
+
+#include <gst/gst.h>
+#include <gst/base/gstbasesink.h>
+
+#include <librtmp/rtmp.h>
+#include <librtmp/log.h>
+#include <librtmp/amf.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_RTMP_SINK \
+  (gst_rtmp_sink_get_type())
+#define GST_RTMP_SINK(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTMP_SINK,GstRTMPSink))
+#define GST_RTMP_SINK_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTMP_SINK,GstRTMPSinkClass))
+#define GST_IS_RTMP_SINK(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTMP_SINK))
+#define GST_IS_RTMP_SINK_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTMP_SINK))
+
+typedef struct _GstRTMPSink      GstRTMPSink;
+typedef struct _GstRTMPSinkClass GstRTMPSinkClass;
+
+struct _GstRTMPSink {
+  GstBaseSink parent;
+
+  /* < private > */
+  gchar *uri;
+
+  RTMP *rtmp;
+  gchar *rtmp_uri; /* copy of url for librtmp */
+
+  GstBuffer *cache; /* Cached buffer */
+  gboolean first;
+};
+
+struct _GstRTMPSinkClass {
+  GstBaseSinkClass parent_class;
+};
+
+GType gst_rtmp_sink_get_type (void);
+
+G_END_DECLS
+
+#endif /* __GST_RTMP_SINK_H__ */
diff --git a/ext/rtmp/gstrtmpsrc.c b/ext/rtmp/gstrtmpsrc.c
index 2376ccef14..e37ac06b73 100644
--- a/ext/rtmp/gstrtmpsrc.c
+++ b/ext/rtmp/gstrtmpsrc.c
@@ -98,6 +98,8 @@ _do_init (GType gtype)
   };
 
   g_type_add_interface_static (gtype, GST_TYPE_URI_HANDLER, &urihandler_info);
+
+  GST_DEBUG_CATEGORY_INIT (rtmpsrc_debug, "rtmpsrc", 0, "RTMP Source");
 }
 
 GST_BOILERPLATE_FULL (GstRTMPSrc, gst_rtmp_src, GstPushSrc, GST_TYPE_PUSH_SRC,
@@ -581,18 +583,3 @@ gst_rtmp_src_stop (GstBaseSrc * basesrc)
 
   return TRUE;
 }
-
-static gboolean
-plugin_init (GstPlugin * plugin)
-{
-  GST_DEBUG_CATEGORY_INIT (rtmpsrc_debug, "rtmpsrc", 0, "RTMP Source");
-
-  return gst_element_register (plugin, "rtmpsrc", GST_RANK_PRIMARY,
-      GST_TYPE_RTMP_SRC);
-}
-
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
-    GST_VERSION_MINOR,
-    "rtmpsrc",
-    "RTMP source",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);

From d04efbd735533fe543e299db1cc730ed799c31eb Mon Sep 17 00:00:00 2001
From: Jan Schmidt <thaytan@noraisin.net>
Date: Sat, 18 Jun 2011 01:11:05 +1000
Subject: [PATCH 006/158] update docs generated files

---
 docs/plugins/gst-plugins-bad-plugins.args     | 166 +++++-
 .../plugins/gst-plugins-bad-plugins.hierarchy | 500 +-----------------
 .../gst-plugins-bad-plugins.interfaces        |   1 +
 3 files changed, 164 insertions(+), 503 deletions(-)

diff --git a/docs/plugins/gst-plugins-bad-plugins.args b/docs/plugins/gst-plugins-bad-plugins.args
index f0778aac54..73ea435301 100644
--- a/docs/plugins/gst-plugins-bad-plugins.args
+++ b/docs/plugins/gst-plugins-bad-plugins.args
@@ -1701,7 +1701,7 @@
 <ARG>
 <NAME>GstDvbSrc::diseqc-source</NAME>
 <TYPE>gint</TYPE>
-<RANGE>[-1,7]</RANGE>
+<RANGE>[G_MAXULONG,7]</RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>diseqc source</NICK>
 <BLURB>DISEqC selected source (-1 disabled) (DVB-S).</BLURB>
@@ -17155,7 +17155,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>Path where to search for RealPlayer codecs</NICK>
 <BLURB>Path where to search for RealPlayer codecs.</BLURB>
-<DEFAULT>"/usr/lib/win32:/usr/lib/codecs:/usr/local/RealPlayer/codecs:/usr/local/lib/win32:/usr/local/lib/codecs"</DEFAULT>
+<DEFAULT>"/usr/lib64/win32:/usr/lib64/codecs:/usr/local/lib64/win32:/usr/local/lib64/codecs"</DEFAULT>
 </ARG>
 
 <ARG>
@@ -17195,7 +17195,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>Path where to search for RealPlayer codecs</NICK>
 <BLURB>Path where to search for RealPlayer codecs.</BLURB>
-<DEFAULT>"/usr/lib/win32:/usr/lib/codecs:/usr/local/RealPlayer/codecs:/usr/local/lib/win32:/usr/local/lib/codecs"</DEFAULT>
+<DEFAULT>"/usr/lib64/win32:/usr/lib64/codecs:/usr/local/lib64/win32:/usr/local/lib64/codecs"</DEFAULT>
 </ARG>
 
 <ARG>
@@ -17851,7 +17851,7 @@
 <ARG>
 <NAME>DvbBaseBin::diseqc-source</NAME>
 <TYPE>gint</TYPE>
-<RANGE>[-1,7]</RANGE>
+<RANGE>[G_MAXULONG,7]</RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>diseqc source</NICK>
 <BLURB>DISEqC selected source (-1 disabled) (DVB-S).</BLURB>
@@ -22026,7 +22026,7 @@
 <ARG>
 <NAME>GstDCCPClientSrc::sockfd</NAME>
 <TYPE>gint</TYPE>
-<RANGE>>= -1</RANGE>
+<RANGE>>= G_MAXULONG</RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>Socket fd</NICK>
 <BLURB>The socket file descriptor.</BLURB>
@@ -22066,7 +22066,7 @@
 <ARG>
 <NAME>GstDCCPServerSink::sockfd</NAME>
 <TYPE>gint</TYPE>
-<RANGE>>= -1</RANGE>
+<RANGE>>= G_MAXULONG</RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>Socket fd</NICK>
 <BLURB>The client socket file descriptor.</BLURB>
@@ -22126,7 +22126,7 @@
 <ARG>
 <NAME>GstDCCPClientSink::sockfd</NAME>
 <TYPE>gint</TYPE>
-<RANGE>>= -1</RANGE>
+<RANGE>>= G_MAXULONG</RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>Socket fd</NICK>
 <BLURB>The socket file descriptor.</BLURB>
@@ -22186,7 +22186,7 @@
 <ARG>
 <NAME>GstDCCPServerSrc::sockfd</NAME>
 <TYPE>gint</TYPE>
-<RANGE>>= -1</RANGE>
+<RANGE>>= G_MAXULONG</RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>Socket fd</NICK>
 <BLURB>The client socket file descriptor.</BLURB>
@@ -22246,7 +22246,7 @@
 <ARG>
 <NAME>GstMpegTSDemux::program-number</NAME>
 <TYPE>gint</TYPE>
-<RANGE>>= -1</RANGE>
+<RANGE>>= G_MAXULONG</RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>Program Number</NICK>
 <BLURB>Program number to demux for (-1 to ignore).</BLURB>
@@ -22306,7 +22306,7 @@
 <ARG>
 <NAME>GstPcapParse::dst-port</NAME>
 <TYPE>gint</TYPE>
-<RANGE>[-1,65535]</RANGE>
+<RANGE>[G_MAXULONG,65535]</RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>Destination port</NICK>
 <BLURB>Destination port to restrict to.</BLURB>
@@ -22326,7 +22326,7 @@
 <ARG>
 <NAME>GstPcapParse::src-port</NAME>
 <TYPE>gint</TYPE>
-<RANGE>[-1,65535]</RANGE>
+<RANGE>[G_MAXULONG,65535]</RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>Source port</NICK>
 <BLURB>Source port to restrict to.</BLURB>
@@ -23356,7 +23356,7 @@
 <ARG>
 <NAME>GstRTPDTMFSrc::seqnum-offset</NAME>
 <TYPE>gint</TYPE>
-<RANGE>>= -1</RANGE>
+<RANGE>>= G_MAXULONG</RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>Sequence number Offset</NICK>
 <BLURB>Offset to add to all outgoing seqnum (-1 = random).</BLURB>
@@ -23386,7 +23386,7 @@
 <ARG>
 <NAME>GstRTPDTMFSrc::timestamp-offset</NAME>
 <TYPE>gint</TYPE>
-<RANGE>>= -1</RANGE>
+<RANGE>>= G_MAXULONG</RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>Timestamp Offset</NICK>
 <BLURB>Offset to add to all outgoing timestamps (-1 = random).</BLURB>
@@ -23436,7 +23436,7 @@
 <ARG>
 <NAME>GstRTPMux::seqnum-offset</NAME>
 <TYPE>gint</TYPE>
-<RANGE>>= -1</RANGE>
+<RANGE>>= G_MAXULONG</RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>Sequence number Offset</NICK>
 <BLURB>Offset to add to all outgoing seqnum (-1 = random).</BLURB>
@@ -23456,7 +23456,7 @@
 <ARG>
 <NAME>GstRTPMux::timestamp-offset</NAME>
 <TYPE>gint</TYPE>
-<RANGE>>= -1</RANGE>
+<RANGE>>= G_MAXULONG</RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>Timestamp Offset</NICK>
 <BLURB>Offset to add to all outgoing timestamps (-1 = random).</BLURB>
@@ -46096,7 +46096,7 @@
 <ARG>
 <NAME>GstVideoMaxRate::average-period</NAME>
 <TYPE>guint64</TYPE>
-<RANGE>[1,G_MAXINT64]</RANGE>
+<RANGE>[1,G_MAXLONG]</RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>Period over which to average</NICK>
 <BLURB>Period over which to average the framerate (in ns).</BLURB>
@@ -46946,7 +46946,7 @@
 <ARG>
 <NAME>GstJP2kDecimator::max-decomposition-levels</NAME>
 <TYPE>gint</TYPE>
-<RANGE>[-1,32]</RANGE>
+<RANGE>[G_MAXULONG,32]</RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>Maximum Number of Decomposition Levels</NICK>
 <BLURB>Maximum number of decomposition levels to keep (-1 == all).</BLURB>
@@ -47336,7 +47336,7 @@
 <ARG>
 <NAME>GstTSDemux::program-number</NAME>
 <TYPE>gint</TYPE>
-<RANGE>>= -1</RANGE>
+<RANGE>>= G_MAXULONG</RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>Program number</NICK>
 <BLURB>Program Number to demux for (-1 to ignore).</BLURB>
@@ -57493,3 +57493,133 @@
 <DEFAULT>FALSE</DEFAULT>
 </ARG>
 
+<ARG>
+<NAME>GstCompare::meta</NAME>
+<TYPE>GstBufferCopyFlags</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Compare Meta</NICK>
+<BLURB>Indicates which metadata should be compared.</BLURB>
+<DEFAULT>GST_BUFFER_COPY_FLAGS|GST_BUFFER_COPY_TIMESTAMPS|GST_BUFFER_COPY_CAPS</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>GstCompare::method</NAME>
+<TYPE>GstCompareMethod</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Content Compare Method</NICK>
+<BLURB>Method to compare buffer content.</BLURB>
+<DEFAULT>Memory</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>GstCompare::offset-ts</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Offsets Timestamps</NICK>
+<BLURB>Consider OFFSET and OFFSET_END part of timestamp metadata.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>GstCompare::threshold</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE>>= 0</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Content Threshold</NICK>
+<BLURB>Threshold beyond which to consider content different as determined by content-method.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>GstCompare::upper</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Threshold Upper Bound</NICK>
+<BLURB>Whether threshold value is upper bound or lower bound for difference measure.</BLURB>
+<DEFAULT>TRUE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>GstOpenalSrc::device</NAME>
+<TYPE>gchar*</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Device</NICK>
+<BLURB>Specific capture device to open, NULL indicate default device.</BLURB>
+<DEFAULT>NULL</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>GstOpenalSrc::device-name</NAME>
+<TYPE>gchar*</TYPE>
+<RANGE></RANGE>
+<FLAGS>r</FLAGS>
+<NICK>Device name</NICK>
+<BLURB>Readable name of device.</BLURB>
+<DEFAULT>NULL</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>GstOpenALSink::context-handle</NAME>
+<TYPE>gpointer</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>ALCcontext</NICK>
+<BLURB>Custom playback context.</BLURB>
+<DEFAULT></DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>GstOpenALSink::device</NAME>
+<TYPE>gchar*</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Device</NICK>
+<BLURB>OpenAL device string.</BLURB>
+<DEFAULT>NULL</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>GstOpenALSink::device-handle</NAME>
+<TYPE>gpointer</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>ALCdevice</NICK>
+<BLURB>Custom playback device.</BLURB>
+<DEFAULT></DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>GstOpenALSink::device-name</NAME>
+<TYPE>gchar*</TYPE>
+<RANGE></RANGE>
+<FLAGS>r</FLAGS>
+<NICK>Device name</NICK>
+<BLURB>Opened OpenAL device name.</BLURB>
+<DEFAULT>""</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>GstOpenALSink::source-id</NAME>
+<TYPE>guint</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Source ID</NICK>
+<BLURB>Custom playback sID.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>GstRTMPSink::location</NAME>
+<TYPE>gchar*</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>File Location</NICK>
+<BLURB>Location of the file to read.</BLURB>
+<DEFAULT>NULL</DEFAULT>
+</ARG>
+
diff --git a/docs/plugins/gst-plugins-bad-plugins.hierarchy b/docs/plugins/gst-plugins-bad-plugins.hierarchy
index b7e35c17ca..51340bea5a 100644
--- a/docs/plugins/gst-plugins-bad-plugins.hierarchy
+++ b/docs/plugins/gst-plugins-bad-plugins.hierarchy
@@ -1,5 +1,7 @@
 GObject
   GstColorBalanceChannel
+  GstMixerTrack
+    GstMixerOptions
   GstObject
     GstBus
     GstClock
@@ -34,6 +36,8 @@ GObject
         GstBaseAudioSink
           GstAudioSink
             GstApExSink
+            GstNasSink
+            GstOpenALSink
             GstSDLAudioSink
         GstChecksumSink
         GstCurlSink
@@ -41,16 +45,22 @@ GObject
         GstDCCPServerSink
         GstFBDEVSink
         GstLinsysSdiSink
+        GstRTMPSink
         GstSFSink
         GstShmSink
         GstVideoSink
+          GstDfbVideoSink
           GstSDLVideoSink
           VdpSink
       GstBaseSrc
         GstDTMFSrc
         GstDataURISrc
+        GstFliteTestSrc
         GstLinsysSdiSrc
         GstPushSrc
+          GstBaseAudioSrc
+            GstAudioSrc
+              GstOpenalSrc
           GstDCCPClientSrc
           GstDCCPServerSrc
           GstDc1394
@@ -109,19 +119,8 @@ GObject
             GstMirror
             GstRotate
             GstSquare
-          GstOpencvVideoFilter
-            GstCvDilateErode
-              GstCvDilate
-              GstCvErode
-            GstCvEqualizeHist
-            GstCvLaplace
-            GstCvSmooth
-            GstCvSobel
-            Gstfacedetect
           GstRsvgOverlay
           GstSolarize
-          GstVideo3DConvert
-          GstVideo3DPresent
           GstVideoAnalyse
           GstVideoDetect
           GstVideoMark
@@ -142,8 +141,6 @@ GObject
         DvbBaseBin
         GstAutoConvert
         GstAutoVideoConvert
-        GstBaseCameraSrc
-          GstWrapperCameraBinSrc
         GstFPSDisplaySink
         GstFaceOverlay
         GstGSettingsSwitchSink
@@ -154,9 +151,7 @@ GObject
           GstGSettingsVideoSrc
         GstPipeline
           GstCameraBin
-          GstCameraBin2
         GstSDPDemux
-        GstViewfinderBin
         RsnDvdBin
       GstBz2dec
       GstBz2enc
@@ -165,12 +160,12 @@ GObject
       GstCeltDec
       GstCeltEnc
       GstChopMyData
+      GstCompare
       GstDVBSubOverlay
       GstDVDSpu
       GstDecklinkSink
       GstDecklinkSrc
       GstDtsDec
-      GstFaac
       GstFaad
       GstFestival
       GstFieldAnalysis
@@ -196,16 +191,16 @@ GObject
       GstMSE
       GstMXFDemux
       GstMXFMux
+      GstMimDec
+      GstMimEnc
       GstModPlug
       GstMpegPSDemux
       GstMpegTSDemux
-      GstMplex
       GstMusepackDec
       GstMveDemux
       GstMveMux
       GstNsfDec
       GstNuvDemux
-      GstOpencvTextOverlay
       GstPcapParse
       GstPitch
       GstPnmdec
@@ -225,494 +220,28 @@ GObject
         GstAudioSegmentClip
         GstVideoSegmentClip
       GstSignalProcessor
-        calf-sourceforge-net-plugins-BassEnhancer
-        calf-sourceforge-net-plugins-Compressor
-        calf-sourceforge-net-plugins-Deesser
-        calf-sourceforge-net-plugins-Equalizer12Band
-        calf-sourceforge-net-plugins-Equalizer5Band
-        calf-sourceforge-net-plugins-Equalizer8Band
-        calf-sourceforge-net-plugins-Exciter
-        calf-sourceforge-net-plugins-Filter
-        calf-sourceforge-net-plugins-Filterclavier
-        calf-sourceforge-net-plugins-Flanger
-        calf-sourceforge-net-plugins-Fluidsynth
-        calf-sourceforge-net-plugins-Gate
-        calf-sourceforge-net-plugins-Monosynth
-        calf-sourceforge-net-plugins-MultiChorus
-        calf-sourceforge-net-plugins-Multibandcompressor
-        calf-sourceforge-net-plugins-Organ
-        calf-sourceforge-net-plugins-Phaser
-        calf-sourceforge-net-plugins-Pulsator
-        calf-sourceforge-net-plugins-Reverb
-        calf-sourceforge-net-plugins-RotarySpeaker
-        calf-sourceforge-net-plugins-Saturator
-        calf-sourceforge-net-plugins-Sidechaincompressor
-        calf-sourceforge-net-plugins-Sidechaingate
-        calf-sourceforge-net-plugins-VintageDelay
-        calf-sourceforge-net-plugins-Wavetable
-        invadarecords-com-plugins-lv2-compressor-mono
-        invadarecords-com-plugins-lv2-compressor-stereo
-        invadarecords-com-plugins-lv2-delay-mono
-        invadarecords-com-plugins-lv2-delay-sum
-        invadarecords-com-plugins-lv2-erreverb-mono
-        invadarecords-com-plugins-lv2-erreverb-sum
-        invadarecords-com-plugins-lv2-filter-hpf-mono
-        invadarecords-com-plugins-lv2-filter-hpf-stereo
-        invadarecords-com-plugins-lv2-filter-lpf-mono
-        invadarecords-com-plugins-lv2-filter-lpf-stereo
-        invadarecords-com-plugins-lv2-input
-        invadarecords-com-plugins-lv2-meter
-        invadarecords-com-plugins-lv2-phaser-mono
-        invadarecords-com-plugins-lv2-phaser-stereo
-        invadarecords-com-plugins-lv2-phaser-sum
-        invadarecords-com-plugins-lv2-testtone
-        invadarecords-com-plugins-lv2-tube-mono
-        invadarecords-com-plugins-lv2-tube-stereo
-        ladspa-AWfilt
-        ladspa-Accumulate
-        ladspa-Ambisonics-11-cube-decoder
-        ladspa-Ambisonics-11-hexagon-decoder
-        ladspa-Ambisonics-11-mono-panner
-        ladspa-Ambisonics-11-rotator
-        ladspa-Ambisonics-11-square-decoder
-        ladspa-Ambisonics-11-stereo-panner
-        ladspa-Ambisonics-21-panner
-        ladspa-Ambisonics-21-rotator
-        ladspa-Ambisonics-22-panner
-        ladspa-Ambisonics-22-rotator
-        ladspa-Ambisonics-31-panner
-        ladspa-Ambisonics-31-rotator
-        ladspa-Ambisonics-33-panner
-        ladspa-Ambisonics-33-rotator
-        ladspa-AmpIII
-        ladspa-AmpIV
-        ladspa-AmpV
-        ladspa-AmpVTS
-        ladspa-AutoWah
-        ladspa-BassEnhancer
-        ladspa-BoosterM
-        ladspa-BoosterS
-        ladspa-CEO
-        ladspa-CVFreq
-        ladspa-CabinetI
-        ladspa-CabinetII
-        ladspa-Chorus1
-        ladspa-Chorus1-2x2
-        ladspa-Chorus2
-        ladspa-ChorusI
-        ladspa-ChorusII
-        ladspa-Click
-        ladspa-Clip
-        ladspa-Compress
-        ladspa-Compressor
-        ladspa-Deesser
-        ladspa-Dirac
-        ladspa-Eq
-        ladspa-Eq2x2
-        ladspa-Equalizer12Band
-        ladspa-Equalizer5Band
-        ladspa-Equalizer8Band
-        ladspa-Exaggerate
-        ladspa-Exciter
-        ladspa-Filter
-        ladspa-Filterclavier
-        ladspa-Flanger
-        ladspa-G2reverb
-        ladspa-Gate
-        ladspa-HRTF
-        ladspa-JVRev
-        ladspa-Lorenz
-        ladspa-MUSIC
-        ladspa-MUSICDrum
-        ladspa-MultiChorus
-        ladspa-Multibandcompressor
-        ladspa-Mvchpf-1
-        ladspa-Mvclpf-1
-        ladspa-Mvclpf-2
-        ladspa-Mvclpf-3
-        ladspa-Mvclpf-4
-        ladspa-NoisifierM
-        ladspa-NoisifierS
-        ladspa-PSG
-        ladspa-Pan
-        ladspa-Parametric1
-        ladspa-Phaser
-        ladspa-Phaser1
-        ladspa-Phaser1+LFO
-        ladspa-PhaserI
-        ladspa-PhaserII
-        ladspa-Plate
-        ladspa-Plate2x2
-        ladspa-PreampIII
-        ladspa-PreampIV
-        ladspa-Pulsator
-        ladspa-Pulse-VCO
-        ladspa-Rec-VCO
-        ladspa-Reverb
-        ladspa-Roessler
-        ladspa-RotarySpeaker
-        ladspa-SCC
-        ladspa-SID
-        ladspa-Saturator
-        ladspa-Saw-VCO
-        ladspa-Scape
-        ladspa-Sidechaincompressor
-        ladspa-Sidechaingate
-        ladspa-Sin
-        ladspa-SooperLooper
-        ladspa-StereoChorusI
-        ladspa-StereoChorusII
-        ladspa-SweepVFI
-        ladspa-SweepVFII
-        ladspa-Sync-Rect-VCO
-        ladspa-Sync-Saw-VCO
-        ladspa-Sync-Tri-VCO
-        ladspa-ToneStack
-        ladspa-ToneStackLT
-        ladspa-Transpose
-        ladspa-Tricardioid-to-AMB
-        ladspa-TripleChorus
-        ladspa-VCOd
-        ladspa-VCOs
-        ladspa-VariNoiseM
-        ladspa-VariNoiseS
-        ladspa-VintageDelay
-        ladspa-Virtualmic
-        ladspa-White
-        ladspa-XShaperM
-        ladspa-XShaperS
-        ladspa-adenv
-        ladspa-adenv-lvl
-        ladspa-adsr
-        ladspa-adsr-g+t
-        ladspa-alias
-        ladspa-alienwah-mono
-        ladspa-alienwah-stereo
-        ladspa-allpass-c
-        ladspa-allpass-l
-        ladspa-allpass-n
-        ladspa-am
-        ladspa-amPitchshift
-        ladspa-amp
-        ladspa-amp-gaia-oa
-        ladspa-amp-gcia-oa
         ladspa-amp-mono
         ladspa-amp-stereo
-        ladspa-analogue
-        ladspa-analogueOsc
-        ladspa-artificialLatency
-        ladspa-autoPhaser
-        ladspa-bandpass-a-iir
-        ladspa-bandpass-iir
-        ladspa-bf-rotate-z
-        ladspa-bf2cube
-        ladspa-bf2quad
-        ladspa-bf2stereo
-        ladspa-bodeShifter
-        ladspa-bodeShifterCV
-        ladspa-branch-ia-oaoa
-        ladspa-branch-ic-ococ
-        ladspa-butthigh-iir
-        ladspa-buttlow-iir
-        ladspa-bwxover-iir
-        ladspa-canyon-delay
-        ladspa-chebstortion
-        ladspa-clipper
-        ladspa-comb
-        ladspa-comb-c
-        ladspa-comb-l
-        ladspa-comb-n
-        ladspa-combSplitter
-        ladspa-comp-aa
-        ladspa-comp-ac
-        ladspa-compress-peak
-        ladspa-compress-rms
-        ladspa-const
-        ladspa-crossoverDist
-        ladspa-dahdsr-cg+t-control
-        ladspa-dahdsr-fexp
-        ladspa-dahdsr-g+t-audio
-        ladspa-dahdsr-g+t-control
-        ladspa-dahdsr-hexp
-        ladspa-dcRemove
-        ladspa-decay
-        ladspa-decimator
-        ladspa-declip
-        ladspa-delay-0-01s
-        ladspa-delay-0-1s
-        ladspa-delay-1s
         ladspa-delay-5s
-        ladspa-delay-60s
-        ladspa-delay-c
-        ladspa-delay-l
-        ladspa-delay-n
-        ladspa-delayorama
-        ladspa-difference-iama-oa
-        ladspa-difference-iamc-oa
-        ladspa-difference-icma-oa
-        ladspa-difference-icmc-oc
-        ladspa-diode
-        ladspa-disintegrator
-        ladspa-divider
-        ladspa-dj-eq
-        ladspa-dj-eq-mono
-        ladspa-djFlanger
-        ladspa-dysonCompress
-        ladspa-eir
-        ladspa-encode-bformat
-        ladspa-encode-fmh
-        ladspa-expand-peak
-        ladspa-expand-rms
-        ladspa-fadDelay
-        ladspa-fast-xfade
-        ladspa-fastLookaheadLimiter
-        ladspa-fbdelay-0-01s
-        ladspa-fbdelay-0-1s
-        ladspa-fbdelay-1s
-        ladspa-fbdelay-5s
-        ladspa-fbdelay-60s
-        ladspa-flanger
-        ladspa-floatNoise
-        ladspa-fmOsc
-        ladspa-fmh-rotate-z
-        ladspa-fmh2bf
-        ladspa-fmh2oct
-        ladspa-fmod-fama-oa
-        ladspa-fmod-famc-oa
-        ladspa-fmod-fcma-oa
-        ladspa-fmod-fcmc-oc
-        ladspa-foldover
-        ladspa-foo-chop-liver
-        ladspa-foo-driver
-        ladspa-foo-limiter
-        ladspa-foo-limiter-v2
-        ladspa-foo-saturator
-        ladspa-foo-transients
-        ladspa-foo-transients-mono
-        ladspa-formant-vc
-        ladspa-fourByFourPole
-        ladspa-foverdrive
-        ladspa-freeverb3
-        ladspa-freqTracker
-        ladspa-gate
-        ladspa-giantFlange
-        ladspa-gong
-        ladspa-gongBeater
-        ladspa-grain-scatter
-        ladspa-gsm
-        ladspa-gverb
-        ladspa-hard-gate
-        ladspa-hardLimiter
-        ladspa-harmonicGen
-        ladspa-hermesFilter
-        ladspa-highpass-iir
-        ladspa-hilbert
         ladspa-hpf
-        ladspa-hz-voct-ar
-        ladspa-hz-voct-cr
-        ladspa-identity-audio
-        ladspa-identity-control
-        ladspa-imp
-        ladspa-impulse-fc
-        ladspa-intNoise
-        ladspa-interpolator
-        ladspa-inv
-        ladspa-karaoke
-        ladspa-lcrDelay
-        ladspa-leet-equalizer-bw2x2
-        ladspa-leet-equalizer-bw2x2-1
-        ladspa-lfoPhaser
-        ladspa-limit-peak
-        ladspa-limit-rms
-        ladspa-lofi
-        ladspa-logistic
-        ladspa-lowpass-iir
-        ladspa-lp4pole-faraia-oa
-        ladspa-lp4pole-fcrcia-oa
         ladspa-lpf
-        ladspa-lsFilter
-        ladspa-matched
-        ladspa-matrixMSSt
-        ladspa-matrixSpatialiser
-        ladspa-matrixStMS
-        ladspa-mbeq
-        ladspa-mixer
-        ladspa-modDelay
-        ladspa-multivoiceChorus
-        ladspa-mux-ar
-        ladspa-mux-cr
-        ladspa-noise-source-white
         ladspa-noise-white
-        ladspa-notch-iir
-        ladspa-null-ai
-        ladspa-null-ao
-        ladspa-null-ci
-        ladspa-null-co
-        ladspa-organ
-        ladspa-peak
-        ladspa-phasemod
-        ladspa-pink-full-frequency
-        ladspa-pink-interpolated-audio
-        ladspa-pink-sh
-        ladspa-pitchScale
-        ladspa-pitchScaleHQ
-        ladspa-plate
-        ladspa-pointerCastDistortion
-        ladspa-power
-        ladspa-power-cr
-        ladspa-preamp
-        ladspa-prob-switch-ar
-        ladspa-prob-switch-cr
-        ladspa-product-iaia-oa
-        ladspa-product-iaic-oa
-        ladspa-product-icic-oc
-        ladspa-pulse-fapa-oa
-        ladspa-pulse-fapc-oa
-        ladspa-pulse-fcpa-oa
-        ladspa-pulse-fcpc-oa
-        ladspa-quantiser100
-        ladspa-quantiser20
-        ladspa-quantiser50
-        ladspa-random-fasa-oa
-        ladspa-random-fasc-oa
-        ladspa-random-fcsa-oa
-        ladspa-random-fcsc-oa
-        ladspa-range-trans-ar
-        ladspa-range-trans-cr
-        ladspa-rateShifter
-        ladspa-ratio-nada-oa
-        ladspa-ratio-nadc-oa
-        ladspa-ratio-ncda-oa
-        ladspa-ratio-ncdc-oc
-        ladspa-retroFlange
-        ladspa-revdelay
-        ladspa-ringmod-1i1o1l
-        ladspa-ringmod-2i1o
-        ladspa-rissetScales
-        ladspa-rubberband-pitchshifter-mono
-        ladspa-rubberband-pitchshifter-stereo
-        ladspa-satanMaximiser
-        ladspa-sawtooth-fa-oa
-        ladspa-sawtooth-fc-oa
-        ladspa-sc1
-        ladspa-sc2
-        ladspa-sc3
-        ladspa-sc4
-        ladspa-sc4m
-        ladspa-se4
-        ladspa-sequencer16
-        ladspa-sequencer32
-        ladspa-sequencer64
-        ladspa-sh-ar
-        ladspa-sh-cr
-        ladspa-shaper
-        ladspa-sifter
-        ladspa-signal-abs-ar
-        ladspa-signal-abs-cr
-        ladspa-sinCos
         ladspa-sine-faaa
         ladspa-sine-faac
         ladspa-sine-fcaa
         ladspa-sine-fcac
-        ladspa-singlePara
-        ladspa-sinusWavewrapper
-        ladspa-sledgehammer
-        ladspa-slew-limiter-ra
-        ladspa-slew-limiter-rc
-        ladspa-slide-ta
-        ladspa-slide-tc
-        ladspa-smoothDecimate
-        ladspa-split
-        ladspa-square-fa-oa
-        ladspa-square-fc-oa
-        ladspa-ssm-masher
-        ladspa-stepMuxer
-        ladspa-sum-iaia-oa
-        ladspa-sum-iaic-oa
-        ladspa-sum-icic-oc
-        ladspa-super-60
-        ladspa-surroundEncoder
-        ladspa-svf
-        ladspa-syncpulse-fapaga-oa
-        ladspa-syncpulse-fcpcga-oa
-        ladspa-syncsquare-faga-oa
-        ladspa-syncsquare-fcga-oa
-        ladspa-syndrum
-        ladspa-tap-autopan
-        ladspa-tap-chorusflanger
-        ladspa-tap-deesser
-        ladspa-tap-doubler
-        ladspa-tap-dynamics-m
-        ladspa-tap-dynamics-st
-        ladspa-tap-equalizer
-        ladspa-tap-equalizer-bw
-        ladspa-tap-limiter
-        ladspa-tap-pinknoise
-        ladspa-tap-pitch
-        ladspa-tap-reflector
-        ladspa-tap-reverb
-        ladspa-tap-rotspeak
-        ladspa-tap-sigmoid
-        ladspa-tap-stereo-echo
-        ladspa-tap-tremolo
-        ladspa-tap-tubewarmth
-        ladspa-tap-vibrato
-        ladspa-tapeDelay
-        ladspa-track-max-peak
-        ladspa-track-max-rms
-        ladspa-track-peak
-        ladspa-track-rms
-        ladspa-tracker-gaaadaia-oa
-        ladspa-tracker-gaacdcia-oa
-        ladspa-transient
-        ladspa-triangle-fasa-oa
-        ladspa-triangle-fasc-oa
-        ladspa-triangle-fcsa-oa
-        ladspa-triangle-fcsc-oa
-        ladspa-trigger
-        ladspa-triplePara
-        ladspa-unmatched
-        ladspa-valve
-        ladspa-valveRect
-        ladspa-vcf-bp1
-        ladspa-vcf-bp2
-        ladspa-vcf-hp
-        ladspa-vcf-hshelf
-        ladspa-vcf-lp
-        ladspa-vcf-lshelf
-        ladspa-vcf-notch
-        ladspa-vcf-peakeq
-        ladspa-vcf-reslp
-        ladspa-vcf303
-        ladspa-vlevel-mono
-        ladspa-vlevel-stereo
-        ladspa-vocoder
-        ladspa-vynil
-        ladspa-waveTerrain
-        ladspa-wg-mesh-cr
-        ladspa-wshape-sine
-        ladspa-xfade
-        ladspa-xfade4
-        ladspa-zm1
       GstSirenDec
       GstSirenEnc
       GstSpeed
       GstSrtEnc
       GstTRM
-      GstTemplateMatch
-      GstTimidity
       GstTtaDec
       GstTtaParse
       GstVMncDec
       GstVcdParse
       GstVdpVideoPostProcess
-      GstVideo3DMerge
-      GstXvidDec
-      GstXvidEnc
+      GstWildmidi
       GstY4mDec
-      Gstedgedetect
-      Gstfaceblur
-      Gstpyramidsegment
       MpegPsMux
       MpegTSBase
         GstTSDemux
@@ -738,6 +267,7 @@ GObject
     GstRegistry
     GstRingBuffer
       GstAudioSinkRingBuffer
+      GstAudioSrcRingBuffer
     GstTask
     GstTaskPool
   GstSignalObject
diff --git a/docs/plugins/gst-plugins-bad-plugins.interfaces b/docs/plugins/gst-plugins-bad-plugins.interfaces
index 7a3fcee6e9..c62655fbdb 100644
--- a/docs/plugins/gst-plugins-bad-plugins.interfaces
+++ b/docs/plugins/gst-plugins-bad-plugins.interfaces
@@ -33,6 +33,7 @@ GstMpeg2enc GstPreset
 GstMythtvSrc GstURIHandler
 GstNeonhttpSrc GstURIHandler
 GstPipeline GstChildProxy
+GstRTMPSink GstURIHandler
 GstRTMPSrc GstURIHandler
 GstSDLVideoSink GstImplementsInterface GstXOverlay GstNavigation
 GstSDPDemux GstChildProxy

From ca8ea19cc37bd7e87240762c4a34da246e5a20d9 Mon Sep 17 00:00:00 2001
From: Thiago Santos <thiago.sousa.santos@collabora.co.uk>
Date: Fri, 17 Jun 2011 16:12:00 -0300
Subject: [PATCH 007/158] tsdemux: only free the index array if it exists

Only free the array if it exists.

Contains an unrelated indentation fix, courtesy of gst-indent
---
 gst/mpegtsdemux/tsdemux.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gst/mpegtsdemux/tsdemux.c b/gst/mpegtsdemux/tsdemux.c
index b602ab7c14..9894d8df8a 100644
--- a/gst/mpegtsdemux/tsdemux.c
+++ b/gst/mpegtsdemux/tsdemux.c
@@ -305,8 +305,10 @@ static void
 gst_ts_demux_reset (MpegTSBase * base)
 {
   GstTSDemux *demux = (GstTSDemux *) base;
-  g_array_free (demux->index, TRUE);
-  demux->index = NULL;
+  if (demux->index) {
+    g_array_free (demux->index, TRUE);
+    demux->index = NULL;
+  }
   demux->index_size = 0;
   demux->need_newsegment = TRUE;
   demux->program_number = -1;
@@ -581,7 +583,7 @@ gst_ts_demux_perform_auxiliary_seek (MpegTSBase * base, GstClockTime seektime,
             GstClockTime time = calculate_gsttime (pcroffset, pts * 300);
 
             GST_DEBUG ("packet has PTS: %" GST_TIME_FORMAT,
-              GST_TIME_ARGS (time));
+                GST_TIME_ARGS (time));
 
             if (time <= seektime) {
               pcroffset->gsttime = time;

From 1e1c16150b265ba0f5f55ad0aaa61633e83543de Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Sun, 5 Jun 2011 21:17:04 -0700
Subject: [PATCH 008/158] decklink: reindent

---
 sys/decklink/DeckLinkAPIDispatch.cpp | 121 +++++++++---------
 sys/decklink/capture.cpp             |  78 ++++++-----
 sys/decklink/gstdecklinksink.cpp     | 154 ++++++++++++----------
 sys/decklink/gstdecklinksrc.cpp      | 185 ++++++++++++++-------------
 4 files changed, 294 insertions(+), 244 deletions(-)

diff --git a/sys/decklink/DeckLinkAPIDispatch.cpp b/sys/decklink/DeckLinkAPIDispatch.cpp
index 72607782dc..d714ae9d21 100644
--- a/sys/decklink/DeckLinkAPIDispatch.cpp
+++ b/sys/decklink/DeckLinkAPIDispatch.cpp
@@ -34,77 +34,84 @@
 #define kDeckLinkAPI_Name "libDeckLinkAPI.so"
 #define KDeckLinkPreviewAPI_Name "libDeckLinkPreviewAPI.so"
 
-typedef IDeckLinkIterator* (*CreateIteratorFunc)(void);
-typedef IDeckLinkGLScreenPreviewHelper* (*CreateOpenGLScreenPreviewHelperFunc)(void);
-typedef IDeckLinkVideoConversion* (*CreateVideoConversionInstanceFunc)(void);
+typedef IDeckLinkIterator *(*CreateIteratorFunc) (void);
+typedef IDeckLinkGLScreenPreviewHelper
+    * (*CreateOpenGLScreenPreviewHelperFunc) (void);
+typedef IDeckLinkVideoConversion *(*CreateVideoConversionInstanceFunc) (void);
 
-static pthread_once_t					gDeckLinkOnceControl = PTHREAD_ONCE_INIT;
-static pthread_once_t					gPreviewOnceControl = PTHREAD_ONCE_INIT;
+static pthread_once_t gDeckLinkOnceControl = PTHREAD_ONCE_INIT;
+static pthread_once_t gPreviewOnceControl = PTHREAD_ONCE_INIT;
 
-static CreateIteratorFunc					gCreateIteratorFunc = NULL;
-static CreateOpenGLScreenPreviewHelperFunc	gCreateOpenGLPreviewFunc = NULL;
-static CreateVideoConversionInstanceFunc	gCreateVideoConversionFunc	= NULL;
+static CreateIteratorFunc gCreateIteratorFunc = NULL;
+static CreateOpenGLScreenPreviewHelperFunc gCreateOpenGLPreviewFunc = NULL;
+static CreateVideoConversionInstanceFunc gCreateVideoConversionFunc = NULL;
 
-static
-void	InitDeckLinkAPI (void)
+static void
+InitDeckLinkAPI (void)
 {
-	void *libraryHandle;
-	
-	libraryHandle = dlopen(kDeckLinkAPI_Name, RTLD_NOW|RTLD_GLOBAL);
-	if (!libraryHandle)
-	{
-		fprintf(stderr, "%s\n", dlerror());
-		return;
-	}
-	gCreateIteratorFunc = (CreateIteratorFunc)dlsym(libraryHandle, "CreateDeckLinkIteratorInstance_0001");
-	if (!gCreateIteratorFunc)
-		fprintf(stderr, "%s\n", dlerror());
-	gCreateVideoConversionFunc = (CreateVideoConversionInstanceFunc)dlsym(libraryHandle, "CreateVideoConversionInstance_0001");
-	if (!gCreateVideoConversionFunc)
-		fprintf(stderr, "%s\n", dlerror());
+  void *libraryHandle;
+
+  libraryHandle = dlopen (kDeckLinkAPI_Name, RTLD_NOW | RTLD_GLOBAL);
+  if (!libraryHandle) {
+    fprintf (stderr, "%s\n", dlerror ());
+    return;
+  }
+  gCreateIteratorFunc =
+      (CreateIteratorFunc) dlsym (libraryHandle,
+      "CreateDeckLinkIteratorInstance_0001");
+  if (!gCreateIteratorFunc)
+    fprintf (stderr, "%s\n", dlerror ());
+  gCreateVideoConversionFunc =
+      (CreateVideoConversionInstanceFunc) dlsym (libraryHandle,
+      "CreateVideoConversionInstance_0001");
+  if (!gCreateVideoConversionFunc)
+    fprintf (stderr, "%s\n", dlerror ());
 }
 
-static
-void	InitDeckLinkPreviewAPI (void)
+static void
+InitDeckLinkPreviewAPI (void)
 {
-	void *libraryHandle;
-	
-	libraryHandle = dlopen(KDeckLinkPreviewAPI_Name, RTLD_NOW|RTLD_GLOBAL);
-	if (!libraryHandle)
-	{
-		fprintf(stderr, "%s\n", dlerror());
-		return;
-	}
-	gCreateOpenGLPreviewFunc = (CreateOpenGLScreenPreviewHelperFunc)dlsym(libraryHandle, "CreateOpenGLScreenPreviewHelper_0001");
-	if (!gCreateOpenGLPreviewFunc)
-		fprintf(stderr, "%s\n", dlerror());
+  void *libraryHandle;
+
+  libraryHandle = dlopen (KDeckLinkPreviewAPI_Name, RTLD_NOW | RTLD_GLOBAL);
+  if (!libraryHandle) {
+    fprintf (stderr, "%s\n", dlerror ());
+    return;
+  }
+  gCreateOpenGLPreviewFunc =
+      (CreateOpenGLScreenPreviewHelperFunc) dlsym (libraryHandle,
+      "CreateOpenGLScreenPreviewHelper_0001");
+  if (!gCreateOpenGLPreviewFunc)
+    fprintf (stderr, "%s\n", dlerror ());
 }
 
-IDeckLinkIterator*		CreateDeckLinkIteratorInstance (void)
+IDeckLinkIterator *
+CreateDeckLinkIteratorInstance (void)
 {
-	pthread_once(&gDeckLinkOnceControl, InitDeckLinkAPI);
-	
-	if (gCreateIteratorFunc == NULL)
-		return NULL;
-	return gCreateIteratorFunc();
+  pthread_once (&gDeckLinkOnceControl, InitDeckLinkAPI);
+
+  if (gCreateIteratorFunc == NULL)
+    return NULL;
+  return gCreateIteratorFunc ();
 }
 
-IDeckLinkGLScreenPreviewHelper*		CreateOpenGLScreenPreviewHelper (void)
+IDeckLinkGLScreenPreviewHelper *
+CreateOpenGLScreenPreviewHelper (void)
 {
-	pthread_once(&gDeckLinkOnceControl, InitDeckLinkAPI);
-	pthread_once(&gPreviewOnceControl, InitDeckLinkPreviewAPI);
-	
-	if (gCreateOpenGLPreviewFunc == NULL)
-		return NULL;
-	return gCreateOpenGLPreviewFunc();
+  pthread_once (&gDeckLinkOnceControl, InitDeckLinkAPI);
+  pthread_once (&gPreviewOnceControl, InitDeckLinkPreviewAPI);
+
+  if (gCreateOpenGLPreviewFunc == NULL)
+    return NULL;
+  return gCreateOpenGLPreviewFunc ();
 }
 
-IDeckLinkVideoConversion* CreateVideoConversionInstance (void)
+IDeckLinkVideoConversion *
+CreateVideoConversionInstance (void)
 {
-	pthread_once(&gDeckLinkOnceControl, InitDeckLinkAPI);
-	
-	if (gCreateVideoConversionFunc == NULL)
-		return NULL;
-	return gCreateVideoConversionFunc();
-}
+  pthread_once (&gDeckLinkOnceControl, InitDeckLinkAPI);
 
+  if (gCreateVideoConversionFunc == NULL)
+    return NULL;
+  return gCreateVideoConversionFunc ();
+}
diff --git a/sys/decklink/capture.cpp b/sys/decklink/capture.cpp
index 20bd660c9c..ef0f7ba2a9 100644
--- a/sys/decklink/capture.cpp
+++ b/sys/decklink/capture.cpp
@@ -83,7 +83,7 @@ DeckLinkCaptureDelegate::Release (void)
 }
 
 HRESULT
-DeckLinkCaptureDelegate::VideoInputFrameArrived (IDeckLinkVideoInputFrame *
+    DeckLinkCaptureDelegate::VideoInputFrameArrived (IDeckLinkVideoInputFrame *
     videoFrame, IDeckLinkAudioInputPacket * audioFrame)
 {
   GstDecklinkSrc *decklinksrc = GST_DECKLINK_SRC (priv);
@@ -91,7 +91,7 @@ DeckLinkCaptureDelegate::VideoInputFrameArrived (IDeckLinkVideoInputFrame *
   // Handle Video Frame
   if (videoFrame) {
     if (videoFrame->GetFlags () & bmdFrameHasNoInputSource) {
-      GST_DEBUG("Frame received - No input signal detected");
+      GST_DEBUG ("Frame received - No input signal detected");
     } else {
       const char *timecodeString = NULL;
       if (g_timecodeFormat != 0) {
@@ -101,10 +101,9 @@ DeckLinkCaptureDelegate::VideoInputFrameArrived (IDeckLinkVideoInputFrame *
         }
       }
 
-      GST_DEBUG("Frame received [%s] - %s - Size: %li bytes",
+      GST_DEBUG ("Frame received [%s] - %s - Size: %li bytes",
           timecodeString != NULL ? timecodeString : "No timecode",
-          "Valid Frame",
-          videoFrame->GetRowBytes () * videoFrame->GetHeight ());
+          "Valid Frame", videoFrame->GetRowBytes () * videoFrame->GetHeight ());
 
       if (timecodeString)
         free ((void *) timecodeString);
@@ -113,10 +112,10 @@ DeckLinkCaptureDelegate::VideoInputFrameArrived (IDeckLinkVideoInputFrame *
       if (decklinksrc->video_frame != NULL) {
         decklinksrc->dropped_frames++;
       } else {
-        videoFrame->AddRef();
+        videoFrame->AddRef ();
         decklinksrc->video_frame = videoFrame;
         if (audioFrame) {
-          audioFrame->AddRef();
+          audioFrame->AddRef ();
           decklinksrc->audio_frame = audioFrame;
         }
       }
@@ -128,11 +127,10 @@ DeckLinkCaptureDelegate::VideoInputFrameArrived (IDeckLinkVideoInputFrame *
 }
 
 HRESULT
-DeckLinkCaptureDelegate::
-VideoInputFormatChanged (BMDVideoInputFormatChangedEvents events,
-    IDeckLinkDisplayMode * mode, BMDDetectedVideoInputFormatFlags)
-{
-  GST_ERROR("moo");
+    DeckLinkCaptureDelegate::VideoInputFormatChanged
+    (BMDVideoInputFormatChangedEvents events, IDeckLinkDisplayMode * mode,
+    BMDDetectedVideoInputFormatFlags) {
+  GST_ERROR ("moo");
   return S_OK;
 }
 
@@ -140,19 +138,25 @@ VideoInputFormatChanged (BMDVideoInputFormatChangedEvents events,
 int
 usage (int status)
 {
-  HRESULT result;
-  IDeckLinkDisplayMode *displayMode;
-  int displayModeCount = 0;
+  HRESULT
+      result;
+  IDeckLinkDisplayMode *
+      displayMode;
+  int
+      displayModeCount = 0;
 
   fprintf (stderr,
       "Usage: Capture -m <mode id> [OPTIONS]\n" "\n" "    -m <mode id>:\n");
 
   while (displayModeIterator->Next (&displayMode) == S_OK) {
-    char *displayModeString = NULL;
+    char *
+        displayModeString = NULL;
 
     result = displayMode->GetName ((const char **) &displayModeString);
     if (result == S_OK) {
-      BMDTimeValue frameRateDuration, frameRateScale;
+      BMDTimeValue
+          frameRateDuration,
+          frameRateScale;
       displayMode->GetFrameRate (&frameRateDuration, &frameRateScale);
 
       fprintf (stderr, "        %2d:  %-20s \t %li x %li \t %g FPS\n",
@@ -194,17 +198,28 @@ usage (int status)
 int
 main (int argc, char *argv[])
 {
-  IDeckLinkIterator *deckLinkIterator = CreateDeckLinkIteratorInstance ();
-  DeckLinkCaptureDelegate *delegate;
-  IDeckLinkDisplayMode *displayMode;
-  BMDVideoInputFlags inputFlags = 0;
-  BMDDisplayMode selectedDisplayMode = bmdModeNTSC;
-  BMDPixelFormat pixelFormat = bmdFormat8BitYUV;
-  int displayModeCount = 0;
-  int exitStatus = 1;
-  int ch;
-  bool foundDisplayMode = false;
-  HRESULT result;
+  IDeckLinkIterator *
+      deckLinkIterator = CreateDeckLinkIteratorInstance ();
+  DeckLinkCaptureDelegate *
+      delegate;
+  IDeckLinkDisplayMode *
+      displayMode;
+  BMDVideoInputFlags
+      inputFlags = 0;
+  BMDDisplayMode
+      selectedDisplayMode = bmdModeNTSC;
+  BMDPixelFormat
+      pixelFormat = bmdFormat8BitYUV;
+  int
+      displayModeCount = 0;
+  int
+      exitStatus = 1;
+  int
+      ch;
+  bool
+      foundDisplayMode = false;
+  HRESULT
+      result;
 
   pthread_mutex_init (&sleepMutex, NULL);
   pthread_cond_init (&sleepCond, NULL);
@@ -334,8 +349,10 @@ main (int argc, char *argv[])
 
   while (displayModeIterator->Next (&displayMode) == S_OK) {
     if (g_videoModeIndex == displayModeCount) {
-      BMDDisplayModeSupport result;
-      const char *displayModeName;
+      BMDDisplayModeSupport
+          result;
+      const char *
+          displayModeName;
 
       foundDisplayMode = true;
       displayMode->GetName (&displayModeName);
@@ -427,4 +444,3 @@ bail:
   return exitStatus;
 }
 #endif
-
diff --git a/sys/decklink/gstdecklinksink.cpp b/sys/decklink/gstdecklinksink.cpp
index 43f78ebcf1..5f84ddf459 100644
--- a/sys/decklink/gstdecklinksink.cpp
+++ b/sys/decklink/gstdecklinksink.cpp
@@ -67,7 +67,8 @@ static gboolean gst_decklink_sink_query (GstElement * element,
     GstQuery * query);
 
 static GstCaps *gst_decklink_sink_videosink_getcaps (GstPad * pad);
-static gboolean gst_decklink_sink_videosink_setcaps (GstPad * pad, GstCaps * caps);
+static gboolean gst_decklink_sink_videosink_setcaps (GstPad * pad,
+    GstCaps * caps);
 static gboolean gst_decklink_sink_videosink_acceptcaps (GstPad * pad,
     GstCaps * caps);
 static gboolean gst_decklink_sink_videosink_activate (GstPad * pad);
@@ -81,15 +82,18 @@ static GstFlowReturn gst_decklink_sink_videosink_chain (GstPad * pad,
     GstBuffer * buffer);
 static GstFlowReturn gst_decklink_sink_videosink_chainlist (GstPad * pad,
     GstBufferList * bufferlist);
-static gboolean gst_decklink_sink_videosink_event (GstPad * pad, GstEvent * event);
-static gboolean gst_decklink_sink_videosink_query (GstPad * pad, GstQuery * query);
+static gboolean gst_decklink_sink_videosink_event (GstPad * pad,
+    GstEvent * event);
+static gboolean gst_decklink_sink_videosink_query (GstPad * pad,
+    GstQuery * query);
 static GstFlowReturn gst_decklink_sink_videosink_bufferalloc (GstPad * pad,
     guint64 offset, guint size, GstCaps * caps, GstBuffer ** buf);
 static GstIterator *gst_decklink_sink_videosink_iterintlink (GstPad * pad);
 
 
 static GstCaps *gst_decklink_sink_audiosink_getcaps (GstPad * pad);
-static gboolean gst_decklink_sink_audiosink_setcaps (GstPad * pad, GstCaps * caps);
+static gboolean gst_decklink_sink_audiosink_setcaps (GstPad * pad,
+    GstCaps * caps);
 static gboolean gst_decklink_sink_audiosink_acceptcaps (GstPad * pad,
     GstCaps * caps);
 static gboolean gst_decklink_sink_audiosink_activate (GstPad * pad);
@@ -103,8 +107,10 @@ static GstFlowReturn gst_decklink_sink_audiosink_chain (GstPad * pad,
     GstBuffer * buffer);
 static GstFlowReturn gst_decklink_sink_audiosink_chainlist (GstPad * pad,
     GstBufferList * bufferlist);
-static gboolean gst_decklink_sink_audiosink_event (GstPad * pad, GstEvent * event);
-static gboolean gst_decklink_sink_audiosink_query (GstPad * pad, GstQuery * query);
+static gboolean gst_decklink_sink_audiosink_event (GstPad * pad,
+    GstEvent * event);
+static gboolean gst_decklink_sink_audiosink_query (GstPad * pad,
+    GstQuery * query);
 static GstFlowReturn gst_decklink_sink_audiosink_bufferalloc (GstPad * pad,
     guint64 offset, guint size, GstCaps * caps, GstBuffer ** buf);
 static GstIterator *gst_decklink_sink_audiosink_iterintlink (GstPad * pad);
@@ -125,58 +131,68 @@ static GstStaticPadTemplate gst_decklink_sink_videosink_template =
 GST_STATIC_PAD_TEMPLATE ("videosink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (
-      MODE(720,486,30000,1001,true)
+    GST_STATIC_CAPS (MODE (720, 486, 30000, 1001, true)
     ));
 #if 0
-      MODE(720,486,24000,1001,true) ";"
-      MODE(720,576,25,1,true) ";"
-      MODE(1920,1080,24000,1001,false) ";"
-      MODE(1920,1080,24,1,false) ";"
-      MODE(1920,1080,25,1,false) ";"
-      MODE(1920,1080,30000,1001,false) ";"
-      MODE(1920,1080,30,1,false) ";"
-      MODE(1920,1080,25,1,true) ";"
-      MODE(1920,1080,30000,1001,true) ";"
-      MODE(1920,1080,30,1,true) ";"
-      MODE(1280,720,50,1,true) ";"
-      MODE(1280,720,60000,1001,true) ";"
-      MODE(1280,720,60,1,true)
+MODE (720, 486, 24000, 1001, true) ";"
+MODE (720, 576, 25, 1, true)
+    ";"
+MODE (1920, 1080, 24000, 1001, false)
+    ";"
+MODE (1920, 1080, 24, 1, false)
+    ";"
+MODE (1920, 1080, 25, 1, false)
+    ";"
+MODE (1920, 1080, 30000, 1001, false)
+    ";"
+MODE (1920, 1080, 30, 1, false)
+    ";"
+MODE (1920, 1080, 25, 1, true)
+    ";"
+MODE (1920, 1080, 30000, 1001, true)
+    ";"
+MODE (1920, 1080, 30, 1, true)
+    ";"
+MODE (1280, 720, 50, 1, true)
+    ";"
+MODE (1280, 720, 60000, 1001, true)
+    ";"
+MODE (1280, 720, 60, 1, true)
 #endif
-
-static GstStaticPadTemplate gst_decklink_sink_audiosink_template =
-GST_STATIC_PAD_TEMPLATE ("audiosink",
+     static GstStaticPadTemplate gst_decklink_sink_audiosink_template =
+         GST_STATIC_PAD_TEMPLATE ("audiosink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("audio/x-raw-int,width=16,depth=16,channels=2,rate=48000")
     );
 
-typedef struct _DecklinkMode DecklinkMode;
-struct _DecklinkMode {
-  BMDDisplayMode mode;
-  int width;
-  int height;
-  int fps_n;
-  int fps_d;
-  gboolean interlaced;
-};
+     typedef struct _DecklinkMode DecklinkMode;
+     struct _DecklinkMode
+     {
+       BMDDisplayMode mode;
+       int width;
+       int height;
+       int fps_n;
+       int fps_d;
+       gboolean interlaced;
+     };
 
-static DecklinkMode modes[] = {
-  { bmdModeNTSC, 720,486,30000,1001,true },
-  { bmdModeNTSC2398, 720,486,24000,1001,true },
-  { bmdModePAL, 720,576,25,1,true },
-  { bmdModeHD1080p2398, 1920,1080,24000,1001,false },
-  { bmdModeHD1080p24, 1920,1080,24,1,false },
-  { bmdModeHD1080p25, 1920,1080,25,1,false },
-  { bmdModeHD1080p2997, 1920,1080,30000,1001,false },
-  { bmdModeHD1080p30, 1920,1080,30,1,false },
-  { bmdModeHD1080i50, 1920,1080,25,1,true },
-  { bmdModeHD1080i5994, 1920,1080,30000,1001,true },
-  { bmdModeHD1080i6000, 1920,1080,30,1,true },
-  { bmdModeHD720p50, 1280,720,50,1,true },
-  { bmdModeHD720p5994, 1280,720,60000,1001,true },
-  { bmdModeHD720p60, 1280,720,60,1,true }
-};
+     static DecklinkMode modes[] = {
+       {bmdModeNTSC, 720, 486, 30000, 1001, true},
+       {bmdModeNTSC2398, 720, 486, 24000, 1001, true},
+       {bmdModePAL, 720, 576, 25, 1, true},
+       {bmdModeHD1080p2398, 1920, 1080, 24000, 1001, false},
+       {bmdModeHD1080p24, 1920, 1080, 24, 1, false},
+       {bmdModeHD1080p25, 1920, 1080, 25, 1, false},
+       {bmdModeHD1080p2997, 1920, 1080, 30000, 1001, false},
+       {bmdModeHD1080p30, 1920, 1080, 30, 1, false},
+       {bmdModeHD1080i50, 1920, 1080, 25, 1, true},
+       {bmdModeHD1080i5994, 1920, 1080, 30000, 1001, true},
+       {bmdModeHD1080i6000, 1920, 1080, 30, 1, true},
+       {bmdModeHD720p50, 1280, 720, 50, 1, true},
+       {bmdModeHD720p5994, 1280, 720, 60000, 1001, true},
+       {bmdModeHD720p60, 1280, 720, 60, 1, true}
+     };
 
 
 /* class initialization */
@@ -294,8 +310,8 @@ gst_decklink_sink_init (GstDecklinkSink * decklinksink,
   gst_element_add_pad (GST_ELEMENT (decklinksink), decklinksink->audiosinkpad);
 
 
-  decklinksink->cond = g_cond_new();
-  decklinksink->mutex = g_mutex_new();
+  decklinksink->cond = g_cond_new ();
+  decklinksink->mutex = g_mutex_new ();
 
   decklinksink->mode = 0;
 
@@ -364,7 +380,7 @@ gst_decklink_sink_finalize (GObject * object)
 }
 
 static gboolean
-gst_decklink_sink_start (GstDecklinkSink *decklinksink)
+gst_decklink_sink_start (GstDecklinkSink * decklinksink)
 {
   IDeckLinkIterator *iterator;
   HRESULT ret;
@@ -375,18 +391,18 @@ gst_decklink_sink_start (GstDecklinkSink *decklinksink)
 
   iterator = CreateDeckLinkIteratorInstance ();
   if (iterator == NULL) {
-    GST_ERROR("no driver");
+    GST_ERROR ("no driver");
     return FALSE;
   }
 
   ret = iterator->Next (&decklinksink->decklink);
   if (ret != S_OK) {
-    GST_ERROR("no card");
+    GST_ERROR ("no card");
     return FALSE;
   }
 
   ret = decklinksink->decklink->QueryInterface (IID_IDeckLinkOutput,
-      (void **)&decklinksink->output);
+      (void **) &decklinksink->output);
   if (ret != S_OK) {
     GST_ERROR ("no output");
     return FALSE;
@@ -424,7 +440,8 @@ gst_decklink_sink_start (GstDecklinkSink *decklinksink)
   }
   //decklinksink->video_enabled = TRUE;
 
-  decklinksink->output->SetScheduledFrameCompletionCallback (decklinksink->callback);
+  decklinksink->output->
+      SetScheduledFrameCompletionCallback (decklinksink->callback);
 
   if (0) {
     ret = decklinksink->output->EnableAudioOutput (bmdAudioSampleRate48kHz,
@@ -441,7 +458,7 @@ gst_decklink_sink_start (GstDecklinkSink *decklinksink)
 }
 
 static gboolean
-gst_decklink_sink_force_stop (GstDecklinkSink *decklinksink)
+gst_decklink_sink_force_stop (GstDecklinkSink * decklinksink)
 {
   g_mutex_lock (decklinksink->mutex);
   decklinksink->stop = TRUE;
@@ -452,7 +469,7 @@ gst_decklink_sink_force_stop (GstDecklinkSink *decklinksink)
 }
 
 static gboolean
-gst_decklink_sink_stop (GstDecklinkSink *decklinksink)
+gst_decklink_sink_stop (GstDecklinkSink * decklinksink)
 {
   decklinksink->output->StopScheduledPlayback (0, NULL, 0);
   decklinksink->output->DisableAudioOutput ();
@@ -773,8 +790,8 @@ gst_decklink_sink_videosink_query (GstPad * pad, GstQuery * query)
 }
 
 static GstFlowReturn
-gst_decklink_sink_videosink_bufferalloc (GstPad * pad, guint64 offset, guint size,
-    GstCaps * caps, GstBuffer ** buf)
+gst_decklink_sink_videosink_bufferalloc (GstPad * pad, guint64 offset,
+    guint size, GstCaps * caps, GstBuffer ** buf)
 {
   GstDecklinkSink *decklinksink;
 
@@ -984,8 +1001,8 @@ gst_decklink_sink_audiosink_query (GstPad * pad, GstQuery * query)
 }
 
 static GstFlowReturn
-gst_decklink_sink_audiosink_bufferalloc (GstPad * pad, guint64 offset, guint size,
-    GstCaps * caps, GstBuffer ** buf)
+gst_decklink_sink_audiosink_bufferalloc (GstPad * pad, guint64 offset,
+    guint size, GstCaps * caps, GstBuffer ** buf)
 {
   GstDecklinkSink *decklinksink;
 
@@ -1020,10 +1037,10 @@ gst_decklink_sink_audiosink_iterintlink (GstPad * pad)
 
 
 HRESULT
-Output::ScheduledFrameCompleted (IDeckLinkVideoFrame * completedFrame,
+    Output::ScheduledFrameCompleted (IDeckLinkVideoFrame * completedFrame,
     BMDOutputFrameCompletionResult result)
-{   
-  GST_DEBUG("ScheduledFrameCompleted");
+{
+  GST_DEBUG ("ScheduledFrameCompleted");
 
   g_mutex_lock (decklinksink->mutex);
   g_cond_signal (decklinksink->cond);
@@ -1036,15 +1053,14 @@ Output::ScheduledFrameCompleted (IDeckLinkVideoFrame * completedFrame,
 HRESULT
 Output::ScheduledPlaybackHasStopped ()
 {
-  GST_ERROR("ScheduledPlaybackHasStopped");
+  GST_ERROR ("ScheduledPlaybackHasStopped");
   return S_OK;
 }
 
 HRESULT
 Output::RenderAudioSamples (bool preroll)
 {
-  GST_ERROR("RenderAudioSamples");
-  
+  GST_ERROR ("RenderAudioSamples");
+
   return S_OK;
 }
-
diff --git a/sys/decklink/gstdecklinksrc.cpp b/sys/decklink/gstdecklinksrc.cpp
index 373cd96156..f2959aeca2 100644
--- a/sys/decklink/gstdecklinksrc.cpp
+++ b/sys/decklink/gstdecklinksrc.cpp
@@ -68,36 +68,48 @@ static gboolean gst_decklink_src_send_event (GstElement * element,
 static gboolean gst_decklink_src_query (GstElement * element, GstQuery * query);
 
 static GstCaps *gst_decklink_src_audio_src_getcaps (GstPad * pad);
-static gboolean gst_decklink_src_audio_src_setcaps (GstPad * pad, GstCaps * caps);
-static gboolean gst_decklink_src_audio_src_acceptcaps (GstPad * pad, GstCaps * caps);
-static void gst_decklink_src_audio_src_fixatecaps (GstPad * pad, GstCaps * caps);
+static gboolean gst_decklink_src_audio_src_setcaps (GstPad * pad,
+    GstCaps * caps);
+static gboolean gst_decklink_src_audio_src_acceptcaps (GstPad * pad,
+    GstCaps * caps);
+static void gst_decklink_src_audio_src_fixatecaps (GstPad * pad,
+    GstCaps * caps);
 static gboolean gst_decklink_src_audio_src_activate (GstPad * pad);
 static gboolean gst_decklink_src_audio_src_activatepush (GstPad * pad,
     gboolean active);
 static gboolean gst_decklink_src_audio_src_activatepull (GstPad * pad,
     gboolean active);
-static GstPadLinkReturn gst_decklink_src_audio_src_link (GstPad * pad, GstPad * peer);
+static GstPadLinkReturn gst_decklink_src_audio_src_link (GstPad * pad,
+    GstPad * peer);
 static GstFlowReturn gst_decklink_src_audio_src_getrange (GstPad * pad,
     guint64 offset, guint length, GstBuffer ** buffer);
-static gboolean gst_decklink_src_audio_src_event (GstPad * pad, GstEvent * event);
-static gboolean gst_decklink_src_audio_src_query (GstPad * pad, GstQuery * query);
+static gboolean gst_decklink_src_audio_src_event (GstPad * pad,
+    GstEvent * event);
+static gboolean gst_decklink_src_audio_src_query (GstPad * pad,
+    GstQuery * query);
 static GstIterator *gst_decklink_src_audio_src_iterintlink (GstPad * pad);
 
 
 static GstCaps *gst_decklink_src_video_src_getcaps (GstPad * pad);
-static gboolean gst_decklink_src_video_src_setcaps (GstPad * pad, GstCaps * caps);
-static gboolean gst_decklink_src_video_src_acceptcaps (GstPad * pad, GstCaps * caps);
-static void gst_decklink_src_video_src_fixatecaps (GstPad * pad, GstCaps * caps);
+static gboolean gst_decklink_src_video_src_setcaps (GstPad * pad,
+    GstCaps * caps);
+static gboolean gst_decklink_src_video_src_acceptcaps (GstPad * pad,
+    GstCaps * caps);
+static void gst_decklink_src_video_src_fixatecaps (GstPad * pad,
+    GstCaps * caps);
 static gboolean gst_decklink_src_video_src_activate (GstPad * pad);
 static gboolean gst_decklink_src_video_src_activatepush (GstPad * pad,
     gboolean active);
 static gboolean gst_decklink_src_video_src_activatepull (GstPad * pad,
     gboolean active);
-static GstPadLinkReturn gst_decklink_src_video_src_link (GstPad * pad, GstPad * peer);
+static GstPadLinkReturn gst_decklink_src_video_src_link (GstPad * pad,
+    GstPad * peer);
 static GstFlowReturn gst_decklink_src_video_src_getrange (GstPad * pad,
     guint64 offset, guint length, GstBuffer ** buffer);
-static gboolean gst_decklink_src_video_src_event (GstPad * pad, GstEvent * event);
-static gboolean gst_decklink_src_video_src_query (GstPad * pad, GstQuery * query);
+static gboolean gst_decklink_src_video_src_event (GstPad * pad,
+    GstEvent * event);
+static gboolean gst_decklink_src_video_src_query (GstPad * pad,
+    GstQuery * query);
 static GstIterator *gst_decklink_src_video_src_iterintlink (GstPad * pad);
 
 static void gst_decklink_src_task (void *priv);
@@ -121,28 +133,27 @@ GST_STATIC_PAD_TEMPLATE ("audiosrc",
   ",framerate=" #n "/" #d ",interlaced=" #i
 
 static GstStaticPadTemplate gst_decklink_src_video_src_template =
-GST_STATIC_PAD_TEMPLATE ("videosrc",
+    GST_STATIC_PAD_TEMPLATE ("videosrc",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (
-      MODE(720,486,30000,1001,true) ";"
-      MODE(720,486,24000,1001,true) ";"
-      MODE(720,576,25,1,true) ";"
-      MODE(1920,1080,24000,1001,false) ";"
-      MODE(1920,1080,24,1,false) ";"
-      MODE(1920,1080,25,1,false) ";"
-      MODE(1920,1080,30000,1001,false) ";"
-      MODE(1920,1080,30,1,false) ";"
-      MODE(1920,1080,25,1,true) ";"
-      MODE(1920,1080,30000,1001,true) ";"
-      MODE(1920,1080,30,1,true) ";"
-      MODE(1280,720,50,1,true) ";"
-      MODE(1280,720,60000,1001,true) ";"
-      MODE(1280,720,60,1,true)
+    GST_STATIC_CAPS (MODE (720, 486, 30000, 1001, true) ";"
+        MODE (720, 486, 24000, 1001, true) ";"
+        MODE (720, 576, 25, 1, true) ";"
+        MODE (1920, 1080, 24000, 1001, false) ";"
+        MODE (1920, 1080, 24, 1, false) ";"
+        MODE (1920, 1080, 25, 1, false) ";"
+        MODE (1920, 1080, 30000, 1001, false) ";"
+        MODE (1920, 1080, 30, 1, false) ";"
+        MODE (1920, 1080, 25, 1, true) ";"
+        MODE (1920, 1080, 30000, 1001, true) ";"
+        MODE (1920, 1080, 30, 1, true) ";"
+        MODE (1280, 720, 50, 1, true) ";"
+        MODE (1280, 720, 60000, 1001, true) ";" MODE (1280, 720, 60, 1, true)
     ));
 
 typedef struct _DecklinkMode DecklinkMode;
-struct _DecklinkMode {
+struct _DecklinkMode
+{
   BMDDisplayMode mode;
   int width;
   int height;
@@ -152,20 +163,20 @@ struct _DecklinkMode {
 };
 
 static DecklinkMode modes[] = {
-  { bmdModeNTSC, 720,486,30000,1001,true },
-  { bmdModeNTSC2398, 720,486,24000,1001,true },
-  { bmdModePAL, 720,576,25,1,true },
-  { bmdModeHD1080p2398, 1920,1080,24000,1001,false },
-  { bmdModeHD1080p24, 1920,1080,24,1,false },
-  { bmdModeHD1080p25, 1920,1080,25,1,false },
-  { bmdModeHD1080p2997, 1920,1080,30000,1001,false },
-  { bmdModeHD1080p30, 1920,1080,30,1,false },
-  { bmdModeHD1080i50, 1920,1080,25,1,true },
-  { bmdModeHD1080i5994, 1920,1080,30000,1001,true },
-  { bmdModeHD1080i6000, 1920,1080,30,1,true },
-  { bmdModeHD720p50, 1280,720,50,1,true },
-  { bmdModeHD720p5994, 1280,720,60000,1001,true },
-  { bmdModeHD720p60, 1280,720,60,1,true }
+  {bmdModeNTSC, 720, 486, 30000, 1001, true},
+  {bmdModeNTSC2398, 720, 486, 24000, 1001, true},
+  {bmdModePAL, 720, 576, 25, 1, true},
+  {bmdModeHD1080p2398, 1920, 1080, 24000, 1001, false},
+  {bmdModeHD1080p24, 1920, 1080, 24, 1, false},
+  {bmdModeHD1080p25, 1920, 1080, 25, 1, false},
+  {bmdModeHD1080p2997, 1920, 1080, 30000, 1001, false},
+  {bmdModeHD1080p30, 1920, 1080, 30, 1, false},
+  {bmdModeHD1080i50, 1920, 1080, 25, 1, true},
+  {bmdModeHD1080i5994, 1920, 1080, 30000, 1001, true},
+  {bmdModeHD1080i6000, 1920, 1080, 30, 1, true},
+  {bmdModeHD720p50, 1280, 720, 50, 1, true},
+  {bmdModeHD720p5994, 1280, 720, 60000, 1001, true},
+  {bmdModeHD720p60, 1280, 720, 60, 1, true}
 };
 
 
@@ -226,7 +237,8 @@ gst_decklink_src_init (GstDecklinkSrc * decklinksrc,
   gst_task_set_lock (decklinksrc->task, &decklinksrc->task_mutex);
 
   decklinksrc->audiosrcpad =
-      gst_pad_new_from_static_template (&gst_decklink_src_audio_src_template, "audiosrc");
+      gst_pad_new_from_static_template (&gst_decklink_src_audio_src_template,
+      "audiosrc");
   gst_pad_set_getcaps_function (decklinksrc->audiosrcpad,
       GST_DEBUG_FUNCPTR (gst_decklink_src_audio_src_getcaps));
   gst_pad_set_setcaps_function (decklinksrc->audiosrcpad,
@@ -256,7 +268,8 @@ gst_decklink_src_init (GstDecklinkSrc * decklinksrc,
 
 
   decklinksrc->videosrcpad =
-      gst_pad_new_from_static_template (&gst_decklink_src_video_src_template, "videosrc");
+      gst_pad_new_from_static_template (&gst_decklink_src_video_src_template,
+      "videosrc");
   gst_pad_set_getcaps_function (decklinksrc->videosrcpad,
       GST_DEBUG_FUNCPTR (gst_decklink_src_video_src_getcaps));
   gst_pad_set_setcaps_function (decklinksrc->videosrcpad,
@@ -284,8 +297,8 @@ gst_decklink_src_init (GstDecklinkSrc * decklinksrc,
   gst_element_add_pad (GST_ELEMENT (decklinksrc), decklinksrc->videosrcpad);
 
 
-  decklinksrc->cond = g_cond_new();
-  decklinksrc->mutex = g_mutex_new();
+  decklinksrc->cond = g_cond_new ();
+  decklinksrc->mutex = g_mutex_new ();
 
   decklinksrc->copy_data = TRUE;
   decklinksrc->mode = 0;
@@ -395,13 +408,13 @@ gst_decklink_src_start (GstElement * element)
 
   iterator = CreateDeckLinkIteratorInstance ();
   if (iterator == NULL) {
-    GST_ERROR("no driver");
+    GST_ERROR ("no driver");
     return FALSE;
   }
 
   ret = iterator->Next (&decklinksrc->decklink);
   if (ret != S_OK) {
-    GST_ERROR("no card");
+    GST_ERROR ("no card");
     return FALSE;
   }
 
@@ -418,7 +431,7 @@ gst_decklink_src_start (GstElement * element)
 
   ret = decklinksrc->input->GetDisplayModeIterator (&mode_iterator);
   if (ret != S_OK) {
-    GST_ERROR("failed to get display mode iterator");
+    GST_ERROR ("failed to get display mode iterator");
     return FALSE;
   }
 
@@ -428,7 +441,7 @@ gst_decklink_src_start (GstElement * element)
 
     mode->GetName (&mode_name);
 
-    GST_ERROR("%d: mode name: %s", i, mode_name);
+    GST_ERROR ("%d: mode name: %s", i, mode_name);
 
     mode->Release ();
     i++;
@@ -439,23 +452,24 @@ gst_decklink_src_start (GstElement * element)
   input_flags = 0;
   ret = decklinksrc->input->EnableVideoInput (selected_mode, pixel_format,
       input_flags);
-  if (ret != S_OK){
-    GST_ERROR("enable video input failed");
+  if (ret != S_OK) {
+    GST_ERROR ("enable video input failed");
     return FALSE;
   }
 
   sample_depth = 16;
   channels = 2;
-  ret = decklinksrc->input->EnableAudioInput (bmdAudioSampleRate48kHz, sample_depth,
-      channels);
-  if (ret != S_OK){
-    GST_ERROR("enable video input failed");
+  ret =
+      decklinksrc->input->EnableAudioInput (bmdAudioSampleRate48kHz,
+      sample_depth, channels);
+  if (ret != S_OK) {
+    GST_ERROR ("enable video input failed");
     return FALSE;
   }
 
   ret = decklinksrc->input->StartStreams ();
   if (ret != S_OK) {
-    GST_ERROR("start streams failed");
+    GST_ERROR ("start streams failed");
     return FALSE;
   }
 
@@ -960,7 +974,7 @@ gst_decklink_src_video_src_iterintlink (GstPad * pad)
 static void
 video_frame_free (void *data)
 {
-  IDeckLinkVideoInputFrame *video_frame = (IDeckLinkVideoInputFrame *)data;
+  IDeckLinkVideoInputFrame *video_frame = (IDeckLinkVideoInputFrame *) data;
 
   video_frame->Release ();
 }
@@ -992,76 +1006,77 @@ gst_decklink_src_task (void *priv)
   g_mutex_unlock (decklinksrc->mutex);
 
   if (decklinksrc->stop) {
-    GST_ERROR("stopping task");
+    GST_ERROR ("stopping task");
     return;
   }
 
   if (dropped_frames > 0) {
-    GST_ELEMENT_ERROR(decklinksrc, RESOURCE, READ, (NULL), (NULL));
+    GST_ELEMENT_ERROR (decklinksrc, RESOURCE, READ, (NULL), (NULL));
     /* ERROR */
     return;
   }
 
   video_frame->GetBytes (&data);
   if (decklinksrc->copy_data) {
-    buffer = gst_buffer_new_and_alloc (decklinksrc->width * decklinksrc->height * 2);
+    buffer =
+        gst_buffer_new_and_alloc (decklinksrc->width * decklinksrc->height * 2);
 
-    memcpy (GST_BUFFER_DATA (buffer), data, decklinksrc->width * decklinksrc->height * 2);
+    memcpy (GST_BUFFER_DATA (buffer), data,
+        decklinksrc->width * decklinksrc->height * 2);
 
     video_frame->Release ();
   } else {
     buffer = gst_buffer_new ();
     GST_BUFFER_SIZE (buffer) = decklinksrc->width * decklinksrc->height * 2;
 
-    GST_BUFFER_DATA (buffer) = (guint8 *)data;
+    GST_BUFFER_DATA (buffer) = (guint8 *) data;
 
     GST_BUFFER_FREE_FUNC (buffer) = video_frame_free;
-    GST_BUFFER_MALLOCDATA (buffer) = (guint8 *)video_frame;
+    GST_BUFFER_MALLOCDATA (buffer) = (guint8 *) video_frame;
   }
 
   GST_BUFFER_TIMESTAMP (buffer) =
-    gst_util_uint64_scale_int (decklinksrc->num_frames * GST_SECOND,
-        decklinksrc->fps_d, decklinksrc->fps_n);
+      gst_util_uint64_scale_int (decklinksrc->num_frames * GST_SECOND,
+      decklinksrc->fps_d, decklinksrc->fps_n);
   GST_BUFFER_DURATION (buffer) =
-    gst_util_uint64_scale_int ((decklinksrc->num_frames + 1) * GST_SECOND,
-        decklinksrc->fps_d, decklinksrc->fps_n) -
-    GST_BUFFER_TIMESTAMP (buffer);
+      gst_util_uint64_scale_int ((decklinksrc->num_frames + 1) * GST_SECOND,
+      decklinksrc->fps_d, decklinksrc->fps_n) - GST_BUFFER_TIMESTAMP (buffer);
   GST_BUFFER_OFFSET (buffer) = decklinksrc->num_frames;
   if (decklinksrc->num_frames == 0) {
-    GST_BUFFER_FLAG_SET(buffer, GST_BUFFER_FLAG_DISCONT);
+    GST_BUFFER_FLAG_SET (buffer, GST_BUFFER_FLAG_DISCONT);
   }
-  decklinksrc->num_frames ++;
+  decklinksrc->num_frames++;
 
   if (decklinksrc->video_caps == NULL) {
     decklinksrc->video_caps = gst_caps_new_simple ("video/x-raw-yuv",
-        "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC('U','Y','V','Y'),
+        "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC ('U', 'Y', 'V', 'Y'),
         "width", G_TYPE_INT, decklinksrc->width,
         "height", G_TYPE_INT, decklinksrc->height,
         "framerate", GST_TYPE_FRACTION,
         decklinksrc->fps_n, decklinksrc->fps_d,
-        "interlaced", G_TYPE_BOOLEAN, decklinksrc->interlaced,
-        NULL);
+        "interlaced", G_TYPE_BOOLEAN, decklinksrc->interlaced, NULL);
   }
   gst_buffer_set_caps (buffer, decklinksrc->video_caps);
 
   ret = gst_pad_push (decklinksrc->videosrcpad, buffer);
   if (ret != GST_FLOW_OK) {
-    GST_ELEMENT_ERROR(decklinksrc, CORE, NEGOTIATION, (NULL), (NULL));
+    GST_ELEMENT_ERROR (decklinksrc, CORE, NEGOTIATION, (NULL), (NULL));
   }
 
 
-  n_samples = audio_frame->GetSampleFrameCount();
+  n_samples = audio_frame->GetSampleFrameCount ();
   audio_frame->GetBytes (&data);
   audio_buffer = gst_buffer_new_and_alloc (n_samples * 2 * 2);
   memcpy (GST_BUFFER_DATA (audio_buffer), data, n_samples * 2 * 2);
   audio_frame->Release ();
 
   GST_BUFFER_TIMESTAMP (audio_buffer) =
-    gst_util_uint64_scale_int (decklinksrc->num_audio_samples * GST_SECOND,
-        1, 48000);
+      gst_util_uint64_scale_int (decklinksrc->num_audio_samples * GST_SECOND,
+      1, 48000);
   GST_BUFFER_DURATION (audio_buffer) =
-    gst_util_uint64_scale_int ((decklinksrc->num_audio_samples + n_samples) * GST_SECOND,
-        1, 48000) - GST_BUFFER_TIMESTAMP (audio_buffer);
+      gst_util_uint64_scale_int ((decklinksrc->num_audio_samples +
+          n_samples) * GST_SECOND, 1,
+      48000) - GST_BUFFER_TIMESTAMP (audio_buffer);
   decklinksrc->num_audio_samples += n_samples;
 
   if (decklinksrc->audio_caps == NULL) {
@@ -1070,16 +1085,12 @@ gst_decklink_src_task (void *priv)
         "signed", G_TYPE_BOOLEAN, TRUE,
         "depth", G_TYPE_INT, 16,
         "width", G_TYPE_INT, 16,
-        "channels", G_TYPE_INT, 2,
-        "rate", G_TYPE_INT, 48000,
-        NULL);
+        "channels", G_TYPE_INT, 2, "rate", G_TYPE_INT, 48000, NULL);
   }
   gst_buffer_set_caps (audio_buffer, decklinksrc->audio_caps);
 
   ret = gst_pad_push (decklinksrc->audiosrcpad, audio_buffer);
   if (ret != GST_FLOW_OK) {
-    GST_ELEMENT_ERROR(decklinksrc, CORE, NEGOTIATION, (NULL), (NULL));
+    GST_ELEMENT_ERROR (decklinksrc, CORE, NEGOTIATION, (NULL), (NULL));
   }
 }
-
-

From 69c930565f06a1966841c5edde2268c32619a248 Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Sun, 5 Jun 2011 21:24:39 -0700
Subject: [PATCH 009/158] decklink: remove unused code

---
 sys/decklink/capture.cpp | 310 ---------------------------------------
 1 file changed, 310 deletions(-)

diff --git a/sys/decklink/capture.cpp b/sys/decklink/capture.cpp
index ef0f7ba2a9..99bbbb3d12 100644
--- a/sys/decklink/capture.cpp
+++ b/sys/decklink/capture.cpp
@@ -134,313 +134,3 @@ HRESULT
   return S_OK;
 }
 
-#ifdef unused
-int
-usage (int status)
-{
-  HRESULT
-      result;
-  IDeckLinkDisplayMode *
-      displayMode;
-  int
-      displayModeCount = 0;
-
-  fprintf (stderr,
-      "Usage: Capture -m <mode id> [OPTIONS]\n" "\n" "    -m <mode id>:\n");
-
-  while (displayModeIterator->Next (&displayMode) == S_OK) {
-    char *
-        displayModeString = NULL;
-
-    result = displayMode->GetName ((const char **) &displayModeString);
-    if (result == S_OK) {
-      BMDTimeValue
-          frameRateDuration,
-          frameRateScale;
-      displayMode->GetFrameRate (&frameRateDuration, &frameRateScale);
-
-      fprintf (stderr, "        %2d:  %-20s \t %li x %li \t %g FPS\n",
-          displayModeCount, displayModeString, displayMode->GetWidth (),
-          displayMode->GetHeight (),
-          (double) frameRateScale / (double) frameRateDuration);
-
-      free (displayModeString);
-      displayModeCount++;
-    }
-    // Release the IDeckLinkDisplayMode object to prevent a leak
-    displayMode->Release ();
-  }
-
-  fprintf (stderr,
-      "    -p <pixelformat>\n"
-      "         0:  8 bit YUV (4:2:2) (default)\n"
-      "         1:  10 bit YUV (4:2:2)\n"
-      "         2:  10 bit RGB (4:4:4)\n"
-      "    -t <format>          Print timecode\n"
-      "     rp188:  RP 188\n"
-      "      vitc:  VITC\n"
-      "    serial:  Serial Timecode\n"
-      "    -f <filename>        Filename raw video will be written to\n"
-      "    -a <filename>        Filename raw audio will be written to\n"
-      "    -c <channels>        Audio Channels (2, 8 or 16 - default is 2)\n"
-      "    -s <depth>           Audio Sample Depth (16 or 32 - default is 16)\n"
-      "    -n <frames>          Number of frames to capture (default is unlimited)\n"
-      "    -3                   Capture Stereoscopic 3D (Requires 3D Hardware support)\n"
-      "\n"
-      "Capture video and/or audio to a file. Raw video and/or audio can be viewed with mplayer eg:\n"
-      "\n"
-      "    Capture -m2 -n 50 -f video.raw -a audio.raw\n"
-      "    mplayer video.raw -demuxer rawvideo -rawvideo pal:uyvy -audiofile audio.raw -audio-demuxer 20 -rawaudio rate=48000\n");
-
-  exit (status);
-}
-
-int
-main (int argc, char *argv[])
-{
-  IDeckLinkIterator *
-      deckLinkIterator = CreateDeckLinkIteratorInstance ();
-  DeckLinkCaptureDelegate *
-      delegate;
-  IDeckLinkDisplayMode *
-      displayMode;
-  BMDVideoInputFlags
-      inputFlags = 0;
-  BMDDisplayMode
-      selectedDisplayMode = bmdModeNTSC;
-  BMDPixelFormat
-      pixelFormat = bmdFormat8BitYUV;
-  int
-      displayModeCount = 0;
-  int
-      exitStatus = 1;
-  int
-      ch;
-  bool
-      foundDisplayMode = false;
-  HRESULT
-      result;
-
-  pthread_mutex_init (&sleepMutex, NULL);
-  pthread_cond_init (&sleepCond, NULL);
-
-  if (!deckLinkIterator) {
-    fprintf (stderr,
-        "This application requires the DeckLink drivers installed.\n");
-    goto bail;
-  }
-
-  /* Connect to the first DeckLink instance */
-  result = deckLinkIterator->Next (&deckLink);
-  if (result != S_OK) {
-    fprintf (stderr, "No DeckLink PCI cards found.\n");
-    goto bail;
-  }
-
-  if (deckLink->QueryInterface (IID_IDeckLinkInput,
-          (void **) &deckLinkInput) != S_OK)
-    goto bail;
-
-  delegate = new DeckLinkCaptureDelegate ();
-  deckLinkInput->SetCallback (delegate);
-
-  // Obtain an IDeckLinkDisplayModeIterator to enumerate the display modes supported on output
-  result = deckLinkInput->GetDisplayModeIterator (&displayModeIterator);
-  if (result != S_OK) {
-    fprintf (stderr,
-        "Could not obtain the video output display mode iterator - result = %08x\n",
-        result);
-    goto bail;
-  }
-  // Parse command line options
-  while ((ch = getopt (argc, argv, "?h3c:s:f:a:m:n:p:t:")) != -1) {
-    switch (ch) {
-      case 'm':
-        g_videoModeIndex = atoi (optarg);
-        break;
-      case 'c':
-        g_audioChannels = atoi (optarg);
-        if (g_audioChannels != 2 &&
-            g_audioChannels != 8 && g_audioChannels != 16) {
-          fprintf (stderr,
-              "Invalid argument: Audio Channels must be either 2, 8 or 16\n");
-          goto bail;
-        }
-        break;
-      case 's':
-        g_audioSampleDepth = atoi (optarg);
-        if (g_audioSampleDepth != 16 && g_audioSampleDepth != 32) {
-          fprintf (stderr,
-              "Invalid argument: Audio Sample Depth must be either 16 bits or 32 bits\n");
-          goto bail;
-        }
-        break;
-      case 'f':
-        g_videoOutputFile = optarg;
-        break;
-      case 'a':
-        g_audioOutputFile = optarg;
-        break;
-      case 'n':
-        g_maxFrames = atoi (optarg);
-        break;
-      case '3':
-        inputFlags |= bmdVideoInputDualStream3D;
-        break;
-      case 'p':
-        switch (atoi (optarg)) {
-          case 0:
-            pixelFormat = bmdFormat8BitYUV;
-            break;
-          case 1:
-            pixelFormat = bmdFormat10BitYUV;
-            break;
-          case 2:
-            pixelFormat = bmdFormat10BitRGB;
-            break;
-          default:
-            fprintf (stderr, "Invalid argument: Pixel format %d is not valid",
-                atoi (optarg));
-            goto bail;
-        }
-        break;
-      case 't':
-        if (!strcmp (optarg, "rp188"))
-          g_timecodeFormat = bmdTimecodeRP188;
-        else if (!strcmp (optarg, "vitc"))
-          g_timecodeFormat = bmdTimecodeVITC;
-        else if (!strcmp (optarg, "serial"))
-          g_timecodeFormat = bmdTimecodeSerial;
-        else {
-          fprintf (stderr,
-              "Invalid argument: Timecode format \"%s\" is invalid\n", optarg);
-          goto bail;
-        }
-        break;
-      case '?':
-      case 'h':
-        usage (0);
-    }
-  }
-
-  if (g_videoModeIndex < 0) {
-    fprintf (stderr, "No video mode specified\n");
-    usage (0);
-  }
-
-  if (g_videoOutputFile != NULL) {
-    videoOutputFile =
-        open (g_videoOutputFile, O_WRONLY | O_CREAT | O_TRUNC, 0664);
-    if (videoOutputFile < 0) {
-      fprintf (stderr, "Could not open video output file \"%s\"\n",
-          g_videoOutputFile);
-      goto bail;
-    }
-  }
-  if (g_audioOutputFile != NULL) {
-    audioOutputFile =
-        open (g_audioOutputFile, O_WRONLY | O_CREAT | O_TRUNC, 0664);
-    if (audioOutputFile < 0) {
-      fprintf (stderr, "Could not open audio output file \"%s\"\n",
-          g_audioOutputFile);
-      goto bail;
-    }
-  }
-
-  while (displayModeIterator->Next (&displayMode) == S_OK) {
-    if (g_videoModeIndex == displayModeCount) {
-      BMDDisplayModeSupport
-          result;
-      const char *
-          displayModeName;
-
-      foundDisplayMode = true;
-      displayMode->GetName (&displayModeName);
-      selectedDisplayMode = displayMode->GetDisplayMode ();
-
-      deckLinkInput->DoesSupportVideoMode (selectedDisplayMode, pixelFormat,
-          bmdVideoInputFlagDefault, &result, NULL);
-
-      if (result == bmdDisplayModeNotSupported) {
-        fprintf (stderr,
-            "The display mode %s is not supported with the selected pixel format\n",
-            displayModeName);
-        goto bail;
-      }
-
-      if (inputFlags & bmdVideoInputDualStream3D) {
-        if (!(displayMode->GetFlags () & bmdDisplayModeSupports3D)) {
-          fprintf (stderr, "The display mode %s is not supported with 3D\n",
-              displayModeName);
-          goto bail;
-        }
-      }
-
-      break;
-    }
-    displayModeCount++;
-    displayMode->Release ();
-  }
-
-  if (!foundDisplayMode) {
-    fprintf (stderr, "Invalid mode %d specified\n", g_videoModeIndex);
-    goto bail;
-  }
-
-  result =
-      deckLinkInput->EnableVideoInput (selectedDisplayMode, pixelFormat,
-      inputFlags);
-  if (result != S_OK) {
-    fprintf (stderr,
-        "Failed to enable video input. Is another application using the card?\n");
-    goto bail;
-  }
-
-  result =
-      deckLinkInput->EnableAudioInput (bmdAudioSampleRate48kHz,
-      g_audioSampleDepth, g_audioChannels);
-  if (result != S_OK) {
-    goto bail;
-  }
-
-  result = deckLinkInput->StartStreams ();
-  if (result != S_OK) {
-    goto bail;
-  }
-  // All Okay.
-  exitStatus = 0;
-
-  // Block main thread until signal occurs
-  pthread_mutex_lock (&sleepMutex);
-  pthread_cond_wait (&sleepCond, &sleepMutex);
-  pthread_mutex_unlock (&sleepMutex);
-  fprintf (stderr, "Stopping Capture\n");
-
-bail:
-
-  if (videoOutputFile)
-    close (videoOutputFile);
-  if (audioOutputFile)
-    close (audioOutputFile);
-
-  if (displayModeIterator != NULL) {
-    displayModeIterator->Release ();
-    displayModeIterator = NULL;
-  }
-
-  if (deckLinkInput != NULL) {
-    deckLinkInput->Release ();
-    deckLinkInput = NULL;
-  }
-
-  if (deckLink != NULL) {
-    deckLink->Release ();
-    deckLink = NULL;
-  }
-
-  if (deckLinkIterator != NULL)
-    deckLinkIterator->Release ();
-
-  return exitStatus;
-}
-#endif

From 1faf410ca3df1b4e97e9d3ec761c47966d622cf8 Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Sun, 5 Jun 2011 21:24:58 -0700
Subject: [PATCH 010/158] decklink: Add various features

Better mode support, input source property, audio support.
---
 sys/decklink/capture.cpp         |  17 ++-
 sys/decklink/gstdecklink.cpp     |  63 +++++++++
 sys/decklink/gstdecklink.h       |  76 +++++++++++
 sys/decklink/gstdecklinksink.cpp | 148 ++++++--------------
 sys/decklink/gstdecklinksink.h   |   9 +-
 sys/decklink/gstdecklinksrc.cpp  | 223 +++++++++++++++----------------
 sys/decklink/gstdecklinksrc.h    |   4 +-
 7 files changed, 302 insertions(+), 238 deletions(-)
 create mode 100644 sys/decklink/gstdecklink.h

diff --git a/sys/decklink/capture.cpp b/sys/decklink/capture.cpp
index 99bbbb3d12..83567e9849 100644
--- a/sys/decklink/capture.cpp
+++ b/sys/decklink/capture.cpp
@@ -57,8 +57,7 @@ DeckLinkCaptureDelegate::~DeckLinkCaptureDelegate ()
   pthread_mutex_destroy (&m_mutex);
 }
 
-ULONG
-DeckLinkCaptureDelegate::AddRef (void)
+ULONG DeckLinkCaptureDelegate::AddRef (void)
 {
   pthread_mutex_lock (&m_mutex);
   m_refCount++;
@@ -67,15 +66,15 @@ DeckLinkCaptureDelegate::AddRef (void)
   return (ULONG) m_refCount;
 }
 
-ULONG
-DeckLinkCaptureDelegate::Release (void)
+ULONG DeckLinkCaptureDelegate::Release (void)
 {
   pthread_mutex_lock (&m_mutex);
   m_refCount--;
   pthread_mutex_unlock (&m_mutex);
 
   if (m_refCount == 0) {
-    delete this;
+    delete
+        this;
     return 0;
   }
 
@@ -86,7 +85,12 @@ HRESULT
     DeckLinkCaptureDelegate::VideoInputFrameArrived (IDeckLinkVideoInputFrame *
     videoFrame, IDeckLinkAudioInputPacket * audioFrame)
 {
-  GstDecklinkSrc *decklinksrc = GST_DECKLINK_SRC (priv);
+  GstDecklinkSrc *decklinksrc;
+
+  g_return_val_if_fail (priv != NULL, S_OK);
+  g_return_val_if_fail (GST_IS_DECKLINK_SRC (priv), S_OK);
+
+  decklinksrc = GST_DECKLINK_SRC (priv);
 
   // Handle Video Frame
   if (videoFrame) {
@@ -133,4 +137,3 @@ HRESULT
   GST_ERROR ("moo");
   return S_OK;
 }
-
diff --git a/sys/decklink/gstdecklink.cpp b/sys/decklink/gstdecklink.cpp
index 4d4ed445ae..122bc70b2d 100644
--- a/sys/decklink/gstdecklink.cpp
+++ b/sys/decklink/gstdecklink.cpp
@@ -22,9 +22,72 @@
 #endif
 
 #include <gst/gst.h>
+#include "gstdecklink.h"
 #include "gstdecklinksrc.h"
 #include "gstdecklinksink.h"
 
+GType
+gst_decklink_mode_get_type (void)
+{
+  static GType type;
+
+  if (!type) {
+    static const GEnumValue modes[] = {
+      {GST_DECKLINK_MODE_NTSC, "ntsc", "NTSC SD 60i"},
+      {GST_DECKLINK_MODE_PAL, "pal", "PAL SD 50i"},
+      {GST_DECKLINK_MODE_1080i50, "1080i50", "HD1080 50i"},
+      {GST_DECKLINK_MODE_1080i60, "1080i60", "HD1080 60i"},
+      {GST_DECKLINK_MODE_720p50, "720p50", "HD720 50p"},
+      {GST_DECKLINK_MODE_720p60, "720p60", "HD720 60p"},
+      {0, NULL, NULL}
+    };
+
+    type = g_enum_register_static ("GstDecklinkModes", modes);
+  }
+  return type;
+}
+
+static const GstDecklinkMode modes[] = {
+  {bmdModeNTSC, 720, 486, 30000, 1001, true},
+  {bmdModePAL, 720, 576, 25, 1, true},
+  {bmdModeHD1080i50, 1920, 1080, 25, 1, true},
+  {bmdModeHD1080i5994, 1920, 1080, 30000, 1001, true},
+  {bmdModeHD720p50, 1280, 720, 50, 1, true},
+  {bmdModeHD720p5994, 1280, 720, 60000, 1001, true}
+};
+
+#if 0
+  //{ bmdModeNTSC2398, 720,486,24000,1001,true },
+  //{ bmdModeHD1080p2398, 1920,1080,24000,1001,false },
+  //{ bmdModeHD1080p24, 1920,1080,24,1,false },
+  //{ bmdModeHD1080p25, 1920,1080,25,1,false },
+  //{ bmdModeHD1080p2997, 1920,1080,30000,1001,false },
+  //{ bmdModeHD1080p30, 1920,1080,30,1,false },
+  //{ bmdModeHD1080i6000, 1920,1080,30,1,true },
+  //{ bmdModeHD720p60, 1280,720,60,1,true }
+#endif
+
+const GstDecklinkMode *
+gst_decklink_get_mode (GstDecklinkModeEnum e)
+{
+  return &modes[e];
+}
+
+GstCaps *
+gst_decklink_mode_get_caps (GstDecklinkModeEnum e)
+{
+  const GstDecklinkMode *mode = &modes[e];
+
+  return gst_caps_new_simple ("video/x-raw-yuv",
+      "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC ('U', 'Y', 'V', 'Y'),
+      "width", G_TYPE_INT, mode->width,
+      "height", G_TYPE_INT, mode->height,
+      "framerate", GST_TYPE_FRACTION,
+      mode->fps_n, mode->fps_d,
+      "interlaced", G_TYPE_BOOLEAN, mode->interlaced, NULL);
+}
+
+
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
diff --git a/sys/decklink/gstdecklink.h b/sys/decklink/gstdecklink.h
new file mode 100644
index 0000000000..ab5b5647a9
--- /dev/null
+++ b/sys/decklink/gstdecklink.h
@@ -0,0 +1,76 @@
+/* GStreamer
+ * Copyright (C) 2011 David Schleef <ds@schleef.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.
+ */
+
+#ifndef _GST_DECKLINK_H_
+#define _GST_DECKLINK_H_
+
+#include <gst/gst.h>
+#include "DeckLinkAPI.h"
+
+
+typedef enum {
+  GST_DECKLINK_MODE_NTSC,
+  GST_DECKLINK_MODE_PAL,
+  GST_DECKLINK_MODE_1080i50,
+  GST_DECKLINK_MODE_1080i60,
+  GST_DECKLINK_MODE_720p50,
+  GST_DECKLINK_MODE_720p60
+} GstDecklinkModeEnum;
+#define GST_TYPE_DECKLINK_MODE (gst_decklink_mode_get_type ())
+GType gst_decklink_mode_get_type (void);
+
+
+typedef struct _GstDecklinkMode GstDecklinkMode;
+struct _GstDecklinkMode {
+  BMDDisplayMode mode;
+  int width;
+  int height;
+  int fps_n;
+  int fps_d;
+  gboolean interlaced;
+};
+
+const GstDecklinkMode * gst_decklink_get_mode (GstDecklinkModeEnum e);
+GstCaps * gst_decklink_mode_get_caps (GstDecklinkModeEnum e);
+
+#define GST_DECKLINK_MODE_CAPS(w,h,n,d,i) \
+  "video/x-raw-yuv,format=(fourcc)UYVY,width=" #w ",height=" #h \
+  ",framerate=" #n "/" #d ",interlaced=" #i
+
+#define GST_DECKLINK_CAPS \
+  GST_DECKLINK_MODE_CAPS(720,486,30000,1001,true) ";" \
+  GST_DECKLINK_MODE_CAPS(720,576,25,1,true) ";" \
+  GST_DECKLINK_MODE_CAPS(1920,1080,25,1,true) ";" \
+  GST_DECKLINK_MODE_CAPS(1920,1080,30000,1001,true) ";" \
+  GST_DECKLINK_MODE_CAPS(1280,720,50,1,true) ";" \
+  GST_DECKLINK_MODE_CAPS(1280,720,60000,1001,true)
+
+#if 0
+  MODE(720,486,24000,1001,true) ";" \
+  MODE(1920,1080,24000,1001,false) ";" \
+  MODE(1920,1080,24,1,false) ";" \
+  MODE(1920,1080,25,1,false) ";" \
+  MODE(1920,1080,30000,1001,false) ";" \
+  MODE(1920,1080,30,1,false) ";" \
+  MODE(1920,1080,30,1,true) ";" \
+  MODE(1280,720,60,1,true)
+#endif
+
+
+#endif
diff --git a/sys/decklink/gstdecklinksink.cpp b/sys/decklink/gstdecklinksink.cpp
index 5f84ddf459..868dd3f978 100644
--- a/sys/decklink/gstdecklinksink.cpp
+++ b/sys/decklink/gstdecklinksink.cpp
@@ -36,6 +36,7 @@
 
 #include <gst/gst.h>
 #include <gst/gst.h>
+#include "gstdecklink.h"
 #include "gstdecklinksink.h"
 #include <string.h>
 
@@ -118,82 +119,25 @@ static GstIterator *gst_decklink_sink_audiosink_iterintlink (GstPad * pad);
 
 enum
 {
-  PROP_0
+  PROP_0,
+  PROP_MODE
 };
 
 /* pad templates */
 
-#define MODE(w,h,n,d,i) \
-  "video/x-raw-yuv,format=(fourcc)UYVY,width=" #w ",height=" #h \
-  ",framerate=" #n "/" #d ",interlaced=" #i
-
 static GstStaticPadTemplate gst_decklink_sink_videosink_template =
 GST_STATIC_PAD_TEMPLATE ("videosink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (MODE (720, 486, 30000, 1001, true)
-    ));
-#if 0
-MODE (720, 486, 24000, 1001, true) ";"
-MODE (720, 576, 25, 1, true)
-    ";"
-MODE (1920, 1080, 24000, 1001, false)
-    ";"
-MODE (1920, 1080, 24, 1, false)
-    ";"
-MODE (1920, 1080, 25, 1, false)
-    ";"
-MODE (1920, 1080, 30000, 1001, false)
-    ";"
-MODE (1920, 1080, 30, 1, false)
-    ";"
-MODE (1920, 1080, 25, 1, true)
-    ";"
-MODE (1920, 1080, 30000, 1001, true)
-    ";"
-MODE (1920, 1080, 30, 1, true)
-    ";"
-MODE (1280, 720, 50, 1, true)
-    ";"
-MODE (1280, 720, 60000, 1001, true)
-    ";"
-MODE (1280, 720, 60, 1, true)
-#endif
-     static GstStaticPadTemplate gst_decklink_sink_audiosink_template =
-         GST_STATIC_PAD_TEMPLATE ("audiosink",
+    GST_STATIC_CAPS (GST_DECKLINK_CAPS));
+
+static GstStaticPadTemplate gst_decklink_sink_audiosink_template =
+GST_STATIC_PAD_TEMPLATE ("audiosink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("audio/x-raw-int,width=16,depth=16,channels=2,rate=48000")
     );
 
-     typedef struct _DecklinkMode DecklinkMode;
-     struct _DecklinkMode
-     {
-       BMDDisplayMode mode;
-       int width;
-       int height;
-       int fps_n;
-       int fps_d;
-       gboolean interlaced;
-     };
-
-     static DecklinkMode modes[] = {
-       {bmdModeNTSC, 720, 486, 30000, 1001, true},
-       {bmdModeNTSC2398, 720, 486, 24000, 1001, true},
-       {bmdModePAL, 720, 576, 25, 1, true},
-       {bmdModeHD1080p2398, 1920, 1080, 24000, 1001, false},
-       {bmdModeHD1080p24, 1920, 1080, 24, 1, false},
-       {bmdModeHD1080p25, 1920, 1080, 25, 1, false},
-       {bmdModeHD1080p2997, 1920, 1080, 30000, 1001, false},
-       {bmdModeHD1080p30, 1920, 1080, 30, 1, false},
-       {bmdModeHD1080i50, 1920, 1080, 25, 1, true},
-       {bmdModeHD1080i5994, 1920, 1080, 30000, 1001, true},
-       {bmdModeHD1080i6000, 1920, 1080, 30, 1, true},
-       {bmdModeHD720p50, 1280, 720, 50, 1, true},
-       {bmdModeHD720p5994, 1280, 720, 60000, 1001, true},
-       {bmdModeHD720p60, 1280, 720, 60, 1, true}
-     };
-
 
 /* class initialization */
 
@@ -238,6 +182,12 @@ gst_decklink_sink_class_init (GstDecklinkSinkClass * klass)
   element_class->send_event = GST_DEBUG_FUNCPTR (gst_decklink_sink_send_event);
   element_class->query = GST_DEBUG_FUNCPTR (gst_decklink_sink_query);
 
+  g_object_class_install_property (gobject_class, PROP_MODE,
+      g_param_spec_enum ("mode", "Mode", "Mode",
+          GST_TYPE_DECKLINK_MODE, GST_DECKLINK_MODE_NTSC,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+              G_PARAM_CONSTRUCT)));
+
 }
 
 static void
@@ -313,14 +263,7 @@ gst_decklink_sink_init (GstDecklinkSink * decklinksink,
   decklinksink->cond = g_cond_new ();
   decklinksink->mutex = g_mutex_new ();
 
-  decklinksink->mode = 0;
-
-  decklinksink->width = modes[decklinksink->mode].width;
-  decklinksink->height = modes[decklinksink->mode].height;
-  decklinksink->fps_n = modes[decklinksink->mode].fps_n;
-  decklinksink->fps_d = modes[decklinksink->mode].fps_d;
-  decklinksink->interlaced = modes[decklinksink->mode].interlaced;
-  decklinksink->bmd_mode = modes[decklinksink->mode].mode;
+  decklinksink->mode = GST_DECKLINK_MODE_NTSC;
 
   decklinksink->callback = new Output;
   decklinksink->callback->decklinksink = decklinksink;
@@ -330,9 +273,15 @@ void
 gst_decklink_sink_set_property (GObject * object, guint property_id,
     const GValue * value, GParamSpec * pspec)
 {
+  GstDecklinkSink *decklinksink;
+
   g_return_if_fail (GST_IS_DECKLINK_SINK (object));
+  decklinksink = GST_DECKLINK_SINK (object);
 
   switch (property_id) {
+    case PROP_MODE:
+      decklinksink->mode = (GstDecklinkModeEnum) g_value_get_enum (value);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
@@ -343,9 +292,15 @@ void
 gst_decklink_sink_get_property (GObject * object, guint property_id,
     GValue * value, GParamSpec * pspec)
 {
+  GstDecklinkSink *decklinksink;
+
   g_return_if_fail (GST_IS_DECKLINK_SINK (object));
+  decklinksink = GST_DECKLINK_SINK (object);
 
   switch (property_id) {
+    case PROP_MODE:
+      g_value_set_enum (value, decklinksink->mode);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
@@ -384,10 +339,7 @@ gst_decklink_sink_start (GstDecklinkSink * decklinksink)
 {
   IDeckLinkIterator *iterator;
   HRESULT ret;
-  IDeckLinkDisplayModeIterator *mode_iterator;
-  IDeckLinkDisplayMode *mode;
-  BMDTimeValue fps_n;
-  BMDTimeScale fps_d;
+  const GstDecklinkMode *mode;
 
   iterator = CreateDeckLinkIteratorInstance ();
   if (iterator == NULL) {
@@ -410,29 +362,9 @@ gst_decklink_sink_start (GstDecklinkSink * decklinksink)
 
   decklinksink->output->SetAudioCallback (decklinksink->callback);
 
-  ret = decklinksink->output->GetDisplayModeIterator (&mode_iterator);
-  if (ret != S_OK) {
-    GST_ERROR ("failed to get display mode iterator");
-    return FALSE;
-  }
+  mode = gst_decklink_get_mode (decklinksink->mode);
 
-  while (mode_iterator->Next (&mode) == S_OK) {
-    break;
-  }
-  if (!mode) {
-    GST_ERROR ("bad mode");
-    return FALSE;
-  }
-
-  decklinksink->width = mode->GetWidth ();
-  decklinksink->height = mode->GetHeight ();
-  mode->GetFrameRate (&fps_n, &fps_d);
-  decklinksink->fps_n = fps_n;
-  decklinksink->fps_d = fps_d;
-
-  decklinksink->display_mode = mode->GetDisplayMode ();
-
-  ret = decklinksink->output->EnableVideoOutput (decklinksink->display_mode,
+  ret = decklinksink->output->EnableVideoOutput (mode->mode,
       bmdVideoOutputFlagDefault);
   if (ret != S_OK) {
     GST_ERROR ("failed to enable video output");
@@ -440,8 +372,8 @@ gst_decklink_sink_start (GstDecklinkSink * decklinksink)
   }
   //decklinksink->video_enabled = TRUE;
 
-  decklinksink->output->
-      SetScheduledFrameCompletionCallback (decklinksink->callback);
+  decklinksink->output->SetScheduledFrameCompletionCallback (decklinksink->
+      callback);
 
   if (0) {
     ret = decklinksink->output->EnableAudioOutput (bmdAudioSampleRate48kHz,
@@ -573,7 +505,7 @@ gst_decklink_sink_videosink_getcaps (GstPad * pad)
 
   GST_DEBUG_OBJECT (decklinksink, "getcaps");
 
-  caps = gst_caps_copy (gst_pad_get_pad_template_caps (pad));
+  caps = gst_decklink_mode_get_caps (decklinksink->mode);
 
   gst_object_unref (decklinksink);
   return caps;
@@ -678,6 +610,7 @@ gst_decklink_sink_videosink_chain (GstPad * pad, GstBuffer * buffer)
   IDeckLinkMutableVideoFrame *frame;
   void *data;
   GstFlowReturn ret;
+  const GstDecklinkMode *mode;
 
   decklinksink = GST_DECKLINK_SINK (gst_pad_get_parent (pad));
 
@@ -696,8 +629,10 @@ gst_decklink_sink_videosink_chain (GstPad * pad, GstBuffer * buffer)
   }
 #endif
 
-  decklinksink->output->CreateVideoFrame (decklinksink->width,
-      decklinksink->height, decklinksink->width * 2, bmdFormat8BitYUV,
+  mode = gst_decklink_get_mode (decklinksink->mode);
+
+  decklinksink->output->CreateVideoFrame (mode->width,
+      mode->height, mode->width * 2, bmdFormat8BitYUV,
       bmdFrameFlagDefault, &frame);
 
   frame->GetBytes (&data);
@@ -715,8 +650,7 @@ gst_decklink_sink_videosink_chain (GstPad * pad, GstBuffer * buffer)
 
   if (!decklinksink->stop) {
     decklinksink->output->ScheduleVideoFrame (frame,
-        decklinksink->num_frames * decklinksink->fps_n,
-        decklinksink->fps_n, decklinksink->fps_d);
+        decklinksink->num_frames * mode->fps_d, mode->fps_d, mode->fps_n);
     decklinksink->num_frames++;
 
     if (!decklinksink->sched_started) {
@@ -1050,15 +984,13 @@ HRESULT
   return S_OK;
 }
 
-HRESULT
-Output::ScheduledPlaybackHasStopped ()
+HRESULT Output::ScheduledPlaybackHasStopped ()
 {
   GST_ERROR ("ScheduledPlaybackHasStopped");
   return S_OK;
 }
 
-HRESULT
-Output::RenderAudioSamples (bool preroll)
+HRESULT Output::RenderAudioSamples (bool preroll)
 {
   GST_ERROR ("RenderAudioSamples");
 
diff --git a/sys/decklink/gstdecklinksink.h b/sys/decklink/gstdecklinksink.h
index 2f0d1d799b..e5b7765874 100644
--- a/sys/decklink/gstdecklinksink.h
+++ b/sys/decklink/gstdecklinksink.h
@@ -21,6 +21,7 @@
 #define _GST_DECKLINK_SINK_H_
 
 #include <gst/gst.h>
+#include "gstdecklink.h"
 #include "DeckLinkAPI.h"
 
 G_BEGIN_DECLS
@@ -68,15 +69,9 @@ struct _GstDecklinkSink
   gboolean sched_started;
 
   int num_frames;
-  int fps_n;
-  int fps_d;
-  int width;
-  int height;
-  gboolean interlaced;
-  BMDDisplayMode bmd_mode;
 
   /* properties */
-  int mode;
+  GstDecklinkModeEnum mode;
 
 };
 
diff --git a/sys/decklink/gstdecklinksrc.cpp b/sys/decklink/gstdecklinksrc.cpp
index f2959aeca2..f5a22f15e2 100644
--- a/sys/decklink/gstdecklinksrc.cpp
+++ b/sys/decklink/gstdecklinksrc.cpp
@@ -36,6 +36,7 @@
 #endif
 
 #include <gst/gst.h>
+#include "gstdecklink.h"
 #include "gstdecklinksrc.h"
 #include "capture.h"
 #include <string.h>
@@ -116,7 +117,9 @@ static void gst_decklink_src_task (void *priv);
 
 enum
 {
-  PROP_0
+  PROP_0,
+  PROP_MODE,
+  PROP_OPTICAL
 };
 
 /* pad templates */
@@ -128,57 +131,11 @@ GST_STATIC_PAD_TEMPLATE ("audiosrc",
     GST_STATIC_CAPS ("audio/x-raw-int,width=16,depth=16,channels=2,rate=48000")
     );
 
-#define MODE(w,h,n,d,i) \
-  "video/x-raw-yuv,format=(fourcc)UYVY,width=" #w ",height=" #h \
-  ",framerate=" #n "/" #d ",interlaced=" #i
-
 static GstStaticPadTemplate gst_decklink_src_video_src_template =
-    GST_STATIC_PAD_TEMPLATE ("videosrc",
+GST_STATIC_PAD_TEMPLATE ("videosrc",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (MODE (720, 486, 30000, 1001, true) ";"
-        MODE (720, 486, 24000, 1001, true) ";"
-        MODE (720, 576, 25, 1, true) ";"
-        MODE (1920, 1080, 24000, 1001, false) ";"
-        MODE (1920, 1080, 24, 1, false) ";"
-        MODE (1920, 1080, 25, 1, false) ";"
-        MODE (1920, 1080, 30000, 1001, false) ";"
-        MODE (1920, 1080, 30, 1, false) ";"
-        MODE (1920, 1080, 25, 1, true) ";"
-        MODE (1920, 1080, 30000, 1001, true) ";"
-        MODE (1920, 1080, 30, 1, true) ";"
-        MODE (1280, 720, 50, 1, true) ";"
-        MODE (1280, 720, 60000, 1001, true) ";" MODE (1280, 720, 60, 1, true)
-    ));
-
-typedef struct _DecklinkMode DecklinkMode;
-struct _DecklinkMode
-{
-  BMDDisplayMode mode;
-  int width;
-  int height;
-  int fps_n;
-  int fps_d;
-  gboolean interlaced;
-};
-
-static DecklinkMode modes[] = {
-  {bmdModeNTSC, 720, 486, 30000, 1001, true},
-  {bmdModeNTSC2398, 720, 486, 24000, 1001, true},
-  {bmdModePAL, 720, 576, 25, 1, true},
-  {bmdModeHD1080p2398, 1920, 1080, 24000, 1001, false},
-  {bmdModeHD1080p24, 1920, 1080, 24, 1, false},
-  {bmdModeHD1080p25, 1920, 1080, 25, 1, false},
-  {bmdModeHD1080p2997, 1920, 1080, 30000, 1001, false},
-  {bmdModeHD1080p30, 1920, 1080, 30, 1, false},
-  {bmdModeHD1080i50, 1920, 1080, 25, 1, true},
-  {bmdModeHD1080i5994, 1920, 1080, 30000, 1001, true},
-  {bmdModeHD1080i6000, 1920, 1080, 30, 1, true},
-  {bmdModeHD720p50, 1280, 720, 50, 1, true},
-  {bmdModeHD720p5994, 1280, 720, 60000, 1001, true},
-  {bmdModeHD720p60, 1280, 720, 60, 1, true}
-};
-
+    GST_STATIC_CAPS (GST_DECKLINK_CAPS));
 
 /* class initialization */
 
@@ -226,6 +183,17 @@ gst_decklink_src_class_init (GstDecklinkSrcClass * klass)
   element_class->send_event = GST_DEBUG_FUNCPTR (gst_decklink_src_send_event);
   element_class->query = GST_DEBUG_FUNCPTR (gst_decklink_src_query);
 
+  g_object_class_install_property (gobject_class, PROP_MODE,
+      g_param_spec_enum ("mode", "Mode", "Mode",
+          GST_TYPE_DECKLINK_MODE, GST_DECKLINK_MODE_NTSC,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+              G_PARAM_CONSTRUCT)));
+
+  g_object_class_install_property (gobject_class, PROP_OPTICAL,
+      g_param_spec_boolean ("optical", "Optical", "Optical",
+          TRUE,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+              G_PARAM_CONSTRUCT)));
 }
 
 static void
@@ -301,14 +269,7 @@ gst_decklink_src_init (GstDecklinkSrc * decklinksrc,
   decklinksrc->mutex = g_mutex_new ();
 
   decklinksrc->copy_data = TRUE;
-  decklinksrc->mode = 0;
-
-  decklinksrc->width = modes[decklinksrc->mode].width;
-  decklinksrc->height = modes[decklinksrc->mode].height;
-  decklinksrc->fps_n = modes[decklinksrc->mode].fps_n;
-  decklinksrc->fps_d = modes[decklinksrc->mode].fps_d;
-  decklinksrc->interlaced = modes[decklinksrc->mode].interlaced;
-  decklinksrc->bmd_mode = modes[decklinksrc->mode].mode;
+  decklinksrc->mode = GST_DECKLINK_MODE_NTSC;
 
 }
 
@@ -316,9 +277,18 @@ void
 gst_decklink_src_set_property (GObject * object, guint property_id,
     const GValue * value, GParamSpec * pspec)
 {
+  GstDecklinkSrc *decklinksrc;
+
   g_return_if_fail (GST_IS_DECKLINK_SRC (object));
+  decklinksrc = GST_DECKLINK_SRC (object);
 
   switch (property_id) {
+    case PROP_MODE:
+      decklinksrc->mode = (GstDecklinkModeEnum) g_value_get_enum (value);
+      break;
+    case PROP_OPTICAL:
+      decklinksrc->optical = g_value_get_boolean (value);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
@@ -329,9 +299,18 @@ void
 gst_decklink_src_get_property (GObject * object, guint property_id,
     GValue * value, GParamSpec * pspec)
 {
+  GstDecklinkSrc *decklinksrc;
+
   g_return_if_fail (GST_IS_DECKLINK_SRC (object));
+  decklinksrc = GST_DECKLINK_SRC (object);
 
   switch (property_id) {
+    case PROP_MODE:
+      g_value_set_enum (value, decklinksrc->mode);
+      break;
+    case PROP_OPTICAL:
+      g_value_set_boolean (value, decklinksrc->optical);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
@@ -394,15 +373,13 @@ gst_decklink_src_start (GstElement * element)
   GstDecklinkSrc *decklinksrc = GST_DECKLINK_SRC (element);
   IDeckLinkIterator *iterator;
   DeckLinkCaptureDelegate *delegate;
-  IDeckLinkDisplayModeIterator *mode_iterator;
-  IDeckLinkDisplayMode *mode;
-  int i;
+  //IDeckLinkDisplayModeIterator *mode_iterator;
+  //IDeckLinkDisplayMode *mode;
   int sample_depth;
   int channels;
-  BMDVideoInputFlags input_flags;
-  BMDDisplayMode selected_mode;
-  BMDPixelFormat pixel_format;
   HRESULT ret;
+  const GstDecklinkMode *mode;
+  IDeckLinkConfiguration *config;
 
   GST_DEBUG_OBJECT (decklinksrc, "start");
 
@@ -429,6 +406,21 @@ gst_decklink_src_start (GstElement * element)
   delegate->priv = decklinksrc;
   decklinksrc->input->SetCallback (delegate);
 
+  ret = decklinksrc->decklink->QueryInterface (IID_IDeckLinkConfiguration,
+      (void **) &config);
+  if (ret != S_OK) {
+    GST_ERROR ("query interface failed");
+    return FALSE;
+  }
+
+  ret = config->SetInt (bmdDeckLinkConfigVideoInputConnection,
+      decklinksrc->optical ? bmdVideoConnectionOpticalSDI :
+      bmdVideoConnectionSDI);
+  if (ret != S_OK) {
+    GST_ERROR ("set configuration (input source)");
+    return FALSE;
+  }
+#if 0
   ret = decklinksrc->input->GetDisplayModeIterator (&mode_iterator);
   if (ret != S_OK) {
     GST_ERROR ("failed to get display mode iterator");
@@ -441,17 +433,16 @@ gst_decklink_src_start (GstElement * element)
 
     mode->GetName (&mode_name);
 
-    GST_ERROR ("%d: mode name: %s", i, mode_name);
+    GST_DEBUG ("%d: mode name: %s", i, mode_name);
 
     mode->Release ();
     i++;
   }
+#endif
 
-  pixel_format = bmdFormat8BitYUV;
-  selected_mode = decklinksrc->bmd_mode;
-  input_flags = 0;
-  ret = decklinksrc->input->EnableVideoInput (selected_mode, pixel_format,
-      input_flags);
+  mode = gst_decklink_get_mode (decklinksrc->mode);
+
+  ret = decklinksrc->input->EnableVideoInput (mode->mode, bmdFormat8BitYUV, 0);
   if (ret != S_OK) {
     GST_ERROR ("enable video input failed");
     return FALSE;
@@ -459,8 +450,7 @@ gst_decklink_src_start (GstElement * element)
 
   sample_depth = 16;
   channels = 2;
-  ret =
-      decklinksrc->input->EnableAudioInput (bmdAudioSampleRate48kHz,
+  ret = decklinksrc->input->EnableAudioInput (bmdAudioSampleRate48kHz,
       sample_depth, channels);
   if (ret != S_OK) {
     GST_ERROR ("enable video input failed");
@@ -494,6 +484,13 @@ gst_decklink_src_stop (GstElement * element)
 
   gst_task_join (decklinksrc->task);
 
+  decklinksrc->input->StopStreams ();
+  decklinksrc->input->DisableVideoInput ();
+  decklinksrc->input->DisableAudioInput ();
+
+  decklinksrc->input->Release ();
+  decklinksrc->input = NULL;
+
   return TRUE;
 }
 
@@ -788,7 +785,7 @@ gst_decklink_src_video_src_getcaps (GstPad * pad)
 
   GST_DEBUG_OBJECT (decklinksrc, "getcaps");
 
-  caps = gst_caps_copy (gst_pad_get_pad_template_caps (pad));
+  caps = gst_decklink_mode_get_caps (decklinksrc->mode);
 
   gst_object_unref (decklinksrc);
   return caps;
@@ -991,6 +988,7 @@ gst_decklink_src_task (void *priv)
   void *data;
   int n_samples;
   GstFlowReturn ret;
+  const GstDecklinkMode *mode;
 
   GST_DEBUG_OBJECT (decklinksrc, "task");
 
@@ -1006,7 +1004,7 @@ gst_decklink_src_task (void *priv)
   g_mutex_unlock (decklinksrc->mutex);
 
   if (decklinksrc->stop) {
-    GST_ERROR ("stopping task");
+    GST_DEBUG ("stopping task");
     return;
   }
 
@@ -1016,18 +1014,18 @@ gst_decklink_src_task (void *priv)
     return;
   }
 
+  mode = gst_decklink_get_mode (decklinksrc->mode);
+
   video_frame->GetBytes (&data);
   if (decklinksrc->copy_data) {
-    buffer =
-        gst_buffer_new_and_alloc (decklinksrc->width * decklinksrc->height * 2);
+    buffer = gst_buffer_new_and_alloc (mode->width * mode->height * 2);
 
-    memcpy (GST_BUFFER_DATA (buffer), data,
-        decklinksrc->width * decklinksrc->height * 2);
+    memcpy (GST_BUFFER_DATA (buffer), data, mode->width * mode->height * 2);
 
     video_frame->Release ();
   } else {
     buffer = gst_buffer_new ();
-    GST_BUFFER_SIZE (buffer) = decklinksrc->width * decklinksrc->height * 2;
+    GST_BUFFER_SIZE (buffer) = mode->width * mode->height * 2;
 
     GST_BUFFER_DATA (buffer) = (guint8 *) data;
 
@@ -1037,10 +1035,10 @@ gst_decklink_src_task (void *priv)
 
   GST_BUFFER_TIMESTAMP (buffer) =
       gst_util_uint64_scale_int (decklinksrc->num_frames * GST_SECOND,
-      decklinksrc->fps_d, decklinksrc->fps_n);
+      mode->fps_d, mode->fps_n);
   GST_BUFFER_DURATION (buffer) =
       gst_util_uint64_scale_int ((decklinksrc->num_frames + 1) * GST_SECOND,
-      decklinksrc->fps_d, decklinksrc->fps_n) - GST_BUFFER_TIMESTAMP (buffer);
+      mode->fps_d, mode->fps_n) - GST_BUFFER_TIMESTAMP (buffer);
   GST_BUFFER_OFFSET (buffer) = decklinksrc->num_frames;
   if (decklinksrc->num_frames == 0) {
     GST_BUFFER_FLAG_SET (buffer, GST_BUFFER_FLAG_DISCONT);
@@ -1048,13 +1046,7 @@ gst_decklink_src_task (void *priv)
   decklinksrc->num_frames++;
 
   if (decklinksrc->video_caps == NULL) {
-    decklinksrc->video_caps = gst_caps_new_simple ("video/x-raw-yuv",
-        "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC ('U', 'Y', 'V', 'Y'),
-        "width", G_TYPE_INT, decklinksrc->width,
-        "height", G_TYPE_INT, decklinksrc->height,
-        "framerate", GST_TYPE_FRACTION,
-        decklinksrc->fps_n, decklinksrc->fps_d,
-        "interlaced", G_TYPE_BOOLEAN, decklinksrc->interlaced, NULL);
+    decklinksrc->video_caps = gst_decklink_mode_get_caps (decklinksrc->mode);
   }
   gst_buffer_set_caps (buffer, decklinksrc->video_caps);
 
@@ -1063,34 +1055,35 @@ gst_decklink_src_task (void *priv)
     GST_ELEMENT_ERROR (decklinksrc, CORE, NEGOTIATION, (NULL), (NULL));
   }
 
+  if (gst_pad_is_linked (decklinksrc->audiosrcpad)) {
+    n_samples = audio_frame->GetSampleFrameCount ();
+    audio_frame->GetBytes (&data);
+    audio_buffer = gst_buffer_new_and_alloc (n_samples * 2 * 2);
+    memcpy (GST_BUFFER_DATA (audio_buffer), data, n_samples * 2 * 2);
 
-  n_samples = audio_frame->GetSampleFrameCount ();
-  audio_frame->GetBytes (&data);
-  audio_buffer = gst_buffer_new_and_alloc (n_samples * 2 * 2);
-  memcpy (GST_BUFFER_DATA (audio_buffer), data, n_samples * 2 * 2);
+    GST_BUFFER_TIMESTAMP (audio_buffer) =
+        gst_util_uint64_scale_int (decklinksrc->num_audio_samples * GST_SECOND,
+        1, 48000);
+    GST_BUFFER_DURATION (audio_buffer) =
+        gst_util_uint64_scale_int ((decklinksrc->num_audio_samples +
+            n_samples) * GST_SECOND, 1,
+        48000) - GST_BUFFER_TIMESTAMP (audio_buffer);
+    decklinksrc->num_audio_samples += n_samples;
+
+    if (decklinksrc->audio_caps == NULL) {
+      decklinksrc->audio_caps = gst_caps_new_simple ("audio/x-raw-int",
+          "endianness", G_TYPE_INT, LITTLE_ENDIAN,
+          "signed", G_TYPE_BOOLEAN, TRUE,
+          "depth", G_TYPE_INT, 16,
+          "width", G_TYPE_INT, 16,
+          "channels", G_TYPE_INT, 2, "rate", G_TYPE_INT, 48000, NULL);
+    }
+    gst_buffer_set_caps (audio_buffer, decklinksrc->audio_caps);
+
+    ret = gst_pad_push (decklinksrc->audiosrcpad, audio_buffer);
+    if (ret != GST_FLOW_OK) {
+      GST_ELEMENT_ERROR (decklinksrc, CORE, NEGOTIATION, (NULL), (NULL));
+    }
+  }
   audio_frame->Release ();
-
-  GST_BUFFER_TIMESTAMP (audio_buffer) =
-      gst_util_uint64_scale_int (decklinksrc->num_audio_samples * GST_SECOND,
-      1, 48000);
-  GST_BUFFER_DURATION (audio_buffer) =
-      gst_util_uint64_scale_int ((decklinksrc->num_audio_samples +
-          n_samples) * GST_SECOND, 1,
-      48000) - GST_BUFFER_TIMESTAMP (audio_buffer);
-  decklinksrc->num_audio_samples += n_samples;
-
-  if (decklinksrc->audio_caps == NULL) {
-    decklinksrc->audio_caps = gst_caps_new_simple ("audio/x-raw-int",
-        "endianness", G_TYPE_INT, G_LITTLE_ENDIAN,
-        "signed", G_TYPE_BOOLEAN, TRUE,
-        "depth", G_TYPE_INT, 16,
-        "width", G_TYPE_INT, 16,
-        "channels", G_TYPE_INT, 2, "rate", G_TYPE_INT, 48000, NULL);
-  }
-  gst_buffer_set_caps (audio_buffer, decklinksrc->audio_caps);
-
-  ret = gst_pad_push (decklinksrc->audiosrcpad, audio_buffer);
-  if (ret != GST_FLOW_OK) {
-    GST_ELEMENT_ERROR (decklinksrc, CORE, NEGOTIATION, (NULL), (NULL));
-  }
 }
diff --git a/sys/decklink/gstdecklinksrc.h b/sys/decklink/gstdecklinksrc.h
index e191675fc1..11154fd988 100644
--- a/sys/decklink/gstdecklinksrc.h
+++ b/sys/decklink/gstdecklinksrc.h
@@ -21,6 +21,7 @@
 #define _GST_DECKLINK_SRC_H_
 
 #include <gst/gst.h>
+#include "gstdecklink.h"
 #include "DeckLinkAPI.h"
 
 G_BEGIN_DECLS
@@ -69,7 +70,8 @@ struct _GstDecklinkSrc
 
   /* properties */
   gboolean copy_data;
-  int mode;
+  GstDecklinkModeEnum mode;
+  gboolean optical;
 };
 
 struct _GstDecklinkSrcClass

From bb4844b29eaf3551d32d95835ce77bf326687fbb Mon Sep 17 00:00:00 2001
From: Rafael Diniz <rafael@riseup.net>
Date: Sun, 5 Jun 2011 21:19:58 -0700
Subject: [PATCH 011/158] decklinksink: Add audio support

Signed-off-by: David Schleef <ds@schleef.org>
---
 sys/decklink/capture.cpp         |  9 +++--
 sys/decklink/gstdecklinksink.cpp | 67 ++++++++++++++++++++++++++------
 sys/decklink/gstdecklinksink.h   |  3 ++
 3 files changed, 63 insertions(+), 16 deletions(-)

diff --git a/sys/decklink/capture.cpp b/sys/decklink/capture.cpp
index 83567e9849..9a4b8bcf8c 100644
--- a/sys/decklink/capture.cpp
+++ b/sys/decklink/capture.cpp
@@ -57,7 +57,8 @@ DeckLinkCaptureDelegate::~DeckLinkCaptureDelegate ()
   pthread_mutex_destroy (&m_mutex);
 }
 
-ULONG DeckLinkCaptureDelegate::AddRef (void)
+ULONG
+DeckLinkCaptureDelegate::AddRef (void)
 {
   pthread_mutex_lock (&m_mutex);
   m_refCount++;
@@ -66,15 +67,15 @@ ULONG DeckLinkCaptureDelegate::AddRef (void)
   return (ULONG) m_refCount;
 }
 
-ULONG DeckLinkCaptureDelegate::Release (void)
+ULONG
+DeckLinkCaptureDelegate::Release (void)
 {
   pthread_mutex_lock (&m_mutex);
   m_refCount--;
   pthread_mutex_unlock (&m_mutex);
 
   if (m_refCount == 0) {
-    delete
-        this;
+    delete this;
     return 0;
   }
 
diff --git a/sys/decklink/gstdecklinksink.cpp b/sys/decklink/gstdecklinksink.cpp
index 868dd3f978..720c90d74f 100644
--- a/sys/decklink/gstdecklinksink.cpp
+++ b/sys/decklink/gstdecklinksink.cpp
@@ -262,6 +262,7 @@ gst_decklink_sink_init (GstDecklinkSink * decklinksink,
 
   decklinksink->cond = g_cond_new ();
   decklinksink->mutex = g_mutex_new ();
+  decklinksink->audio_mutex = g_mutex_new ();
 
   decklinksink->mode = GST_DECKLINK_MODE_NTSC;
 
@@ -328,6 +329,7 @@ gst_decklink_sink_finalize (GObject * object)
   /* clean up object here */
   g_cond_free (decklinksink->cond);
   g_mutex_free (decklinksink->mutex);
+  g_mutex_free (decklinksink->audio_mutex);
 
   delete decklinksink->callback;
 
@@ -372,17 +374,16 @@ gst_decklink_sink_start (GstDecklinkSink * decklinksink)
   }
   //decklinksink->video_enabled = TRUE;
 
-  decklinksink->output->SetScheduledFrameCompletionCallback (decklinksink->
-      callback);
+  decklinksink->output->
+      SetScheduledFrameCompletionCallback (decklinksink->callback);
 
-  if (0) {
-    ret = decklinksink->output->EnableAudioOutput (bmdAudioSampleRate48kHz,
-        16, 2, bmdAudioOutputStreamContinuous);
-    if (ret != S_OK) {
-      GST_ERROR ("failed to enable audio output");
-      return FALSE;
-    }
+  ret = decklinksink->output->EnableAudioOutput (bmdAudioSampleRate48kHz,
+      16, 2, bmdAudioOutputStreamContinuous);
+  if (ret != S_OK) {
+    GST_ERROR ("failed to enable audio output");
+    return FALSE;
   }
+  decklinksink->audio_buffer = gst_buffer_new ();
 
   decklinksink->num_frames = 0;
 
@@ -654,7 +655,7 @@ gst_decklink_sink_videosink_chain (GstPad * pad, GstBuffer * buffer)
     decklinksink->num_frames++;
 
     if (!decklinksink->sched_started) {
-      decklinksink->output->StartScheduledPlayback (0, 100, 1.0);
+      decklinksink->output->StartScheduledPlayback (0, mode->fps_d, 1.0);
       decklinksink->sched_started = TRUE;
     }
 
@@ -870,14 +871,24 @@ static GstFlowReturn
 gst_decklink_sink_audiosink_chain (GstPad * pad, GstBuffer * buffer)
 {
   GstDecklinkSink *decklinksink;
+  GstFlowReturn ret;
 
   decklinksink = GST_DECKLINK_SINK (gst_pad_get_parent (pad));
 
   GST_DEBUG_OBJECT (decklinksink, "chain");
 
+  // concatenate both buffers
+  g_mutex_lock (decklinksink->audio_mutex);
+  decklinksink->audio_buffer =
+      gst_buffer_join (decklinksink->audio_buffer, buffer);
+  g_mutex_unlock (decklinksink->audio_mutex);
+
+  // GST_DEBUG("Audio Buffer Size: %d", GST_BUFFER_SIZE (decklinksink->audio_buffer));
 
   gst_object_unref (decklinksink);
-  return GST_FLOW_OK;
+
+  ret = GST_FLOW_OK;
+  return ret;
 }
 
 static GstFlowReturn
@@ -992,7 +1003,39 @@ HRESULT Output::ScheduledPlaybackHasStopped ()
 
 HRESULT Output::RenderAudioSamples (bool preroll)
 {
-  GST_ERROR ("RenderAudioSamples");
+  guint
+      samplesWritten;
+  GstBuffer *
+      buffer;
+
+  // guint64 samplesToWrite;
+
+  if (decklinksink->stop) {
+    GST_DEBUG ("decklinksink->stop set TRUE!");
+    decklinksink->output->BeginAudioPreroll ();
+    // running = true;
+  } else {
+    g_mutex_lock (decklinksink->audio_mutex);
+    decklinksink->output->ScheduleAudioSamples (GST_BUFFER_DATA (decklinksink->audio_buffer), GST_BUFFER_SIZE (decklinksink->audio_buffer) / 4, // 2 bytes per sample, stereo
+        0, 0, &samplesWritten);
+
+    buffer =
+        gst_buffer_new_and_alloc (GST_BUFFER_SIZE (decklinksink->audio_buffer) -
+        (samplesWritten * 4));
+
+    memcpy (GST_BUFFER_DATA (buffer),
+        GST_BUFFER_DATA (decklinksink->audio_buffer) + (samplesWritten * 4),
+        GST_BUFFER_SIZE (decklinksink->audio_buffer) - (samplesWritten * 4));
+
+    gst_buffer_unref (decklinksink->audio_buffer);
+
+    decklinksink->audio_buffer = buffer;
+
+    g_mutex_unlock (decklinksink->audio_mutex);
+
+  }
+
+  GST_DEBUG ("RenderAudioSamples");
 
   return S_OK;
 }
diff --git a/sys/decklink/gstdecklinksink.h b/sys/decklink/gstdecklinksink.h
index e5b7765874..d1b3b48fb9 100644
--- a/sys/decklink/gstdecklinksink.h
+++ b/sys/decklink/gstdecklinksink.h
@@ -52,12 +52,15 @@ public IDeckLinkAudioOutputCallback
 struct _GstDecklinkSink
 {
   GstElement base_decklinksink;
+  GstBuffer *audio_buffer;
 
   GstPad *videosinkpad;
   GstPad *audiosinkpad;
 
   GMutex *mutex;
   GCond *cond;
+  GMutex *audio_mutex;
+//   GCond *audio_cond;
   int queued_frames;
   gboolean stop;
 

From 16a49a36178f8662a9f7cdcd953c6e7e184595cb Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Mon, 20 Jun 2011 00:38:05 -0700
Subject: [PATCH 012/158] decklink: Add connection type

---
 sys/decklink/gstdecklink.cpp    | 21 ++++++++++++++++
 sys/decklink/gstdecklink.h      | 10 ++++++++
 sys/decklink/gstdecklinksrc.cpp | 44 ++++++++++++++++++++++++---------
 sys/decklink/gstdecklinksrc.h   |  2 +-
 4 files changed, 65 insertions(+), 12 deletions(-)

diff --git a/sys/decklink/gstdecklink.cpp b/sys/decklink/gstdecklink.cpp
index 122bc70b2d..942882e3a9 100644
--- a/sys/decklink/gstdecklink.cpp
+++ b/sys/decklink/gstdecklink.cpp
@@ -47,6 +47,27 @@ gst_decklink_mode_get_type (void)
   return type;
 }
 
+GType
+gst_decklink_connection_get_type (void)
+{
+  static GType type;
+
+  if (!type) {
+    static const GEnumValue connections[] = {
+      {GST_DECKLINK_CONNECTION_SDI, "sdi", "SDI"},
+      {GST_DECKLINK_CONNECTION_HDMI, "hdmi", "HDMI"},
+      {GST_DECKLINK_CONNECTION_OPTICAL_SDI, "optical-sdi", "Optical SDI"},
+      {GST_DECKLINK_CONNECTION_COMPONENT, "component", "Component"},
+      {GST_DECKLINK_CONNECTION_COMPOSITE, "composite", "Composite"},
+      {GST_DECKLINK_CONNECTION_SVIDEO, "svideo", "S-Video"},
+      {0, NULL, NULL}
+    };
+
+    type = g_enum_register_static ("GstDecklinkConnection", connections);
+  }
+  return type;
+}
+
 static const GstDecklinkMode modes[] = {
   {bmdModeNTSC, 720, 486, 30000, 1001, true},
   {bmdModePAL, 720, 576, 25, 1, true},
diff --git a/sys/decklink/gstdecklink.h b/sys/decklink/gstdecklink.h
index ab5b5647a9..5792d611c6 100644
--- a/sys/decklink/gstdecklink.h
+++ b/sys/decklink/gstdecklink.h
@@ -35,6 +35,16 @@ typedef enum {
 #define GST_TYPE_DECKLINK_MODE (gst_decklink_mode_get_type ())
 GType gst_decklink_mode_get_type (void);
 
+typedef enum {
+  GST_DECKLINK_CONNECTION_SDI,
+  GST_DECKLINK_CONNECTION_HDMI,
+  GST_DECKLINK_CONNECTION_OPTICAL_SDI,
+  GST_DECKLINK_CONNECTION_COMPONENT,
+  GST_DECKLINK_CONNECTION_COMPOSITE,
+  GST_DECKLINK_CONNECTION_SVIDEO
+} GstDecklinkConnectionEnum;
+#define GST_TYPE_DECKLINK_CONNECTION (gst_decklink_connection_get_type ())
+GType gst_decklink_connection_get_type (void);
 
 typedef struct _GstDecklinkMode GstDecklinkMode;
 struct _GstDecklinkMode {
diff --git a/sys/decklink/gstdecklinksrc.cpp b/sys/decklink/gstdecklinksrc.cpp
index f5a22f15e2..5976a62984 100644
--- a/sys/decklink/gstdecklinksrc.cpp
+++ b/sys/decklink/gstdecklinksrc.cpp
@@ -119,7 +119,7 @@ enum
 {
   PROP_0,
   PROP_MODE,
-  PROP_OPTICAL
+  PROP_CONNECTION
 };
 
 /* pad templates */
@@ -189,9 +189,9 @@ gst_decklink_src_class_init (GstDecklinkSrcClass * klass)
           (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
               G_PARAM_CONSTRUCT)));
 
-  g_object_class_install_property (gobject_class, PROP_OPTICAL,
-      g_param_spec_boolean ("optical", "Optical", "Optical",
-          TRUE,
+  g_object_class_install_property (gobject_class, PROP_CONNECTION,
+      g_param_spec_enum ("connection", "Connection", "Connection",
+          GST_TYPE_DECKLINK_CONNECTION, GST_DECKLINK_CONNECTION_SDI,
           (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
               G_PARAM_CONSTRUCT)));
 }
@@ -286,8 +286,9 @@ gst_decklink_src_set_property (GObject * object, guint property_id,
     case PROP_MODE:
       decklinksrc->mode = (GstDecklinkModeEnum) g_value_get_enum (value);
       break;
-    case PROP_OPTICAL:
-      decklinksrc->optical = g_value_get_boolean (value);
+    case PROP_CONNECTION:
+      decklinksrc->connection =
+          (GstDecklinkConnectionEnum) g_value_get_enum (value);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -308,8 +309,8 @@ gst_decklink_src_get_property (GObject * object, guint property_id,
     case PROP_MODE:
       g_value_set_enum (value, decklinksrc->mode);
       break;
-    case PROP_OPTICAL:
-      g_value_set_boolean (value, decklinksrc->optical);
+    case PROP_CONNECTION:
+      g_value_set_enum (value, decklinksrc->connection);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -380,6 +381,7 @@ gst_decklink_src_start (GstElement * element)
   HRESULT ret;
   const GstDecklinkMode *mode;
   IDeckLinkConfiguration *config;
+  BMDVideoConnection conn;
 
   GST_DEBUG_OBJECT (decklinksrc, "start");
 
@@ -413,9 +415,29 @@ gst_decklink_src_start (GstElement * element)
     return FALSE;
   }
 
-  ret = config->SetInt (bmdDeckLinkConfigVideoInputConnection,
-      decklinksrc->optical ? bmdVideoConnectionOpticalSDI :
-      bmdVideoConnectionSDI);
+  switch (decklinksrc->connection) {
+    default:
+    case GST_DECKLINK_CONNECTION_SDI:
+      conn = bmdVideoConnectionSDI;
+      break;
+    case GST_DECKLINK_CONNECTION_HDMI:
+      conn = bmdVideoConnectionHDMI;
+      break;
+    case GST_DECKLINK_CONNECTION_OPTICAL_SDI:
+      conn = bmdVideoConnectionOpticalSDI;
+      break;
+    case GST_DECKLINK_CONNECTION_COMPONENT:
+      conn = bmdVideoConnectionComponent;
+      break;
+    case GST_DECKLINK_CONNECTION_COMPOSITE:
+      conn = bmdVideoConnectionComposite;
+      break;
+    case GST_DECKLINK_CONNECTION_SVIDEO:
+      conn = bmdVideoConnectionSVideo;
+      break;
+  }
+
+  ret = config->SetInt (bmdDeckLinkConfigVideoInputConnection, conn);
   if (ret != S_OK) {
     GST_ERROR ("set configuration (input source)");
     return FALSE;
diff --git a/sys/decklink/gstdecklinksrc.h b/sys/decklink/gstdecklinksrc.h
index 11154fd988..40ef4f10a1 100644
--- a/sys/decklink/gstdecklinksrc.h
+++ b/sys/decklink/gstdecklinksrc.h
@@ -71,7 +71,7 @@ struct _GstDecklinkSrc
   /* properties */
   gboolean copy_data;
   GstDecklinkModeEnum mode;
-  gboolean optical;
+  GstDecklinkConnectionEnum connection;
 };
 
 struct _GstDecklinkSrcClass

From 571e95cf10ef42c2f5c5a8fec15bdb0c0e62dded Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Mon, 20 Jun 2011 12:47:39 -0700
Subject: [PATCH 013/158] decklink: update DeckLink API wrappers

---
 sys/decklink/DeckLinkAPI.h           | 56 +++++++++++++++++++++++++++-
 sys/decklink/DeckLinkAPIDispatch.cpp | 38 +++++++++++++++++--
 2 files changed, 89 insertions(+), 5 deletions(-)

diff --git a/sys/decklink/DeckLinkAPI.h b/sys/decklink/DeckLinkAPI.h
index 19eb07e9cd..e9c1066e35 100644
--- a/sys/decklink/DeckLinkAPI.h
+++ b/sys/decklink/DeckLinkAPI.h
@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2009 Blackmagic Design
+** Copyright (c) 2011 Blackmagic Design
 **
 ** Permission is hereby granted, free of charge, to any person or organization
 ** obtaining a copy of the software and accompanying documentation covered by
@@ -70,7 +70,7 @@ typedef uint32_t BMDTimecodeUserBits;
 #define IID_IDeckLinkKeyer                               /* 89AFCAF5-65F8-421E-98F7-96FE5F5BFBA3 */ (REFIID){0x89,0xAF,0xCA,0xF5,0x65,0xF8,0x42,0x1E,0x98,0xF7,0x96,0xFE,0x5F,0x5B,0xFB,0xA3}
 #define IID_IDeckLinkVideoConversion                     /* 3BBCB8A2-DA2C-42D9-B5D8-88083644E99A */ (REFIID){0x3B,0xBC,0xB8,0xA2,0xDA,0x2C,0x42,0xD9,0xB5,0xD8,0x88,0x08,0x36,0x44,0xE9,0x9A}
 #define IID_IDeckLinkDeckControlStatusCallback           /* E5F693C1-4283-4716-B18F-C1431521955B */ (REFIID){0xE5,0xF6,0x93,0xC1,0x42,0x83,0x47,0x16,0xB1,0x8F,0xC1,0x43,0x15,0x21,0x95,0x5B}
-#define IID_IDeckLinkDeckControl                         /* A4D81043-0619-42B7-8ED6-602D29041DF7 */ (REFIID){0xA4,0xD8,0x10,0x43,0x06,0x19,0x42,0xB7,0x8E,0xD6,0x60,0x2D,0x29,0x04,0x1D,0xF7}
+#define IID_IDeckLinkDeckControl                         /* 522A9E39-0F3C-4742-94EE-D80DE335DA1D */ (REFIID){0x52,0x2A,0x9E,0x39,0x0F,0x3C,0x47,0x42,0x94,0xEE,0xD8,0x0D,0xE3,0x35,0xDA,0x1D}
 
 
 /* Enum BMDDisplayMode - Video display modes */
@@ -264,7 +264,9 @@ enum _BMDDisplayModeSupport {
 typedef uint32_t BMDTimecodeFormat;
 enum _BMDTimecodeFormat {
     bmdTimecodeRP188                                   = /* 'rp18' */ 0x72703138,
+    bmdTimecodeRP188Field2                             = /* 'rp12' */ 0x72703132,
     bmdTimecodeVITC                                    = /* 'vitc' */ 0x76697463,
+    bmdTimecodeVITCField2                              = /* 'vit2' */ 0x76697432,
     bmdTimecodeSerial                                  = /* 'seri' */ 0x73657269
 };
 
@@ -367,11 +369,24 @@ enum _BMDVideo3DPackingFormat {
 };
 
 
+/* Enum BMDIdleVideoOutputOperation - Video output operation when not playing video */
+
+typedef uint32_t BMDIdleVideoOutputOperation;
+enum _BMDIdleVideoOutputOperation {
+    bmdIdleVideoOutputBlack                            = /* 'blac' */ 0x626C6163,
+    bmdIdleVideoOutputLastFrame                        = /* 'lafa' */ 0x6C616661
+};
+
+
 /* Enum BMDDeckLinkConfigurationID - DeckLink Configuration ID */
 
 typedef uint32_t BMDDeckLinkConfigurationID;
 enum _BMDDeckLinkConfigurationID {
 
+    /* Serial port Flags */
+
+    bmdDeckLinkConfigSwapSerialRxTx                    = /* 'ssrt' */ 0x73737274,
+
     /* Video Input/Output Flags */
 
     bmdDeckLinkConfigUse1080pNotPsF                    = /* 'fpro' */ 0x6670726F,
@@ -379,6 +394,7 @@ enum _BMDDeckLinkConfigurationID {
     /* Video Input/Output Integers */
 
     bmdDeckLinkConfigHDMI3DPackingFormat               = /* '3dpf' */ 0x33647066,
+    bmdDeckLinkConfigBypass                            = /* 'byps' */ 0x62797073,
 
     /* Audio Input/Output Flags */
 
@@ -399,6 +415,17 @@ enum _BMDDeckLinkConfigurationID {
     bmdDeckLinkConfigVideoOutputConversionMode         = /* 'vocm' */ 0x766F636D,
     bmdDeckLinkConfigAnalogVideoOutputFlags            = /* 'avof' */ 0x61766F66,
     bmdDeckLinkConfigReferenceInputTimingOffset        = /* 'glot' */ 0x676C6F74,
+    bmdDeckLinkConfigVideoOutputIdleOperation          = /* 'voio' */ 0x766F696F,
+
+    /* Video Output Floats */
+
+    bmdDeckLinkConfigVideoOutputComponentLumaGain      = /* 'oclg' */ 0x6F636C67,
+    bmdDeckLinkConfigVideoOutputComponentChromaBlueGain = /* 'occb' */ 0x6F636362,
+    bmdDeckLinkConfigVideoOutputComponentChromaRedGain = /* 'occr' */ 0x6F636372,
+    bmdDeckLinkConfigVideoOutputCompositeLumaGain      = /* 'oilg' */ 0x6F696C67,
+    bmdDeckLinkConfigVideoOutputCompositeChromaGain    = /* 'oicg' */ 0x6F696367,
+    bmdDeckLinkConfigVideoOutputSVideoLumaGain         = /* 'oslg' */ 0x6F736C67,
+    bmdDeckLinkConfigVideoOutputSVideoChromaGain       = /* 'oscg' */ 0x6F736367,
 
     /* Video Input Integers */
 
@@ -410,6 +437,16 @@ enum _BMDDeckLinkConfigurationID {
     bmdDeckLinkConfigVANCSourceLine2Mapping            = /* 'vsl2' */ 0x76736C32,
     bmdDeckLinkConfigVANCSourceLine3Mapping            = /* 'vsl3' */ 0x76736C33,
 
+    /* Video Input Floats */
+
+    bmdDeckLinkConfigVideoInputComponentLumaGain       = /* 'iclg' */ 0x69636C67,
+    bmdDeckLinkConfigVideoInputComponentChromaBlueGain = /* 'iccb' */ 0x69636362,
+    bmdDeckLinkConfigVideoInputComponentChromaRedGain  = /* 'iccr' */ 0x69636372,
+    bmdDeckLinkConfigVideoInputCompositeLumaGain       = /* 'iilg' */ 0x69696C67,
+    bmdDeckLinkConfigVideoInputCompositeChromaGain     = /* 'iicg' */ 0x69696367,
+    bmdDeckLinkConfigVideoInputSVideoLumaGain          = /* 'islg' */ 0x69736C67,
+    bmdDeckLinkConfigVideoInputSVideoChromaGain        = /* 'iscg' */ 0x69736367,
+
     /* Audio Input Integers */
 
     bmdDeckLinkConfigAudioInputConnection              = /* 'aicn' */ 0x6169636E,
@@ -449,6 +486,10 @@ enum _BMDDeckLinkAttributeID {
     BMDDeckLinkSupportsInputFormatDetection            = /* 'infd' */ 0x696E6664,
     BMDDeckLinkHasReferenceInput                       = /* 'hrin' */ 0x6872696E,
     BMDDeckLinkHasSerialPort                           = /* 'hspt' */ 0x68737074,
+    BMDDeckLinkHasAnalogVideoOutputGain                = /* 'avog' */ 0x61766F67,
+    BMDDeckLinkCanOnlyAdjustOverallVideoOutputGain     = /* 'ovog' */ 0x6F766F67,
+    BMDDeckLinkHasVideoInputAntiAliasingFilter         = /* 'aafl' */ 0x6161666C,
+    BMDDeckLinkHasBypass                               = /* 'byps' */ 0x62797073,
 
     /* Integers */
 
@@ -458,6 +499,13 @@ enum _BMDDeckLinkAttributeID {
     BMDDeckLinkVideoOutputConnections                  = /* 'vocn' */ 0x766F636E,
     BMDDeckLinkVideoInputConnections                   = /* 'vicn' */ 0x7669636E,
 
+    /* Floats */
+
+    BMDDeckLinkVideoInputGainMinimum                   = /* 'vigm' */ 0x7669676D,
+    BMDDeckLinkVideoInputGainMaximum                   = /* 'vigx' */ 0x76696778,
+    BMDDeckLinkVideoOutputGainMinimum                  = /* 'vogm' */ 0x766F676D,
+    BMDDeckLinkVideoOutputGainMaximum                  = /* 'vogx' */ 0x766F6778,
+
     /* Strings */
 
     BMDDeckLinkSerialPortDeviceName                    = /* 'slpn' */ 0x736C706E
@@ -566,6 +614,8 @@ enum _BMDDeckControlError {
     bmdDeckControlNoTapeInDeckError                    = /* 'nter' */ 0x6E746572,
     bmdDeckControlNoVideoFromCardError                 = /* 'nvfc' */ 0x6E766663,
     bmdDeckControlNoCommunicationError                 = /* 'ncom' */ 0x6E636F6D,
+    bmdDeckControlBufferTooSmallError                  = /* 'btsm' */ 0x6274736D,
+    bmdDeckControlBadChecksumError                     = /* 'chks' */ 0x63686B73,
     bmdDeckControlUnknownError                         = /* 'uner' */ 0x756E6572
 };
 
@@ -1046,6 +1096,7 @@ public:
     virtual HRESULT Close (/* in */ bool standbyOn) = 0;
     virtual HRESULT GetCurrentState (/* out */ BMDDeckControlMode *mode, /* out */ BMDDeckControlVTRControlState *vtrControlState, /* out */ BMDDeckControlStatusFlags *flags) = 0;
     virtual HRESULT SetStandby (/* in */ bool standbyOn) = 0;
+    virtual HRESULT SendCommand (/* in */ uint8_t *inBuffer, /* in */ uint32_t inBufferSize, /* out */ uint8_t *outBuffer, /* out */ uint32_t *outDataSize, /* in */ uint32_t outBufferSize, /* out */ BMDDeckControlError *error) = 0;
     virtual HRESULT Play (/* out */ BMDDeckControlError *error) = 0;
     virtual HRESULT Stop (/* out */ BMDDeckControlError *error) = 0;
     virtual HRESULT TogglePlayStop (/* out */ BMDDeckControlError *error) = 0;
@@ -1085,6 +1136,7 @@ protected:
 extern "C" {
 
     IDeckLinkIterator* CreateDeckLinkIteratorInstance (void);
+    IDeckLinkAPIInformation* CreateDeckLinkAPIInformationInstance (void);
     IDeckLinkGLScreenPreviewHelper* CreateOpenGLScreenPreviewHelper (void);
     IDeckLinkVideoConversion* CreateVideoConversionInstance (void);
 
diff --git a/sys/decklink/DeckLinkAPIDispatch.cpp b/sys/decklink/DeckLinkAPIDispatch.cpp
index d714ae9d21..957f9a4cb0 100644
--- a/sys/decklink/DeckLinkAPIDispatch.cpp
+++ b/sys/decklink/DeckLinkAPIDispatch.cpp
@@ -35,18 +35,23 @@
 #define KDeckLinkPreviewAPI_Name "libDeckLinkPreviewAPI.so"
 
 typedef IDeckLinkIterator *(*CreateIteratorFunc) (void);
+typedef IDeckLinkAPIInformation *(*CreateAPIInformationFunc) (void);
 typedef IDeckLinkGLScreenPreviewHelper
-    * (*CreateOpenGLScreenPreviewHelperFunc) (void);
+    *(*CreateOpenGLScreenPreviewHelperFunc) (void);
 typedef IDeckLinkVideoConversion *(*CreateVideoConversionInstanceFunc) (void);
 
 static pthread_once_t gDeckLinkOnceControl = PTHREAD_ONCE_INIT;
 static pthread_once_t gPreviewOnceControl = PTHREAD_ONCE_INIT;
 
+static bool gLoadedDeckLinkAPI = false;
+
 static CreateIteratorFunc gCreateIteratorFunc = NULL;
+static CreateAPIInformationFunc gCreateAPIInformationFunc = NULL;
 static CreateOpenGLScreenPreviewHelperFunc gCreateOpenGLPreviewFunc = NULL;
 static CreateVideoConversionInstanceFunc gCreateVideoConversionFunc = NULL;
 
-static void
+void InitDeckLinkAPI (void);
+void
 InitDeckLinkAPI (void)
 {
   void *libraryHandle;
@@ -56,11 +61,19 @@ InitDeckLinkAPI (void)
     fprintf (stderr, "%s\n", dlerror ());
     return;
   }
+
+  gLoadedDeckLinkAPI = true;
+
   gCreateIteratorFunc =
       (CreateIteratorFunc) dlsym (libraryHandle,
       "CreateDeckLinkIteratorInstance_0001");
   if (!gCreateIteratorFunc)
     fprintf (stderr, "%s\n", dlerror ());
+  gCreateAPIInformationFunc =
+      (CreateAPIInformationFunc) dlsym (libraryHandle,
+      "CreateDeckLinkAPIInformationInstance_0001");
+  if (!gCreateAPIInformationFunc)
+    fprintf (stderr, "%s\n", dlerror ());
   gCreateVideoConversionFunc =
       (CreateVideoConversionInstanceFunc) dlsym (libraryHandle,
       "CreateVideoConversionInstance_0001");
@@ -68,7 +81,8 @@ InitDeckLinkAPI (void)
     fprintf (stderr, "%s\n", dlerror ());
 }
 
-static void
+void InitDeckLinkPreviewAPI (void);
+void
 InitDeckLinkPreviewAPI (void)
 {
   void *libraryHandle;
@@ -85,6 +99,14 @@ InitDeckLinkPreviewAPI (void)
     fprintf (stderr, "%s\n", dlerror ());
 }
 
+bool IsDeckLinkAPIPresent (void);
+bool
+IsDeckLinkAPIPresent (void)
+{
+  // If the DeckLink API dynamic library was successfully loaded, return this knowledge to the caller
+  return gLoadedDeckLinkAPI;
+}
+
 IDeckLinkIterator *
 CreateDeckLinkIteratorInstance (void)
 {
@@ -95,6 +117,16 @@ CreateDeckLinkIteratorInstance (void)
   return gCreateIteratorFunc ();
 }
 
+IDeckLinkAPIInformation *
+CreateDeckLinkAPIInformationInstance (void)
+{
+  pthread_once (&gDeckLinkOnceControl, InitDeckLinkAPI);
+
+  if (gCreateAPIInformationFunc == NULL)
+    return NULL;
+  return gCreateAPIInformationFunc ();
+}
+
 IDeckLinkGLScreenPreviewHelper *
 CreateOpenGLScreenPreviewHelper (void)
 {

From 160207abb908b03cc4dbd3cafac083e8de0d9725 Mon Sep 17 00:00:00 2001
From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Tue, 21 Jun 2011 12:41:47 +0200
Subject: [PATCH 014/158] h264parse: avoid bogus frame parsing state

---
 gst/videoparsers/gsth264parse.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gst/videoparsers/gsth264parse.c b/gst/videoparsers/gsth264parse.c
index d5b539e427..f8b403eb42 100644
--- a/gst/videoparsers/gsth264parse.c
+++ b/gst/videoparsers/gsth264parse.c
@@ -507,6 +507,8 @@ gst_h264_parse_check_valid_frame (GstBaseParse * parse,
     if (sc_pos == -1) {
       /* SC not found, need more data */
       sc_pos = GST_BUFFER_SIZE (buffer) - 3;
+      /* avoid going < 0 later on */
+      nal_pos = next_sc_pos = sc_pos;
       goto more;
     }
 

From 10bec5c08f15bb968f4bd4605f8418147d147977 Mon Sep 17 00:00:00 2001
From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Tue, 21 Jun 2011 12:43:41 +0200
Subject: [PATCH 015/158] h264parse: avc input must either pass-through or be
 split into bytestream chunks

... since parsing code is not meant to receive avc data.

Fixes #653087.
---
 gst/videoparsers/gsth264parse.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gst/videoparsers/gsth264parse.c b/gst/videoparsers/gsth264parse.c
index f8b403eb42..76d3f8fe1b 100644
--- a/gst/videoparsers/gsth264parse.c
+++ b/gst/videoparsers/gsth264parse.c
@@ -1042,12 +1042,13 @@ gst_h264_parse_set_caps (GstBaseParse * parse, GstCaps * caps)
 
     /* we did parse codec-data and might supplement src caps */
     gst_h264_parse_update_src_caps (h264parse, caps);
-  } else if (format == GST_H264_PARSE_FORMAT_AVC &&
-      h264parse->format == GST_H264_PARSE_FORMAT_BYTE) {
+  } else if (format == GST_H264_PARSE_FORMAT_AVC) {
+    /* if input != output, and input is avc, must split before anything else */
     /* arrange to insert codec-data in-stream if needed.
      * src caps are only arranged for later on */
     h264parse->push_codec = TRUE;
     h264parse->split_packetized = TRUE;
+    h264parse->packetized = TRUE;
   }
 
   return TRUE;

From d631e1b34803eaaed2eee6f5452a0b1c2676fd88 Mon Sep 17 00:00:00 2001
From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Tue, 21 Jun 2011 12:45:31 +0200
Subject: [PATCH 016/158] legacyh264parse: fix output caps alignment for avc
 input

... particularly when splitting packetized input.

Fixes #652995.
---
 gst/h264parse/gsth264parse.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/gst/h264parse/gsth264parse.c b/gst/h264parse/gsth264parse.c
index 514a739450..fe0e0fa390 100644
--- a/gst/h264parse/gsth264parse.c
+++ b/gst/h264parse/gsth264parse.c
@@ -1313,16 +1313,18 @@ gst_h264_parse_update_src_caps (GstH264Parse * h264parse, GstCaps * caps)
     alignment = "au";
   } else {
     if (h264parse->packetized) {
-      /* if packetized input, take upstream alignment if validly provided,
-       * otherwise assume au aligned ... */
-      alignment = gst_structure_get_string (structure, "alignment");
-      if (!alignment || (alignment &&
-              strcmp (alignment, "au") != 0 &&
-              strcmp (alignment, "nal") != 0)) {
-        if (h264parse->split_packetized)
-          alignment = "nal";
-        else
+      if (h264parse->split_packetized)
+        alignment = "nal";
+      else {
+        /* if packetized input is not split,
+         * take upstream alignment if validly provided,
+         * otherwise assume au aligned ... */
+        alignment = gst_structure_get_string (structure, "alignment");
+        if (!alignment || (alignment &&
+                strcmp (alignment, "au") != 0 &&
+                strcmp (alignment, "nal") != 0)) {
           alignment = "au";
+        }
       }
     } else {
       alignment = "nal";

From eca1614f08b83e4bc845597f2d501a58c372aca7 Mon Sep 17 00:00:00 2001
From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Wed, 22 Jun 2011 10:13:38 +0200
Subject: [PATCH 017/158] legacyh264parse: create correct avc codec-data

Fixes #653013.
---
 gst/h264parse/gsth264parse.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gst/h264parse/gsth264parse.c b/gst/h264parse/gsth264parse.c
index fe0e0fa390..90a537bb7e 100644
--- a/gst/h264parse/gsth264parse.c
+++ b/gst/h264parse/gsth264parse.c
@@ -1134,11 +1134,11 @@ gst_h264_parse_make_codec_data (GstH264Parse * h264parse)
       num_sps++;
       /* size bytes also count */
       sps_size += GST_BUFFER_SIZE (nal) - 4 + 2;
-      if (GST_BUFFER_SIZE (nal) >= 7) {
+      if (GST_BUFFER_SIZE (nal) >= 8) {
         found = TRUE;
-        profile_idc = (GST_BUFFER_DATA (nal))[4];
-        profile_comp = (GST_BUFFER_DATA (nal))[5];
-        level_idc = (GST_BUFFER_DATA (nal))[6];
+        profile_idc = (GST_BUFFER_DATA (nal))[5];
+        profile_comp = (GST_BUFFER_DATA (nal))[6];
+        level_idc = (GST_BUFFER_DATA (nal))[7];
       }
     }
   }

From 62c65a49f3396e07e0a70dee1f99fb2eb4bbb504 Mon Sep 17 00:00:00 2001
From: Thiago Santos <thiago.sousa.santos@collabora.co.uk>
Date: Fri, 13 May 2011 11:25:18 -0300
Subject: [PATCH 018/158] examples: camerabin2: Adds performance measurement to
 gst-camerabin2-test

Adds performance (timing) measure feature to gst-camerabin2-test, it allows
users to specify some target values for commonly measured times and the
application will print out a table of values at the end of its execution
with the measured times and averages of them.
---
 .../examples/camerabin2/gst-camerabin2-test.c | 428 +++++++++++++++++-
 1 file changed, 413 insertions(+), 15 deletions(-)

diff --git a/tests/examples/camerabin2/gst-camerabin2-test.c b/tests/examples/camerabin2/gst-camerabin2-test.c
index 55d1a04d1f..abeeb9d022 100644
--- a/tests/examples/camerabin2/gst-camerabin2-test.c
+++ b/tests/examples/camerabin2/gst-camerabin2-test.c
@@ -74,6 +74,24 @@
     --image-capture-caps              Image capture caps (e.g. video/x-raw-rgb,width=640,height=480)
     --viewfinder-caps                 Viewfinder caps (e.g. video/x-raw-rgb,width=640,height=480)
     --video-capture-caps              Video capture caps (e.g. video/x-raw-rgb,width=640,height=480)
+    --performance-measure             Collect timing information about the
+    captures and provides performance statistics at the end
+    --performance-targets             A list of doubles that are the performance target
+    times for each of the measured timestamps. The order is
+    startup time, change mode time, shot to save, shot to snapshot,
+    shot to shot, preview to precapture, shot to buffer.
+    e.g. 3.5,1.0,5.0,2.5,5.0,1.5,1.0
+    * Startup time -> time it takes for camerabin2 to reach playing
+    * Change mode time -> time it takes for camerabin2 to change to the selected
+    mode in playing
+    * Shot to save -> time it takes from start-capture to having the image saved
+    to disk
+    * Shot to snapshot -> time it takes from start-capture to getting a snapshot
+    * Shot to shot -> time from one start-capture to the next one
+    * Preview to precapture -> time it takes from getting the snapshot to the
+    next buffer that reaches the viewfinder
+    * Shot to buffer -> time it takes from start-capture to the moment a buffer
+    is pushed out of the camera source
 
   */
 
@@ -105,18 +123,78 @@
  */
 GST_DEBUG_CATEGORY_STATIC (camerabin_test);
 #define GST_CAT_DEFAULT camerabin_test
-typedef struct _ResultType
+
+#define TIME_DIFF(a,b) ((((gint64)(a)) - ((gint64)(b))) / (gdouble) GST_SECOND)
+
+#define TIME_FORMAT "02d.%09u"
+#define TIMEDIFF_FORMAT "0.6lf"
+
+#define TIME_ARGS(t) \
+        (GST_CLOCK_TIME_IS_VALID (t) && (t) < 99 * GST_SECOND) ? \
+        (gint) ((((GstClockTime)(t)) / GST_SECOND) % 60) : 99, \
+        (GST_CLOCK_TIME_IS_VALID (t) && ((t) < 99 * GST_SECOND)) ? \
+        (guint) (((GstClockTime)(t)) % GST_SECOND) : 999999999
+
+#define TIMEDIFF_ARGS(t) (t)
+
+typedef struct _CaptureTiming
 {
-  GstClockTime avg;
-  GstClockTime min;
-  GstClockTime max;
-  guint32 times;
-} ResultType;
+  GstClockTime start_capture;
+  GstClockTime got_preview;
+  GstClockTime capture_done;
+  GstClockTime precapture;
+  GstClockTime camera_capture;
+} CaptureTiming;
+
+typedef struct _CaptureTimingStats
+{
+  GstClockTime shot_to_shot;
+  GstClockTime shot_to_save;
+  GstClockTime shot_to_snapshot;
+  GstClockTime preview_to_precapture;
+  GstClockTime shot_to_buffer;
+} CaptureTimingStats;
+
+static void
+capture_timing_stats_add (CaptureTimingStats * a, CaptureTimingStats * b)
+{
+  a->shot_to_shot += b->shot_to_shot;
+  a->shot_to_snapshot += b->shot_to_snapshot;
+  a->shot_to_save += b->shot_to_save;
+  a->preview_to_precapture += b->preview_to_precapture;
+  a->shot_to_buffer += b->shot_to_buffer;
+}
+
+static void
+capture_timing_stats_div (CaptureTimingStats * stats, gint div)
+{
+  stats->shot_to_shot /= div;
+  stats->shot_to_snapshot /= div;
+  stats->shot_to_save /= div;
+  stats->preview_to_precapture /= div;
+  stats->shot_to_buffer /= div;
+}
+
+#define PRINT_STATS(d,s) g_print ("%02d | %" TIME_FORMAT " | %" \
+    TIME_FORMAT "   | %" TIME_FORMAT " | %" TIME_FORMAT \
+    "    | %" TIME_FORMAT "\n", d, \
+    TIME_ARGS ((s)->shot_to_save), TIME_ARGS ((s)->shot_to_snapshot), \
+    TIME_ARGS ((s)->shot_to_shot), \
+    TIME_ARGS ((s)->preview_to_precapture), \
+    TIME_ARGS ((s)->shot_to_buffer))
+
+#define SHOT_TO_SAVE(t) ((t)->capture_done - (t)->start_capture)
+#define SHOT_TO_SNAPSHOT(t) ((t)->got_preview - (t)->start_capture)
+#define PREVIEW_TO_PRECAPTURE(t) ((t)->precapture - (t)->got_preview)
+#define SHOT_TO_BUFFER(t) ((t)->camera_capture - (t)->start_capture)
 
 /*
  * Global vars
  */
 static GstElement *camerabin = NULL;
+static GstElement *viewfinder_sink = NULL;
+static gulong camera_probe_id = 0;
+static gulong viewfinder_probe_id = 0;
 static GMainLoop *loop = NULL;
 
 /* commandline options */
@@ -137,6 +215,8 @@ static gchar *gep_filename = NULL;
 static gchar *image_capture_caps_str = NULL;
 static gchar *viewfinder_caps_str = NULL;
 static gchar *video_capture_caps_str = NULL;
+static gboolean performance_measure = FALSE;
+static gchar *performance_targets_str = NULL;
 
 
 #define MODE_VIDEO 2
@@ -181,7 +261,21 @@ static gchar *preview_caps_name = NULL;
 static Display *display = NULL;
 static Window window = 0;
 
-GTimer *timer = NULL;
+/* timing data */
+static GstClockTime initial_time = 0;
+static GstClockTime startup_time = 0;
+static GstClockTime change_mode_before = 0;
+static GstClockTime change_mode_after = 0;
+static GList *capture_times = NULL;
+
+static GstClockTime target_startup;
+static GstClockTime target_change_mode;
+static GstClockTime target_shot_to_shot;
+static GstClockTime target_shot_to_save;
+static GstClockTime target_shot_to_snapshot;
+static GstClockTime target_preview_to_precapture;
+static GstClockTime target_shot_to_buffer;
+
 
 /*
  * Prototypes
@@ -215,6 +309,34 @@ create_host_window (void)
   }
 }
 
+static gboolean
+camera_src_get_timestamp_probe (GstPad * pad, GstMiniObject * obj,
+    gpointer udata)
+{
+  CaptureTiming *timing;
+
+  timing = (CaptureTiming *) g_list_first (capture_times)->data;
+  timing->camera_capture = gst_util_get_timestamp ();
+
+  gst_pad_remove_data_probe (pad, camera_probe_id);
+
+  return TRUE;
+}
+
+static gboolean
+viewfinder_get_timestamp_probe (GstPad * pad, GstMiniObject * obj,
+    gpointer udata)
+{
+  CaptureTiming *timing;
+
+  timing = (CaptureTiming *) g_list_first (capture_times)->data;
+  timing->precapture = gst_util_get_timestamp ();
+
+  gst_pad_remove_data_probe (pad, viewfinder_probe_id);
+
+  return TRUE;
+}
+
 static GstBusSyncReply
 sync_bus_callback (GstBus * bus, GstMessage * message, gpointer data)
 {
@@ -241,7 +363,23 @@ sync_bus_callback (GstBus * bus, GstMessage * message, gpointer data)
             return GST_BUS_DROP;
           }
         } else if (gst_structure_has_name (st, "preview-image")) {
+          CaptureTiming *timing;
+
           GST_DEBUG ("preview-image");
+
+          timing = (CaptureTiming *) g_list_first (capture_times)->data;
+          timing->got_preview = gst_util_get_timestamp ();
+
+          {
+            /* set up probe to check when the viewfinder gets data */
+            GstPad *pad = gst_element_get_static_pad (viewfinder_sink, "sink");
+
+            viewfinder_probe_id = gst_pad_add_buffer_probe (pad,
+                (GCallback) viewfinder_get_timestamp_probe, NULL);
+
+            gst_object_unref (pad);
+          }
+
           /* extract preview-image from msg */
           image = gst_structure_get_value (st, "buffer");
           if (image) {
@@ -250,8 +388,6 @@ sync_bus_callback (GstBus * bus, GstMessage * message, gpointer data)
             size = GST_BUFFER_SIZE (buf);
             preview_filename = g_strdup_printf ("test_vga.rgb");
             caps_string = gst_caps_to_string (GST_BUFFER_CAPS (buf));
-            g_print ("writing buffer to %s, elapsed: %.2fs, buffer caps: %s\n",
-                preview_filename, g_timer_elapsed (timer, NULL), caps_string);
             g_free (caps_string);
             f = g_fopen (preview_filename, "w");
             if (f) {
@@ -269,6 +405,16 @@ sync_bus_callback (GstBus * bus, GstMessage * message, gpointer data)
       }
       break;
     }
+    case GST_MESSAGE_STATE_CHANGED:
+      if (GST_MESSAGE_SRC (message) == (GstObject *) camerabin) {
+        GstState newstate;
+
+        gst_message_parse_state_changed (message, NULL, &newstate, NULL);
+        if (newstate == GST_STATE_PLAYING) {
+          startup_time = gst_util_get_timestamp ();
+        }
+      }
+      break;
     default:
       /* unhandled message */
       break;
@@ -316,11 +462,15 @@ bus_callback (GstBus * bus, GstMessage * message, gpointer data)
         const GstStructure *structure = gst_message_get_structure (message);
 
         if (gst_structure_has_name (structure, "image-done")) {
+          CaptureTiming *timing;
 #ifndef GST_DISABLE_GST_DEBUG
           const gchar *fname = gst_structure_get_string (structure, "filename");
 
           GST_DEBUG ("image done: %s", fname);
 #endif
+          timing = (CaptureTiming *) g_list_first (capture_times)->data;
+          timing->capture_done = gst_util_get_timestamp ();
+
           if (capture_count < capture_total) {
             g_idle_add ((GSourceFunc) run_pipeline, NULL);
           } else {
@@ -508,6 +658,9 @@ setup_pipeline (void)
   GstBus *bus;
   GstElement *sink = NULL, *ipp = NULL;
   GstEncodingProfile *prof = NULL;
+
+  initial_time = gst_util_get_timestamp ();
+
   camerabin = gst_element_factory_make ("camerabin2", NULL);
   if (NULL == camerabin) {
     g_warning ("can't create camerabin element\n");
@@ -569,8 +722,20 @@ setup_pipeline (void)
 
   GST_INFO_OBJECT (camerabin, "elements created");
 
-  if (sink)
+  if (sink) {
     g_object_set (sink, "sync", TRUE, NULL);
+  } else {
+    /* Get the inner viewfinder sink, this uses fixed names given
+     * by default in camerabin2 */
+    sink = gst_bin_get_by_name (GST_BIN (camerabin), "vf-bin");
+    g_assert (sink);
+    gst_object_unref (sink);
+
+    sink = gst_bin_get_by_name (GST_BIN (sink), "vfbin-sink");
+    g_assert (sink);
+    gst_object_unref (sink);
+  }
+  viewfinder_sink = sink;
 
   GST_INFO_OBJECT (camerabin, "elements configured");
 
@@ -614,6 +779,13 @@ setup_pipeline (void)
 
   set_camerabin2_caps_from_string ();
 
+  /* change to the wrong mode if timestamping if performance mode is on so
+   * we can change it back and measure the time after in playing */
+  if (performance_measure) {
+    g_object_set (camerabin, "mode",
+        mode == MODE_VIDEO ? MODE_IMAGE : MODE_VIDEO, NULL);
+  }
+
   if (GST_STATE_CHANGE_FAILURE ==
       gst_element_set_state (camerabin, GST_STATE_READY)) {
     g_warning ("can't set camerabin to ready\n");
@@ -628,6 +800,14 @@ setup_pipeline (void)
   }
 
   GST_INFO_OBJECT (camerabin, "camera started");
+
+  /* do the mode change timestamping if performance mode is on */
+  if (performance_measure) {
+    change_mode_before = gst_util_get_timestamp ();
+    g_object_set (camerabin, "mode", mode, NULL);
+    change_mode_after = gst_util_get_timestamp ();
+  }
+
   return TRUE;
 error:
   cleanup_pipeline ();
@@ -695,6 +875,7 @@ run_pipeline (gpointer user_data)
   gchar *filename_str = NULL;
   GstElement *video_source = NULL;
   const gchar *filename_suffix;
+  CaptureTiming *timing;
 
   g_object_set (camerabin, "mode", mode, NULL);
 
@@ -745,13 +926,29 @@ run_pipeline (gpointer user_data)
         g_object_set (video_source, "colour-tone-mode", color_mode, NULL);
     }
     g_object_unref (video_source);
+  } else {
+    video_source = gst_bin_get_by_name (GST_BIN (camerabin), "camerasrc");
+    gst_object_unref (video_source);
   }
   g_object_set (camerabin, "zoom", zoom / 100.0f, NULL);
 
   capture_count++;
-  g_timer_start (timer);
-  g_signal_emit_by_name (camerabin, "start-capture", 0);
 
+  timing = g_slice_new0 (CaptureTiming);
+  capture_times = g_list_prepend (capture_times, timing);
+
+  /* set pad probe to check when buffer leaves the camera source */
+  if (mode == MODE_IMAGE) {
+    GstPad *pad;
+
+    pad = gst_element_get_static_pad (video_source, "imgsrc");
+    camera_probe_id = gst_pad_add_buffer_probe (pad,
+        (GCallback) camera_src_get_timestamp_probe, NULL);
+
+    gst_object_unref (pad);
+  }
+  timing->start_capture = gst_util_get_timestamp ();
+  g_signal_emit_by_name (camerabin, "start-capture", 0);
 
   if (mode == MODE_VIDEO) {
     g_timeout_add ((capture_time * 1000), (GSourceFunc) stop_capture, NULL);
@@ -760,6 +957,183 @@ run_pipeline (gpointer user_data)
   return FALSE;
 }
 
+static void
+parse_target_values (void)
+{
+  gdouble startup = 0, change_mode = 0, shot_to_save = 0, shot_to_snapshot = 0;
+  gdouble shot_to_shot = 0, preview_to_precapture = 0, shot_to_buffer = 0;
+
+  if (performance_targets_str == NULL)
+    return;
+
+  /*
+     startup time, change mode time, shot to save, shot to snapshot,
+     shot to shot, preview to precapture, shot to buffer.
+   */
+  sscanf (performance_targets_str, "%lf,%lf,%lf,%lf,%lf,%lf,%lf",
+      &startup, &change_mode, &shot_to_save,
+      &shot_to_snapshot, &shot_to_shot, &preview_to_precapture,
+      &shot_to_buffer);
+
+  target_startup = (GstClockTime) (startup * GST_SECOND);
+  target_change_mode = (GstClockTime) (change_mode * GST_SECOND);
+  target_shot_to_save = (GstClockTime) (shot_to_save * GST_SECOND);
+  target_shot_to_snapshot = (GstClockTime) (shot_to_snapshot * GST_SECOND);
+  target_shot_to_shot = (GstClockTime) (shot_to_shot * GST_SECOND);
+  target_preview_to_precapture =
+      (GstClockTime) (preview_to_precapture * GST_SECOND);
+  target_shot_to_buffer = (GstClockTime) (shot_to_buffer * GST_SECOND);
+}
+
+static void
+print_performance_data (void)
+{
+  GList *iter;
+  gint i = 0;
+  GstClockTime last_start = 0;
+  CaptureTimingStats max;
+  CaptureTimingStats min;
+  CaptureTimingStats avg;
+  CaptureTimingStats avg_wo_first;
+  GstClockTime shot_to_shot;
+
+  if (!performance_measure)
+    return;
+
+  parse_target_values ();
+
+  /* Initialize stats */
+  min.shot_to_shot = -1;
+  min.shot_to_save = -1;
+  min.shot_to_snapshot = -1;
+  min.preview_to_precapture = -1;
+  min.shot_to_buffer = -1;
+  memset (&avg, 0, sizeof (CaptureTimingStats));
+  memset (&avg_wo_first, 0, sizeof (CaptureTimingStats));
+  memset (&max, 0, sizeof (CaptureTimingStats));
+
+  g_print ("-- Performance results --\n");
+  g_print ("Startup time: %" TIME_FORMAT "; Target: %" TIME_FORMAT "\n",
+      TIME_ARGS (startup_time - initial_time), TIME_ARGS (target_startup));
+  g_print ("Change mode time: %" TIME_FORMAT "; Target: %" TIME_FORMAT "\n",
+      TIME_ARGS (change_mode_after - change_mode_before),
+      TIME_ARGS (target_change_mode));
+
+  g_print
+      ("\n   | Shot to save |Shot to snapshot| Shot to shot |"
+      "Preview to precap| Shot to buffer\n");
+  capture_times = g_list_reverse (capture_times);
+  for (iter = capture_times; iter; iter = g_list_next (iter)) {
+    CaptureTiming *t = (CaptureTiming *) iter->data;
+    CaptureTimingStats stats;
+
+    stats.shot_to_save = SHOT_TO_SAVE (t);
+    stats.shot_to_snapshot = SHOT_TO_SNAPSHOT (t);
+    stats.shot_to_shot = i == 0 ? 0 : t->start_capture - last_start;
+    stats.preview_to_precapture = PREVIEW_TO_PRECAPTURE (t);
+    stats.shot_to_buffer = SHOT_TO_BUFFER (t);
+
+    PRINT_STATS (i, &stats);
+
+    if (i != 0) {
+      capture_timing_stats_add (&avg_wo_first, &stats);
+    }
+    capture_timing_stats_add (&avg, &stats);
+
+    if (stats.shot_to_save < min.shot_to_save) {
+      min.shot_to_save = stats.shot_to_save;
+    }
+    if (stats.shot_to_snapshot < min.shot_to_snapshot) {
+      min.shot_to_snapshot = stats.shot_to_snapshot;
+    }
+    if (stats.shot_to_shot < min.shot_to_shot && stats.shot_to_shot > 0) {
+      min.shot_to_shot = stats.shot_to_shot;
+    }
+    if (stats.preview_to_precapture < min.preview_to_precapture) {
+      min.preview_to_precapture = stats.preview_to_precapture;
+    }
+    if (stats.shot_to_buffer < min.shot_to_buffer) {
+      min.shot_to_buffer = stats.shot_to_buffer;
+    }
+
+
+    if (stats.shot_to_save > max.shot_to_save) {
+      max.shot_to_save = stats.shot_to_save;
+    }
+    if (stats.shot_to_snapshot > max.shot_to_snapshot) {
+      max.shot_to_snapshot = stats.shot_to_snapshot;
+    }
+    if (stats.shot_to_shot > max.shot_to_shot) {
+      max.shot_to_shot = stats.shot_to_shot;
+    }
+    if (stats.preview_to_precapture > max.preview_to_precapture) {
+      max.preview_to_precapture = stats.preview_to_precapture;
+    }
+    if (stats.shot_to_buffer > max.shot_to_buffer) {
+      max.shot_to_buffer = stats.shot_to_buffer;
+    }
+
+    last_start = t->start_capture;
+    i++;
+  }
+
+  if (i > 1)
+    shot_to_shot = avg.shot_to_shot / (i - 1);
+  else
+    shot_to_shot = GST_CLOCK_TIME_NONE;
+  capture_timing_stats_div (&avg, i);
+  avg.shot_to_shot = shot_to_shot;
+  if (i > 1)
+    capture_timing_stats_div (&avg_wo_first, i - 1);
+  else {
+    memset (&avg_wo_first, 0, sizeof (CaptureTimingStats));
+  }
+
+  g_print ("\n    Stats             |     MIN      |     MAX      |"
+      "     AVG      | AVG wo First |   Target     | Diff \n");
+  g_print ("Shot to shot          | %" TIME_FORMAT " | %" TIME_FORMAT
+      " | %" TIME_FORMAT " | %" TIME_FORMAT " | %" TIME_FORMAT
+      " | %" TIMEDIFF_FORMAT "\n",
+      TIME_ARGS (min.shot_to_shot), TIME_ARGS (max.shot_to_shot),
+      TIME_ARGS (avg.shot_to_shot),
+      TIME_ARGS (avg_wo_first.shot_to_shot),
+      TIME_ARGS (target_shot_to_shot),
+      TIMEDIFF_ARGS (TIME_DIFF (avg.shot_to_shot, target_shot_to_shot)));
+  g_print ("Shot to save          | %" TIME_FORMAT " | %" TIME_FORMAT
+      " | %" TIME_FORMAT " | %" TIME_FORMAT " | %" TIME_FORMAT
+      " | %" TIMEDIFF_FORMAT "\n",
+      TIME_ARGS (min.shot_to_save), TIME_ARGS (max.shot_to_save),
+      TIME_ARGS (avg.shot_to_save),
+      TIME_ARGS (avg_wo_first.shot_to_save),
+      TIME_ARGS (target_shot_to_save),
+      TIMEDIFF_ARGS (TIME_DIFF (avg.shot_to_save, target_shot_to_save)));
+  g_print ("Shot to snapshot      | %" TIME_FORMAT " | %" TIME_FORMAT
+      " | %" TIME_FORMAT " | %" TIME_FORMAT " | %" TIME_FORMAT
+      " | %" TIMEDIFF_FORMAT "\n",
+      TIME_ARGS (min.shot_to_snapshot),
+      TIME_ARGS (max.shot_to_snapshot),
+      TIME_ARGS (avg.shot_to_snapshot),
+      TIME_ARGS (avg_wo_first.shot_to_snapshot),
+      TIME_ARGS (target_shot_to_snapshot),
+      TIMEDIFF_ARGS (TIME_DIFF (avg.shot_to_snapshot,
+              target_shot_to_snapshot)));
+  g_print ("Preview to precapture | %" TIME_FORMAT " | %" TIME_FORMAT " | %"
+      TIME_FORMAT " | %" TIME_FORMAT " | %" TIME_FORMAT " | %" TIMEDIFF_FORMAT
+      "\n", TIME_ARGS (min.preview_to_precapture),
+      TIME_ARGS (max.preview_to_precapture),
+      TIME_ARGS (avg.preview_to_precapture),
+      TIME_ARGS (avg_wo_first.preview_to_precapture),
+      TIME_ARGS (target_preview_to_precapture),
+      TIMEDIFF_ARGS (TIME_DIFF (avg.preview_to_precapture,
+              target_preview_to_precapture)));
+  g_print ("Shot to buffer        | %" TIME_FORMAT " | %" TIME_FORMAT " | %"
+      TIME_FORMAT " | %" TIME_FORMAT " | %" TIME_FORMAT " | %" TIMEDIFF_FORMAT
+      "\n", TIME_ARGS (min.shot_to_buffer), TIME_ARGS (max.shot_to_buffer),
+      TIME_ARGS (avg.shot_to_buffer), TIME_ARGS (avg_wo_first.shot_to_buffer),
+      TIME_ARGS (target_shot_to_buffer),
+      TIMEDIFF_ARGS (TIME_DIFF (avg.shot_to_buffer, target_shot_to_buffer)));
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -849,6 +1223,17 @@ main (int argc, char *argv[])
     {"video-capture-caps", '\0', 0,
           G_OPTION_ARG_STRING, &video_capture_caps_str,
         "Video capture caps (e.g. video/x-raw-rgb,width=640,height=480)", NULL},
+    {"performance-measure", '\0', 0,
+          G_OPTION_ARG_NONE, &performance_measure,
+          "If performance information should be printed at the end of execution",
+        NULL},
+    {"performance-targets", '\0', 0,
+          G_OPTION_ARG_STRING, &performance_targets_str,
+          "Comma separated list of doubles representing the target values in "
+          "seconds. The order is: startup time, change mode time, shot to save"
+          ", shot to snapshot, shot to shot, preview to shot, shot to buffer. "
+          "e.g. 3.5,1.0,5.0,2.5,5.0,1.5,1.0",
+        NULL},
     {NULL}
   };
 
@@ -885,8 +1270,6 @@ main (int argc, char *argv[])
   if (filename->len == 0)
     filename = g_string_append (filename, ".");
 
-  timer = g_timer_new ();
-
   /* init */
   if (setup_pipeline ()) {
     loop = g_main_loop_new (NULL, FALSE);
@@ -895,7 +1278,22 @@ main (int argc, char *argv[])
     cleanup_pipeline ();
     g_main_loop_unref (loop);
   }
+
+  /* performance */
+  if (performance_measure) {
+    print_performance_data ();
+  }
+
   /* free */
+  {
+    GList *iter;
+
+    for (iter = capture_times; iter; iter = g_list_next (iter)) {
+      g_slice_free (CaptureTiming, iter->data);
+    }
+    g_list_free (capture_times);
+  }
+
   g_string_free (filename, TRUE);
   g_free (ev_option);
   g_free (wrappersrc_name);
@@ -908,7 +1306,7 @@ main (int argc, char *argv[])
   g_free (gep_targetname);
   g_free (gep_profilename);
   g_free (gep_filename);
-  g_timer_destroy (timer);
+  g_free (performance_targets_str);
 
   if (window)
     XDestroyWindow (display, window);

From ac2d5821b3f5c775143041168c154a06464930b0 Mon Sep 17 00:00:00 2001
From: Thiago Santos <thiago.sousa.santos@collabora.co.uk>
Date: Wed, 15 Jun 2011 08:20:31 -0300
Subject: [PATCH 019/158] camerabin2: Minor debug message fix

---
 gst/camerabin2/gstcamerabin2.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gst/camerabin2/gstcamerabin2.c b/gst/camerabin2/gstcamerabin2.c
index 9df16a1ddc..a0dbccbd4b 100644
--- a/gst/camerabin2/gstcamerabin2.c
+++ b/gst/camerabin2/gstcamerabin2.c
@@ -328,7 +328,8 @@ gst_camera_bin_src_notify_readyforcapture (GObject * obj, GParamSpec * pspec,
       gst_element_set_state (camera->image_encodebin, GST_STATE_NULL);
       gst_element_set_state (camera->imagebin_queue, GST_STATE_NULL);
       gst_element_set_state (camera->imagebin_capsfilter, GST_STATE_NULL);
-      GST_DEBUG_OBJECT (camera, "Switching imagebin location to %s", location);
+      GST_DEBUG_OBJECT (camera, "Switching imagebin location to %s",
+          camera->image_location);
       g_object_set (camera->imagesink, "location", camera->image_location,
           NULL);
       gst_element_set_state (camera->imagesink, GST_STATE_PLAYING);

From 18f68590377f9ab04da0c3bdf429b643d3dafdc2 Mon Sep 17 00:00:00 2001
From: Thiago Santos <thiago.sousa.santos@collabora.co.uk>
Date: Fri, 17 Jun 2011 14:32:35 -0300
Subject: [PATCH 020/158] tests: camerabin2: Adds new test to check image
 location correctness

This new test checks that images are saved with the filename setting
on location on the moment of the start-capture
---
 tests/check/elements/camerabin2.c | 101 ++++++++++++++++++++++++++++++
 1 file changed, 101 insertions(+)

diff --git a/tests/check/elements/camerabin2.c b/tests/check/elements/camerabin2.c
index 6f58a1e25a..18dd9f0f42 100644
--- a/tests/check/elements/camerabin2.c
+++ b/tests/check/elements/camerabin2.c
@@ -164,6 +164,7 @@ gst_test_camera_src_init (GstTestCameraSrc * self,
 static GstElement *camera;
 static guint bus_source;
 static GMainLoop *main_loop;
+static gint capture_count = 0;
 guint32 test_id = 0;
 
 static GstBuffer *preview_buffer;
@@ -359,6 +360,7 @@ setup_wrappercamerabinsrc_videotestsrc (void)
   gst_object_unref (bus);
 
   tags_found = NULL;
+  capture_count = 0;
 
   GST_INFO ("init finished");
 }
@@ -1233,6 +1235,103 @@ GST_START_TEST (test_video_custom_filter)
 
 GST_END_TEST;
 
+#define LOCATION_SWITCHING_FILENAMES_COUNT 5
+
+static gboolean
+image_location_switch_do_capture (gpointer data)
+{
+  gchar **filenames = data;
+  if (capture_count >= LOCATION_SWITCHING_FILENAMES_COUNT) {
+    g_main_loop_quit (main_loop);
+  }
+
+  g_object_set (camera, "location", filenames[capture_count], NULL);
+  g_signal_emit_by_name (camera, "start-capture", NULL);
+  capture_count++;
+  return FALSE;
+}
+
+static void
+image_location_switch_readyforcapture (GObject * obj, GParamSpec * pspec,
+    gpointer user_data)
+{
+  gboolean ready;
+
+  g_object_get (obj, "ready-for-capture", &ready, NULL);
+  if (ready) {
+    g_idle_add (image_location_switch_do_capture, user_data);
+  }
+};
+
+/*
+ * Tests that setting the location and then doing an image
+ * capture will set this capture resulting filename to the
+ * correct location.
+ *
+ * There was a bug in which setting the location, issuing a capture 
+ * and then setting a new location would cause this capture to have
+ * the location set after this capture. This test should prevent it
+ * from happening again.
+ */
+GST_START_TEST (test_image_location_switching)
+{
+  gchar *filenames[LOCATION_SWITCHING_FILENAMES_COUNT + 1];
+  gint i;
+  glong notify_id;
+  GstCaps *caps;
+  GstElement *src;
+
+  if (!camera)
+    return;
+
+  g_object_get (camera, "camera-source", &src, NULL);
+
+  for (i = 0; i < LOCATION_SWITCHING_FILENAMES_COUNT; i++) {
+    filenames[i] =
+        g_strdup (make_test_file_name ("image-switching-filename-test", i));
+  }
+  filenames[LOCATION_SWITCHING_FILENAMES_COUNT] = NULL;
+
+  /* set still image mode */
+  g_object_set (camera, "mode", 1, NULL);
+  caps = gst_caps_new_simple ("video/x-raw-rgb", "width", G_TYPE_INT,
+      800, "height", G_TYPE_INT, 600, NULL);
+  g_object_set (camera, "image-capture-caps", caps, NULL);
+  gst_caps_unref (caps);
+
+  if (gst_element_set_state (GST_ELEMENT (camera), GST_STATE_PLAYING) ==
+      GST_STATE_CHANGE_FAILURE) {
+    GST_WARNING ("setting camerabin to PLAYING failed");
+    gst_element_set_state (GST_ELEMENT (camera), GST_STATE_NULL);
+    gst_object_unref (camera);
+    camera = NULL;
+  }
+  fail_unless (camera != NULL);
+  GST_INFO ("starting capture");
+
+  notify_id = g_signal_connect (G_OBJECT (src),
+      "notify::ready-for-capture",
+      G_CALLBACK (image_location_switch_readyforcapture), filenames);
+
+  g_idle_add (image_location_switch_do_capture, filenames);
+  g_main_loop_run (main_loop);
+
+  g_usleep (G_USEC_PER_SEC * 3);
+  gst_element_set_state (GST_ELEMENT (camera), GST_STATE_NULL);
+
+  for (i = 0; i < LOCATION_SWITCHING_FILENAMES_COUNT; i++) {
+    GST_INFO ("Checking for file: %s", filenames[i]);
+    fail_unless (g_file_test (filenames[i], G_FILE_TEST_IS_REGULAR));
+  }
+
+  for (i = 0; i < LOCATION_SWITCHING_FILENAMES_COUNT; i++) {
+    g_free (filenames[i]);
+  }
+  g_signal_handler_disconnect (src, notify_id);
+}
+
+GST_END_TEST;
+
 
 typedef struct _TestCaseDef
 {
@@ -1291,6 +1390,8 @@ camerabin_suite (void)
 
     tcase_add_test (tc_basic, test_image_custom_filter);
     tcase_add_test (tc_basic, test_video_custom_filter);
+
+    tcase_add_test (tc_basic, test_image_location_switching);
   }
 
 end:

From e23e5380d3fdf990fbc68c40fe8bdb1f59576e31 Mon Sep 17 00:00:00 2001
From: Thiago Santos <thiago.sousa.santos@collabora.co.uk>
Date: Fri, 17 Jun 2011 17:26:37 -0300
Subject: [PATCH 021/158] camerabin2: Remove unused variable

---
 gst/camerabin2/gstcamerabin2.c | 6 ------
 gst/camerabin2/gstcamerabin2.h | 1 -
 2 files changed, 7 deletions(-)

diff --git a/gst/camerabin2/gstcamerabin2.c b/gst/camerabin2/gstcamerabin2.c
index a0dbccbd4b..227724dbc5 100644
--- a/gst/camerabin2/gstcamerabin2.c
+++ b/gst/camerabin2/gstcamerabin2.c
@@ -382,12 +382,6 @@ gst_camera_bin_dispose (GObject * object)
     g_signal_handler_disconnect (camerabin->video_encodebin,
         camerabin->video_encodebin_signal_id);
 
-  if (camerabin->videosink_probe) {
-    GstPad *pad = gst_element_get_static_pad (camerabin->videosink, "sink");
-    gst_pad_remove_data_probe (pad, camerabin->videosink_probe);
-    gst_object_unref (pad);
-  }
-
   if (camerabin->videosink)
     gst_object_unref (camerabin->videosink);
   if (camerabin->video_encodebin)
diff --git a/gst/camerabin2/gstcamerabin2.h b/gst/camerabin2/gstcamerabin2.h
index 59e3723dff..449b300f66 100644
--- a/gst/camerabin2/gstcamerabin2.h
+++ b/gst/camerabin2/gstcamerabin2.h
@@ -45,7 +45,6 @@ struct _GstCameraBin
   GstElement *video_encodebin;
   gulong video_encodebin_signal_id;
   GstElement *videosink;
-  gulong videosink_probe;
   GstElement *videobin_queue;
   GstElement *videobin_capsfilter;
 

From b1b0082cdb0f4f6fada0e8df9053e2ecb6de8d0b Mon Sep 17 00:00:00 2001
From: Thiago Santos <thiago.sousa.santos@collabora.co.uk>
Date: Wed, 22 Jun 2011 15:37:44 -0300
Subject: [PATCH 022/158] camerabin2: Use names for image and video encodebin

Naming encodebins as image-encodebin and video-encodebin to make
it easier for debugging camerabin2.
---
 gst/camerabin2/gstcamerabin2.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gst/camerabin2/gstcamerabin2.c b/gst/camerabin2/gstcamerabin2.c
index 227724dbc5..f69b3d350d 100644
--- a/gst/camerabin2/gstcamerabin2.c
+++ b/gst/camerabin2/gstcamerabin2.c
@@ -981,7 +981,8 @@ gst_camera_bin_create_elements (GstCameraBin * camera)
   if (!camera->elements_created) {
     /* TODO check that elements created in _init were really created */
 
-    camera->video_encodebin = gst_element_factory_make ("encodebin", NULL);
+    camera->video_encodebin =
+        gst_element_factory_make ("encodebin", "video-encodebin");
     if (!camera->video_encodebin) {
       missing_element_name = "encodebin";
       goto missing_element;
@@ -1036,7 +1037,8 @@ gst_camera_bin_create_elements (GstCameraBin * camera)
       camera->video_profile_switch = TRUE;
     }
 
-    camera->image_encodebin = gst_element_factory_make ("encodebin", NULL);
+    camera->image_encodebin =
+        gst_element_factory_make ("encodebin", "image-encodebin");
     if (!camera->image_encodebin) {
       missing_element_name = "encodebin";
       goto missing_element;

From a33eae1a659ea8eb2c104a63c45c7c2e81243f9d Mon Sep 17 00:00:00 2001
From: Thiago Santos <thiago.sousa.santos@collabora.co.uk>
Date: Wed, 22 Jun 2011 15:56:26 -0300
Subject: [PATCH 023/158] camerabin2: No need to change state of the whole
 image branch

We only need to change the state of the filesink to switch its
saving location. This might still cause some problems of dropping
captured buffers, but it is better than changing the state of
the whole branch.
---
 gst/camerabin2/gstcamerabin2.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/gst/camerabin2/gstcamerabin2.c b/gst/camerabin2/gstcamerabin2.c
index f69b3d350d..10a996c535 100644
--- a/gst/camerabin2/gstcamerabin2.c
+++ b/gst/camerabin2/gstcamerabin2.c
@@ -325,17 +325,11 @@ gst_camera_bin_src_notify_readyforcapture (GObject * obj, GParamSpec * pspec,
       gst_element_set_state (camera->videobin_queue, GST_STATE_PLAYING);
     } else if (camera->mode == MODE_IMAGE) {
       gst_element_set_state (camera->imagesink, GST_STATE_NULL);
-      gst_element_set_state (camera->image_encodebin, GST_STATE_NULL);
-      gst_element_set_state (camera->imagebin_queue, GST_STATE_NULL);
-      gst_element_set_state (camera->imagebin_capsfilter, GST_STATE_NULL);
       GST_DEBUG_OBJECT (camera, "Switching imagebin location to %s",
           camera->image_location);
       g_object_set (camera->imagesink, "location", camera->image_location,
           NULL);
       gst_element_set_state (camera->imagesink, GST_STATE_PLAYING);
-      gst_element_set_state (camera->image_encodebin, GST_STATE_PLAYING);
-      gst_element_set_state (camera->imagebin_capsfilter, GST_STATE_PLAYING);
-      gst_element_set_state (camera->imagebin_queue, GST_STATE_PLAYING);
     }
 
   }

From f31554bc4f8d0451778680fa4dfd432a95100b35 Mon Sep 17 00:00:00 2001
From: Thiago Santos <thiago.sousa.santos@collabora.co.uk>
Date: Wed, 22 Jun 2011 16:27:00 -0300
Subject: [PATCH 024/158] camerabin2: Send serialized custom events for
 filename changes in image sink

Using serialized custom events for switching image capture saving
location makes camerabin2 save each capture correctly to the location
that was set during the moment start-capture was called, and not
the moment the filesink was writing to disk.

This prevents captures to be overwriten by racyness among start-capture
and setting location for images.
---
 gst/camerabin2/gstcamerabin2.c | 128 ++++++++++++++++++++++++++++-----
 gst/camerabin2/gstcamerabin2.h |   8 ++-
 2 files changed, 117 insertions(+), 19 deletions(-)

diff --git a/gst/camerabin2/gstcamerabin2.c b/gst/camerabin2/gstcamerabin2.c
index 10a996c535..b2b14b5801 100644
--- a/gst/camerabin2/gstcamerabin2.c
+++ b/gst/camerabin2/gstcamerabin2.c
@@ -206,6 +206,14 @@ gst_camera_bin_new_event_renegotiate (void)
       gst_structure_new ("renegotiate", NULL));
 }
 
+static GstEvent *
+gst_camera_bin_new_event_file_location (const gchar * location)
+{
+  return gst_event_new_custom (GST_EVENT_CUSTOM_DOWNSTREAM,
+      gst_structure_new ("new-location", "location", G_TYPE_STRING, location,
+          NULL));
+}
+
 static void
 gst_camera_bin_start_capture (GstCameraBin * camerabin)
 {
@@ -224,18 +232,28 @@ gst_camera_bin_start_capture (GstCameraBin * camerabin)
 
   GST_CAMERA_BIN_PROCESSING_INC (camerabin);
 
-  if (camerabin->mode == MODE_VIDEO && camerabin->audio_src) {
-    gst_element_set_state (camerabin->audio_src, GST_STATE_READY);
-    /* need to reset eos status (pads could be flushing) */
-    gst_element_set_state (camerabin->audio_queue, GST_STATE_READY);
-    gst_element_set_state (camerabin->audio_convert, GST_STATE_READY);
-    gst_element_set_state (camerabin->audio_capsfilter, GST_STATE_READY);
-    gst_element_set_state (camerabin->audio_volume, GST_STATE_READY);
+  if (camerabin->mode == MODE_VIDEO) {
+    if (camerabin->audio_src) {
+      gst_element_set_state (camerabin->audio_src, GST_STATE_READY);
+      /* need to reset eos status (pads could be flushing) */
+      gst_element_set_state (camerabin->audio_queue, GST_STATE_READY);
+      gst_element_set_state (camerabin->audio_convert, GST_STATE_READY);
+      gst_element_set_state (camerabin->audio_capsfilter, GST_STATE_READY);
+      gst_element_set_state (camerabin->audio_volume, GST_STATE_READY);
 
-    gst_element_sync_state_with_parent (camerabin->audio_queue);
-    gst_element_sync_state_with_parent (camerabin->audio_convert);
-    gst_element_sync_state_with_parent (camerabin->audio_capsfilter);
-    gst_element_sync_state_with_parent (camerabin->audio_volume);
+      gst_element_sync_state_with_parent (camerabin->audio_queue);
+      gst_element_sync_state_with_parent (camerabin->audio_convert);
+      gst_element_sync_state_with_parent (camerabin->audio_capsfilter);
+      gst_element_sync_state_with_parent (camerabin->audio_volume);
+    }
+  } else {
+    gchar *location;
+
+    /* store the next capture buffer filename */
+    location =
+        g_strdup_printf (camerabin->image_location, camerabin->image_index++);
+    camerabin->image_location_list =
+        g_slist_append (camerabin->image_location_list, location);
   }
 
   g_signal_emit_by_name (camerabin->src, "start-capture", NULL);
@@ -323,13 +341,6 @@ gst_camera_bin_src_notify_readyforcapture (GObject * obj, GParamSpec * pspec,
       gst_element_set_state (camera->video_encodebin, GST_STATE_PLAYING);
       gst_element_set_state (camera->videobin_capsfilter, GST_STATE_PLAYING);
       gst_element_set_state (camera->videobin_queue, GST_STATE_PLAYING);
-    } else if (camera->mode == MODE_IMAGE) {
-      gst_element_set_state (camera->imagesink, GST_STATE_NULL);
-      GST_DEBUG_OBJECT (camera, "Switching imagebin location to %s",
-          camera->image_location);
-      g_object_set (camera->imagesink, "location", camera->image_location,
-          NULL);
-      gst_element_set_state (camera->imagesink, GST_STATE_PLAYING);
     }
 
   }
@@ -951,6 +962,65 @@ gst_camera_bin_src_notify_max_zoom_cb (GObject * self, GParamSpec * pspec,
   g_object_notify (G_OBJECT (camera), "max-zoom");
 }
 
+static gboolean
+gst_camera_bin_image_src_buffer_probe (GstPad * pad, GstBuffer * buf,
+    gpointer data)
+{
+  GstCameraBin *camerabin = data;
+  GstEvent *evt;
+  gchar *location = NULL;
+  GstPad *peer;
+
+  if (camerabin->image_location_list) {
+    location = camerabin->image_location_list->data;
+    camerabin->image_location_list =
+        g_slist_delete_link (camerabin->image_location_list,
+        camerabin->image_location_list);
+    GST_DEBUG_OBJECT (camerabin, "Sending image location change to %s",
+        location);
+  } else {
+    GST_DEBUG_OBJECT (camerabin, "No filename location change to send");
+    return TRUE;
+  }
+
+  evt = gst_camera_bin_new_event_file_location (location);
+  peer = gst_pad_get_peer (pad);
+  gst_pad_send_event (peer, evt);
+  g_free (location);
+  gst_object_unref (peer);
+
+  return TRUE;
+}
+
+
+static gboolean
+gst_camera_bin_image_sink_event_probe (GstPad * pad, GstEvent * event,
+    gpointer data)
+{
+  GstCameraBin *camerabin = data;
+
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_CUSTOM_DOWNSTREAM:{
+      if (gst_event_has_name (event, "new-location")) {
+        const GstStructure *structure = gst_event_get_structure (event);
+        const gchar *filename = gst_structure_get_string (structure,
+            "location");
+
+        gst_element_set_state (camerabin->imagesink, GST_STATE_NULL);
+        GST_DEBUG_OBJECT (camerabin, "Setting filename to imagesink: %s",
+            filename);
+        g_object_set (camerabin->imagesink, "location", filename, NULL);
+        gst_element_set_state (camerabin->imagesink, GST_STATE_PLAYING);
+      }
+    }
+      break;
+    default:
+      break;
+  }
+
+  return TRUE;
+}
+
 /**
  * gst_camera_bin_create_elements:
  * @param camera: the #GstCameraBin
@@ -1101,6 +1171,19 @@ gst_camera_bin_create_elements (GstCameraBin * camera)
     gst_element_link (camera->image_encodebin, camera->imagesink);
     gst_element_link_many (camera->viewfinderbin_queue,
         camera->viewfinderbin_capsfilter, camera->viewfinderbin, NULL);
+
+    {
+      /* set an event probe to watch for custom location changes */
+      GstPad *srcpad;
+
+      srcpad = gst_element_get_static_pad (camera->image_encodebin, "src");
+
+      gst_pad_add_event_probe (srcpad,
+          (GCallback) gst_camera_bin_image_sink_event_probe, camera);
+
+      gst_object_unref (srcpad);
+    }
+
     /*
      * Video can't get into playing as its internal filesink will open
      * a file for writing and leave it empty if unused.
@@ -1183,6 +1266,8 @@ gst_camera_bin_create_elements (GstCameraBin * camera)
         (GCallback) gst_camera_bin_src_notify_max_zoom_cb, camera);
   }
   if (new_src) {
+    GstPad *imgsrc = gst_element_get_static_pad (camera->src, "imgsrc");
+
     gst_bin_add (GST_BIN_CAST (camera), gst_object_ref (camera->src));
     camera->src_capture_notify_id = g_signal_connect (G_OBJECT (camera->src),
         "notify::ready-for-capture",
@@ -1193,6 +1278,10 @@ gst_camera_bin_create_elements (GstCameraBin * camera)
         "sink");
     gst_element_link_pads (camera->src, "vidsrc", camera->videobin_queue,
         "sink");
+
+    gst_pad_add_buffer_probe (imgsrc,
+        (GCallback) gst_camera_bin_image_src_buffer_probe, camera);
+    gst_object_unref (imgsrc);
   }
 
   gst_camera_bin_check_and_replace_filter (camera, &camera->image_filter,
@@ -1308,6 +1397,9 @@ gst_camera_bin_change_state (GstElement * element, GstStateChange trans)
       gst_tag_setter_reset_tags (GST_TAG_SETTER (camera));
       GST_CAMERA_BIN_RESET_PROCESSING_COUNTER (camera);
 
+      g_slist_free_full (camera->image_location_list, g_free);
+      camera->image_location_list = NULL;
+
       /* explicitly set to READY as they might be outside of the bin */
       gst_element_set_state (camera->audio_queue, GST_STATE_READY);
       gst_element_set_state (camera->audio_volume, GST_STATE_READY);
diff --git a/gst/camerabin2/gstcamerabin2.h b/gst/camerabin2/gstcamerabin2.h
index 449b300f66..07c18d10f3 100644
--- a/gst/camerabin2/gstcamerabin2.h
+++ b/gst/camerabin2/gstcamerabin2.h
@@ -74,8 +74,14 @@ struct _GstCameraBin
 
   gint processing_counter; /* atomic int */
 
-  /* Index of the auto incrementing file index for video recordings */
+  /* Index of the auto incrementing file index for captures */
   gint video_index;
+  gint image_index;
+
+  /* stores list of image locations to be pushed to the image sink
+   * as file location change notifications, they are pushed before
+   * each buffer capture */
+  GSList *image_location_list;
 
   gboolean video_profile_switch;
   gboolean image_profile_switch;

From f1fa6c6531f1be3e6dd83719e4ed804fd491ff44 Mon Sep 17 00:00:00 2001
From: Thiago Santos <thiago.sousa.santos@collabora.co.uk>
Date: Wed, 22 Jun 2011 18:58:29 -0300
Subject: [PATCH 025/158] camerabin2: Use a single location for both modes

Implement the location property just like it works in camerabin, the
same location is used for both images and videos
---
 gst/camerabin2/gstcamerabin2.c    | 40 ++++++++++---------------------
 gst/camerabin2/gstcamerabin2.h    |  6 ++---
 tests/check/elements/camerabin2.c | 12 ++++------
 3 files changed, 19 insertions(+), 39 deletions(-)

diff --git a/gst/camerabin2/gstcamerabin2.c b/gst/camerabin2/gstcamerabin2.c
index b2b14b5801..62c9e2adf6 100644
--- a/gst/camerabin2/gstcamerabin2.c
+++ b/gst/camerabin2/gstcamerabin2.c
@@ -127,8 +127,7 @@ enum
 static guint camerabin_signals[LAST_SIGNAL];
 
 #define DEFAULT_MODE MODE_IMAGE
-#define DEFAULT_VID_LOCATION "vid_%d"
-#define DEFAULT_IMG_LOCATION "img_%d"
+#define DEFAULT_LOCATION "cap_%d"
 #define DEFAULT_POST_PREVIEWS TRUE
 #define DEFAULT_MUTE_AUDIO FALSE
 #define DEFAULT_IDLE TRUE
@@ -222,8 +221,7 @@ gst_camera_bin_start_capture (GstCameraBin * camerabin)
   GST_DEBUG_OBJECT (camerabin, "Received start-capture");
 
   /* check that we have a valid location */
-  if ((camerabin->mode == MODE_VIDEO && camerabin->video_location == NULL)
-      || (camerabin->mode == MODE_IMAGE && camerabin->image_location == NULL)) {
+  if (camerabin->location == NULL) {
     GST_ELEMENT_ERROR (camerabin, RESOURCE, OPEN_WRITE,
         (_("File location is set to NULL, please set it to a valid filename")),
         (NULL));
@@ -251,7 +249,7 @@ gst_camera_bin_start_capture (GstCameraBin * camerabin)
 
     /* store the next capture buffer filename */
     location =
-        g_strdup_printf (camerabin->image_location, camerabin->image_index++);
+        g_strdup_printf (camerabin->location, camerabin->capture_index++);
     camerabin->image_location_list =
         g_slist_append (camerabin->image_location_list, location);
   }
@@ -332,8 +330,7 @@ gst_camera_bin_src_notify_readyforcapture (GObject * obj, GParamSpec * pspec,
       gst_element_set_state (camera->video_encodebin, GST_STATE_NULL);
       gst_element_set_state (camera->videobin_capsfilter, GST_STATE_NULL);
       gst_element_set_state (camera->videobin_queue, GST_STATE_NULL);
-      location =
-          g_strdup_printf (camera->video_location, camera->video_index++);
+      location = g_strdup_printf (camera->location, camera->capture_index++);
       GST_DEBUG_OBJECT (camera, "Switching videobin location to %s", location);
       g_object_set (camera->videosink, "location", location, NULL);
       g_free (location);
@@ -351,8 +348,7 @@ gst_camera_bin_dispose (GObject * object)
 {
   GstCameraBin *camerabin = GST_CAMERA_BIN_CAST (object);
 
-  g_free (camerabin->image_location);
-  g_free (camerabin->video_location);
+  g_free (camerabin->location);
 
   if (camerabin->src_capture_notify_id)
     g_signal_handler_disconnect (camerabin->src,
@@ -493,8 +489,8 @@ gst_camera_bin_class_init (GstCameraBinClass * klass)
       g_param_spec_string ("location", "Location",
           "Location to save the captured files. A %d might be used on the"
           "filename as a placeholder for a numeric index of the capture."
-          "Default for images is img_%d and vid_%d for videos",
-          DEFAULT_IMG_LOCATION, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+          "Default is cap_%d",
+          DEFAULT_LOCATION, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   g_object_class_install_property (object_class, PROP_CAMERA_SRC,
       g_param_spec_object ("camera-source", "Camera source",
@@ -691,8 +687,7 @@ gst_camera_bin_init (GstCameraBin * camera)
 {
   camera->post_previews = DEFAULT_POST_PREVIEWS;
   camera->mode = DEFAULT_MODE;
-  camera->video_location = g_strdup (DEFAULT_VID_LOCATION);
-  camera->image_location = g_strdup (DEFAULT_IMG_LOCATION);
+  camera->location = g_strdup (DEFAULT_LOCATION);
   camera->viewfinderbin = gst_element_factory_make ("viewfinderbin", "vf-bin");
   camera->zoom = DEFAULT_ZOOM;
   camera->max_zoom = MAX_ZOOM;
@@ -1196,8 +1191,8 @@ gst_camera_bin_create_elements (GstCameraBin * camera)
     gst_element_set_locked_state (camera->videosink, TRUE);
     gst_element_set_locked_state (camera->imagesink, TRUE);
 
-    g_object_set (camera->videosink, "location", camera->video_location, NULL);
-    g_object_set (camera->imagesink, "location", camera->image_location, NULL);
+    g_object_set (camera->videosink, "location", camera->location, NULL);
+    g_object_set (camera->imagesink, "location", camera->location, NULL);
   }
 
   if (camera->video_profile_switch) {
@@ -1463,13 +1458,8 @@ gst_camera_bin_set_location (GstCameraBin * camera, const gchar * location)
 {
   GST_DEBUG_OBJECT (camera, "Setting mode %d location to %s", camera->mode,
       location);
-  if (camera->mode == MODE_IMAGE) {
-    g_free (camera->image_location);
-    camera->image_location = g_strdup (location);
-  } else {
-    g_free (camera->video_location);
-    camera->video_location = g_strdup (location);
-  }
+  g_free (camera->location);
+  camera->location = g_strdup (location);
 }
 
 static void
@@ -1692,11 +1682,7 @@ gst_camera_bin_get_property (GObject * object, guint prop_id,
       g_value_set_enum (value, camera->mode);
       break;
     case PROP_LOCATION:
-      if (camera->mode == MODE_VIDEO) {
-        g_value_set_string (value, camera->video_location);
-      } else {
-        g_value_set_string (value, camera->image_location);
-      }
+      g_value_set_string (value, camera->location);
       break;
     case PROP_CAMERA_SRC:
       g_value_set_object (value, camera->user_src);
diff --git a/gst/camerabin2/gstcamerabin2.h b/gst/camerabin2/gstcamerabin2.h
index 07c18d10f3..b30e2ef3cd 100644
--- a/gst/camerabin2/gstcamerabin2.h
+++ b/gst/camerabin2/gstcamerabin2.h
@@ -75,8 +75,7 @@ struct _GstCameraBin
   gint processing_counter; /* atomic int */
 
   /* Index of the auto incrementing file index for captures */
-  gint video_index;
-  gint image_index;
+  gint capture_index;
 
   /* stores list of image locations to be pushed to the image sink
    * as file location change notifications, they are pushed before
@@ -88,8 +87,7 @@ struct _GstCameraBin
 
   /* properties */
   gint mode;
-  gchar *video_location;
-  gchar *image_location;
+  gchar *location;
   gboolean post_previews;
   GstCaps *preview_caps;
   GstElement *preview_filter;
diff --git a/tests/check/elements/camerabin2.c b/tests/check/elements/camerabin2.c
index 18dd9f0f42..1016a0ca86 100644
--- a/tests/check/elements/camerabin2.c
+++ b/tests/check/elements/camerabin2.c
@@ -746,14 +746,6 @@ GST_START_TEST (test_image_video_cycle)
   if (!camera)
     return;
 
-  /* set filepaths for image and videos */
-  g_object_set (camera, "mode", 1, NULL);
-  g_object_set (camera, "location", make_test_file_name (IMAGE_FILENAME, -1),
-      NULL);
-  g_object_set (camera, "mode", 2, NULL);
-  g_object_set (camera, "location", make_test_file_name (VIDEO_FILENAME, -1),
-      NULL);
-
   if (gst_element_set_state (GST_ELEMENT (camera), GST_STATE_PLAYING) ==
       GST_STATE_CHANGE_FAILURE) {
     GST_WARNING ("setting camerabin to PLAYING failed");
@@ -769,6 +761,8 @@ GST_START_TEST (test_image_video_cycle)
 
     /* take a picture */
     g_object_set (camera, "mode", 1, NULL);
+    g_object_set (camera, "location", make_test_file_name (IMAGE_FILENAME, i),
+        NULL);
     g_signal_emit_by_name (camera, "start-capture", NULL);
     g_timeout_add_seconds (3, (GSourceFunc) g_main_loop_quit, main_loop);
     g_main_loop_run (main_loop);
@@ -777,6 +771,8 @@ GST_START_TEST (test_image_video_cycle)
 
     /* now go to video */
     g_object_set (camera, "mode", 2, NULL);
+    g_object_set (camera, "location", make_test_file_name (VIDEO_FILENAME, i),
+        NULL);
     g_signal_emit_by_name (camera, "start-capture", NULL);
     g_timeout_add_seconds (VIDEO_DURATION, (GSourceFunc) g_main_loop_quit,
         main_loop);

From e19a488bce6c33a26032bd67a012805d550f2a6b Mon Sep 17 00:00:00 2001
From: Thiago Santos <thiago.sousa.santos@collabora.co.uk>
Date: Wed, 22 Jun 2011 22:25:18 -0300
Subject: [PATCH 026/158] camerabin2: Set tagsetters to merge replace mode

The default for tagsetters is to use merge keep mode, so tags
would never be replaced and all captures would have the same tags.

This commit watches all elements added into encodebin and sets
all tagsetters to merge replace mode
---
 gst/camerabin2/gstcamerabin2.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gst/camerabin2/gstcamerabin2.c b/gst/camerabin2/gstcamerabin2.c
index 62c9e2adf6..9e34989373 100644
--- a/gst/camerabin2/gstcamerabin2.c
+++ b/gst/camerabin2/gstcamerabin2.c
@@ -828,6 +828,12 @@ encodebin_element_added (GstElement * encodebin, GstElement * new_element,
       g_object_set (new_element, "skip-to-first", TRUE, NULL);
     }
   }
+
+  if (gst_element_implements_interface (new_element, GST_TYPE_TAG_SETTER)) {
+    GstTagSetter *tagsetter = GST_TAG_SETTER (new_element);
+
+    gst_tag_setter_set_tag_merge_mode (tagsetter, GST_TAG_MERGE_REPLACE);
+  }
 }
 
 #define VIDEO_PAD 1

From 96524e6a20a285c1dd1eabe46ef539e9939db33c Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Thu, 23 Jun 2011 11:28:53 -0700
Subject: [PATCH 027/158] Automatic update of common submodule

From 69b981f to 605cd9a
---
 common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common b/common
index 69b981f10c..605cd9a65e 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 69b981f10caa234ad0ff639179d0fda8505bd94b
+Subproject commit 605cd9a65ed61505f24b840d3fe8e252be72b151

From 2b2e6fbdeaf1cada6a43552fc69e8b77918f6e5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Thu, 23 Jun 2011 20:11:55 +0100
Subject: [PATCH 028/158] camerabin2: don't use GLib 2.28 API

Don't use GLib 2.28 API, we still only require >= 2.24.
---
 gst/camerabin2/gstcamerabin2.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gst/camerabin2/gstcamerabin2.c b/gst/camerabin2/gstcamerabin2.c
index 9e34989373..b7fb766b06 100644
--- a/gst/camerabin2/gstcamerabin2.c
+++ b/gst/camerabin2/gstcamerabin2.c
@@ -1398,7 +1398,8 @@ gst_camera_bin_change_state (GstElement * element, GstStateChange trans)
       gst_tag_setter_reset_tags (GST_TAG_SETTER (camera));
       GST_CAMERA_BIN_RESET_PROCESSING_COUNTER (camera);
 
-      g_slist_free_full (camera->image_location_list, g_free);
+      g_slist_foreach (camera->image_location_list, (GFunc) g_free, NULL);
+      g_slist_free (camera->image_location_list);
       camera->image_location_list = NULL;
 
       /* explicitly set to READY as they might be outside of the bin */

From f5391e135a86508f02daa61ac7e1a9e599a14453 Mon Sep 17 00:00:00 2001
From: Alexey Fisher <bug-track@fisher-privat.net>
Date: Sat, 18 Jun 2011 17:47:36 +0200
Subject: [PATCH 029/158] vp8dec: add check if we have legal aspect-ratio
 before reset it.

the commit f9b552f0494e (vp8dec: set par to 1/1)
will fix situation where no aspect-ratio is set, but it brake
stream with available aspect-ratio. This patch fix it.

Fixes: #652902.

Signed-off-by: Alexey Fisher <bug-track@fisher-privat.net>
---
 ext/vp8/gstvp8dec.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ext/vp8/gstvp8dec.c b/ext/vp8/gstvp8dec.c
index a945717be4..4376f4be70 100644
--- a/ext/vp8/gstvp8dec.c
+++ b/ext/vp8/gstvp8dec.c
@@ -405,8 +405,10 @@ gst_vp8_dec_handle_frame (GstBaseVideoDecoder * decoder, GstVideoFrame * frame)
     state->width = stream_info.w;
     state->height = stream_info.h;
     state->format = GST_VIDEO_FORMAT_I420;
-    state->par_n = 1;
-    state->par_d = 1;
+    if (state->par_n == 0 || state->par_d == 0) {
+      state->par_n = 1;
+      state->par_d = 1;
+    }
     gst_vp8_dec_send_tags (dec);
     gst_base_video_decoder_set_src_caps (decoder);
 

From 40ee3369a0e0c555e94cdec06ab8b1303ca3c094 Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Sat, 25 Jun 2011 15:12:45 -0700
Subject: [PATCH 030/158] tta: decrease rank to NONE

Appears to be utterly incapable of parsing and decoding TTA streams.
Hasn't been updated to do TTA2.  If you want this element to work,
fix the bloody thing.  The gst-ffmpeg decoder works fine.

Also fixed an obvious endianness issue along the way.

Fixes: #652924
---
 gst/tta/gstttadec.c   | 6 +++---
 gst/tta/gstttaparse.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gst/tta/gstttadec.c b/gst/tta/gstttadec.c
index e2c1f5a37a..4565272797 100644
--- a/gst/tta/gstttadec.c
+++ b/gst/tta/gstttadec.c
@@ -89,7 +89,7 @@ static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
         "depth = (int) { 8, 16, 24 }, "
         "channels = (int) { 1, 2 }, "
         "rate = (int) [ 8000, 96000 ], "
-        "endianness = (int) LITTLE_ENDIAN, " "signed = (boolean) true")
+        "endianness = (int) BYTE_ORDER, " "signed = (boolean) true")
     );
 
 static void gst_tta_dec_class_init (GstTtaDecClass * klass);
@@ -125,7 +125,7 @@ gst_tta_dec_setcaps (GstPad * pad, GstCaps * caps)
       "channels", G_TYPE_INT, ttadec->channels,
       "depth", G_TYPE_INT, bits,
       "width", G_TYPE_INT, bits,
-      "endianness", G_TYPE_INT, G_LITTLE_ENDIAN,
+      "endianness", G_TYPE_INT, G_BYTE_ORDER,
       "signed", G_TYPE_BOOLEAN, TRUE, NULL);
 
   if (!gst_pad_set_caps (ttadec->srcpad, srccaps))
@@ -445,5 +445,5 @@ gboolean
 gst_tta_dec_plugin_init (GstPlugin * plugin)
 {
   return gst_element_register (plugin, "ttadec",
-      GST_RANK_PRIMARY, GST_TYPE_TTA_DEC);
+      GST_RANK_NONE, GST_TYPE_TTA_DEC);
 }
diff --git a/gst/tta/gstttaparse.c b/gst/tta/gstttaparse.c
index fc2b02b308..069408ab60 100644
--- a/gst/tta/gstttaparse.c
+++ b/gst/tta/gstttaparse.c
@@ -495,7 +495,7 @@ gboolean
 gst_tta_parse_plugin_init (GstPlugin * plugin)
 {
   if (!gst_element_register (plugin, "ttaparse",
-          GST_RANK_PRIMARY, GST_TYPE_TTA_PARSE)) {
+          GST_RANK_NONE, GST_TYPE_TTA_PARSE)) {
     return FALSE;
   }
 

From 59aaf71b0bc2534a082e423064b9d2fe095abc59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Raimo=20J=C3=A4rvi?= <raimo.jarvi@gmail.com>
Date: Tue, 7 Jun 2011 13:55:38 +0300
Subject: [PATCH 031/158] d3dvideosink: Fix configure check and makefiles

Fixes bug #652035.
---
 configure.ac                 | 10 ++++------
 sys/Makefile.am              |  2 +-
 sys/d3dvideosink/Makefile.am |  5 +++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4e41553884..da0305baf8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -463,16 +463,15 @@ AG_GST_CHECK_FEATURE(DIRECT3D, [Direct3D plug-in], direct3dsink, [
   save_LIBS="$LIBS"
   CFLAGS="$CFLAGS $DIRECTX_CFLAGS"
   LDFLAGS="$LDFLAGS $DIRECTX_LDFLAGS"
-  LIBS="$LIBS -ld3d -lgdi32"
+  LIBS="$LIBS -ld3d9 -lgdi32"
   AC_MSG_CHECKING(for Direct3D LDFLAGS)
   AC_LINK_IFELSE([
 #include <windows.h>
-#include <d3d.h>
+#include <d3d9.h>
 
 int main ()
 {
-  GetStockObject(0);
-  Direct3DCreate(NULL, NULL, NULL);
+  Direct3DCreate9(D3D_SDK_VERSION);
 
   return 0;
 }
@@ -485,8 +484,7 @@ int main ()
   LIBS=$save_LIBS
 
   if test "x$HAVE_DIRECT3D" = "xyes";  then
-    dnl this is much more than we want
-    DIRECT3D_LIBS="-ld3d -ldxguid -lgdi32"
+    DIRECT3D_LIBS="-lgdi32"
     AC_SUBST(DIRECT3D_LIBS)
   fi
   AC_SUBST(HAVE_DIRECT3D)
diff --git a/sys/Makefile.am b/sys/Makefile.am
index 89e898d0ac..5df060c861 100644
--- a/sys/Makefile.am
+++ b/sys/Makefile.am
@@ -113,7 +113,7 @@ else
 AVC_DIR=
 endif
 
-SUBDIRS = $(ACM_DIR) $(APPLE_MEDIA_DIR) $(AVC_DIR) $(D3DVIDEOSINK) $(DECKLINK_DIR) $(DIRECTDRAW_DIR) $(DIRECTSOUND_DIR) $(DVB_DIR) $(FBDEV_DIR) $(LINSYS_DIR) $(OSX_VIDEO_DIR) $(QT_DIR) $(SHM_DIR) $(VCD_DIR) $(VDPAU_DIR) $(WININET_DIR)
+SUBDIRS = $(ACM_DIR) $(APPLE_MEDIA_DIR) $(AVC_DIR) $(D3DVIDEOSINK_DIR) $(DECKLINK_DIR) $(DIRECTDRAW_DIR) $(DIRECTSOUND_DIR) $(DVB_DIR) $(FBDEV_DIR) $(LINSYS_DIR) $(OSX_VIDEO_DIR) $(QT_DIR) $(SHM_DIR) $(VCD_DIR) $(VDPAU_DIR) $(WININET_DIR)
 
 DIST_SUBDIRS = acmenc acmmp3dec applemedia avc d3dvideosink decklink directdraw directsound dvb linsys fbdev dshowdecwrapper dshowsrcwrapper dshowvideosink \
 		osxvideo qtwrapper shm vcd vdpau wasapi wininet winks winscreencap
diff --git a/sys/d3dvideosink/Makefile.am b/sys/d3dvideosink/Makefile.am
index 6e0ecf316c..183e460cf6 100644
--- a/sys/d3dvideosink/Makefile.am
+++ b/sys/d3dvideosink/Makefile.am
@@ -6,8 +6,9 @@ libgstd3dvideosink_la_SOURCES = d3dvideosink.c directx/d3d.c directx/dx.c \
 	directx/directx11/dx11.c directx/directx11/dx11_d3d.c
 libgstd3dvideosink_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_CFLAGS)
 libgstd3dvideosink_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
-	-lgstvideo-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR)
-libgstd3dvideosink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -lgdi32
+	-lgstvideo-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) \
+	$(DIRECT3D_LIBS)
+libgstd3dvideosink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstd3dvideosink_la_LIBTOOLFLAGS = --tag=disable-static
 
 noinst_HEADERS = d3dvideosink.h directx/d3d.h directx/dx.h directx/directx.h \

From f0224088c7c72c0ed2bb856c1b6cb0968e7d08cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Raimo=20J=C3=A4rvi?= <raimo.jarvi@gmail.com>
Date: Sat, 25 Jun 2011 23:55:28 +0300
Subject: [PATCH 032/158] wininet: Fix configure check by including windows.h

Fixes bug #653161.
---
 configure.ac | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index da0305baf8..72689615f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1586,7 +1586,9 @@ translit(dnm, m, l) AM_CONDITIONAL(USE_WININET, true)
 AG_GST_CHECK_FEATURE(WININET, [Windows internet library], wininet, [
   AC_MSG_CHECKING([Checking for windows internet support])
   AC_CHECK_HEADERS([windows.h wininet.h],
-      [HAVE_WININET="yes"], [HAVE_WININET="no"])
+      [HAVE_WININET="yes"], [HAVE_WININET="no"],
+      [AC_INCLUDES_DEFAULT
+#include <windows.h>])
 ])
 
 dnl *** acm ***

From d1fe501eb735d866a6f1899154b82d5f09838bf3 Mon Sep 17 00:00:00 2001
From: Alexey Fisher <bug-track@fisher-privat.net>
Date: Sun, 26 Jun 2011 15:15:54 +0200
Subject: [PATCH 033/158] vp8enc: generate a timestamp for alt-ref frames.

It will fix handling of altref/invisible frames since matroska-mux
drop any fram with no timestamp.

see also:
http://www.webmproject.org/code/specs/container/
The encoder will currently set the AR's timestamp as close as possible
to the previous frame while attempting to provide a timestamp that is
strictly increasing. In cases where the time base given to the encoder
at configure time is not granular enough to allow for this the AR
will share the same timestamp as D, but should be
treated as having no duration.

Fixes bug #652951

Signed-off-by: Alexey Fisher <bug-track@fisher-privat.net>
---
 ext/vp8/gstvp8enc.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ext/vp8/gstvp8enc.c b/ext/vp8/gstvp8enc.c
index ad6a282be2..6f65d955e4 100644
--- a/ext/vp8/gstvp8enc.c
+++ b/ext/vp8/gstvp8enc.c
@@ -939,6 +939,8 @@ gst_vp8_enc_shape_output (GstBaseVideoEncoder * base_video_encoder,
       encoder->keyframe_distance++;
     }
 
+    GST_BUFFER_TIMESTAMP (buf) = GST_BUFFER_TIMESTAMP (frame->src_buffer);
+    GST_BUFFER_DURATION (buf) = 0;
     GST_BUFFER_OFFSET_END (buf) =
         _to_granulepos (frame->presentation_frame_number + 1,
         inv_count, encoder->keyframe_distance);

From 3de8284efd475bfd7f5f0d4d26716ffa022c3fb2 Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Sun, 26 Jun 2011 19:29:24 -0700
Subject: [PATCH 034/158] y4mdec: Fix buffer duration

---
 gst/y4m/gsty4mdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gst/y4m/gsty4mdec.c b/gst/y4m/gsty4mdec.c
index 8065bd3d51..e7c3caf42a 100644
--- a/gst/y4m/gsty4mdec.c
+++ b/gst/y4m/gsty4mdec.c
@@ -530,7 +530,7 @@ gst_y4m_dec_chain (GstPad * pad, GstBuffer * buffer)
     GST_BUFFER_TIMESTAMP (buffer) =
         gst_y4m_dec_frames_to_timestamp (y4mdec, y4mdec->frame_index);
     GST_BUFFER_DURATION (buffer) =
-        gst_y4m_dec_frames_to_timestamp (y4mdec, y4mdec->frame_index) -
+        gst_y4m_dec_frames_to_timestamp (y4mdec, y4mdec->frame_index + 1) -
         GST_BUFFER_TIMESTAMP (buffer);
     if (y4mdec->interlaced && y4mdec->tff) {
       GST_BUFFER_FLAG_SET (buffer, GST_VIDEO_BUFFER_TFF);

From 2a1d4c9b4a8653b019bc853c1e71efc93b3c9385 Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Sat, 18 Jun 2011 15:56:49 -0700
Subject: [PATCH 035/158] vp8enc: update for new libvpx api

---
 ext/vp8/gstvp8enc.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/ext/vp8/gstvp8enc.c b/ext/vp8/gstvp8enc.c
index 6f65d955e4..29f07f73b8 100644
--- a/ext/vp8/gstvp8enc.c
+++ b/ext/vp8/gstvp8enc.c
@@ -283,7 +283,7 @@ gst_vp8_enc_class_init (GstVP8EncClass * klass)
   g_object_class_install_property (gobject_class, PROP_SPEED,
       g_param_spec_int ("speed", "Speed",
           "Speed",
-          0, 2, DEFAULT_SPEED,
+          0, 7, DEFAULT_SPEED,
           (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
 
   g_object_class_install_property (gobject_class, PROP_THREADS,
@@ -586,7 +586,9 @@ gst_vp8_enc_set_format (GstBaseVideoEncoder * base_video_encoder,
     return FALSE;
   }
 
-  status = vpx_codec_control (&encoder->encoder, VP8E_SET_CPUUSED, 0);
+  /* FIXME move this to a set_speed() function */
+  status = vpx_codec_control (&encoder->encoder, VP8E_SET_CPUUSED,
+      (encoder->speed == 0) ? 0 : (encoder->speed - 1));
   if (status != VPX_CODEC_OK) {
     GST_WARNING_OBJECT (encoder, "Failed to set VP8E_SET_CPUUSED to 0: %s",
         gst_vpx_error_name (status));
@@ -837,12 +839,6 @@ gst_vp8_enc_buffer_to_image (GstVP8Enc * enc, GstBuffer * buffer)
   return image;
 }
 
-static const int speed_table[] = {
-  VPX_DL_BEST_QUALITY,
-  VPX_DL_GOOD_QUALITY,
-  VPX_DL_REALTIME,
-};
-
 static GstFlowReturn
 gst_vp8_enc_handle_frame (GstBaseVideoEncoder * base_video_encoder,
     GstVideoFrame * frame)
@@ -853,6 +849,7 @@ gst_vp8_enc_handle_frame (GstBaseVideoEncoder * base_video_encoder,
   int flags = 0;
   vpx_image_t *image;
   GstVP8EncCoderHook *hook;
+  int quality;
 
   GST_DEBUG_OBJECT (base_video_encoder, "handle_frame");
 
@@ -874,8 +871,10 @@ gst_vp8_enc_handle_frame (GstBaseVideoEncoder * base_video_encoder,
     flags |= VPX_EFLAG_FORCE_KF;
   }
 
+  quality = (encoder->speed == 0) ? VPX_DL_BEST_QUALITY : VPX_DL_GOOD_QUALITY;
+
   status = vpx_codec_encode (&encoder->encoder, image,
-      encoder->n_frames, 1, flags, speed_table[encoder->speed]);
+      encoder->n_frames, 1, flags, quality);
   if (status != 0) {
     GST_ELEMENT_ERROR (encoder, LIBRARY, ENCODE,
         ("Failed to encode frame"), ("%s", gst_vpx_error_name (status)));

From 2573de106218e3b7827d7679ef79ae5eda76d576 Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Sat, 18 Jun 2011 15:51:54 -0700
Subject: [PATCH 036/158] colorspace: Add JPEG YCbCr matrix

---
 gst/colorspace/colorspace.c    | 6 ++++--
 gst/colorspace/colorspace.h    | 3 ++-
 gst/colorspace/gstcolorspace.c | 4 ++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/gst/colorspace/colorspace.c b/gst/colorspace/colorspace.c
index 3fd1ccde9c..bfaa9e7b39 100644
--- a/gst/colorspace/colorspace.c
+++ b/gst/colorspace/colorspace.c
@@ -49,7 +49,8 @@ colorspace_convert_new (GstVideoFormat to_format, ColorSpaceColorSpec to_spec,
       || to_spec == COLOR_SPEC_RGB, NULL);
   g_return_val_if_fail (!gst_video_format_is_yuv (to_format)
       || to_spec == COLOR_SPEC_YUV_BT709
-      || to_spec == COLOR_SPEC_YUV_BT470_6, NULL);
+      || to_spec == COLOR_SPEC_YUV_BT470_6
+      || to_spec == COLOR_SPEC_YUV_JPEG, NULL);
   g_return_val_if_fail (gst_video_format_is_rgb (to_format)
       || gst_video_format_is_yuv (to_format)
       || (gst_video_format_is_gray (to_format) &&
@@ -59,7 +60,8 @@ colorspace_convert_new (GstVideoFormat to_format, ColorSpaceColorSpec to_spec,
       || from_spec == COLOR_SPEC_RGB, NULL);
   g_return_val_if_fail (!gst_video_format_is_yuv (from_format)
       || from_spec == COLOR_SPEC_YUV_BT709
-      || from_spec == COLOR_SPEC_YUV_BT470_6, NULL);
+      || from_spec == COLOR_SPEC_YUV_BT470_6
+      || from_spec == COLOR_SPEC_YUV_JPEG, NULL);
   g_return_val_if_fail (gst_video_format_is_rgb (from_format)
       || gst_video_format_is_yuv (from_format)
       || (gst_video_format_is_gray (from_format) &&
diff --git a/gst/colorspace/colorspace.h b/gst/colorspace/colorspace.h
index 05bcc18670..7ae8892060 100644
--- a/gst/colorspace/colorspace.h
+++ b/gst/colorspace/colorspace.h
@@ -32,7 +32,8 @@ typedef enum {
   COLOR_SPEC_RGB,
   COLOR_SPEC_GRAY,
   COLOR_SPEC_YUV_BT470_6,
-  COLOR_SPEC_YUV_BT709
+  COLOR_SPEC_YUV_BT709,
+  COLOR_SPEC_YUV_JPEG
 } ColorSpaceColorSpec;
 
 typedef enum {
diff --git a/gst/colorspace/gstcolorspace.c b/gst/colorspace/gstcolorspace.c
index 6b512b5b2f..1f396c7e8a 100644
--- a/gst/colorspace/gstcolorspace.c
+++ b/gst/colorspace/gstcolorspace.c
@@ -278,6 +278,8 @@ gst_csp_set_caps (GstBaseTransform * btrans, GstCaps * incaps,
 
     if (matrix && g_str_equal (matrix, "hdtv"))
       in_spec = COLOR_SPEC_YUV_BT709;
+    else if (matrix && g_str_equal (matrix, "jpeg"))
+      in_spec = COLOR_SPEC_YUV_JPEG;
     else
       in_spec = COLOR_SPEC_YUV_BT470_6;
   } else {
@@ -308,6 +310,8 @@ gst_csp_set_caps (GstBaseTransform * btrans, GstCaps * incaps,
 
     if (matrix && g_str_equal (matrix, "hdtv"))
       out_spec = COLOR_SPEC_YUV_BT709;
+    else if (matrix && g_str_equal (matrix, "jpeg"))
+      out_spec = COLOR_SPEC_YUV_JPEG;
     else
       out_spec = COLOR_SPEC_YUV_BT470_6;
   } else {

From e9f0e275966de64ec994b184498b9d8e2d8560a7 Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Fri, 3 Jun 2011 19:41:33 -0700
Subject: [PATCH 037/158] inter: new intermediate surface plugin

This set of elements allows easily rendering audio and video to
an intermediate surface that is then used as a source in a different
pipeline.
---
 configure.ac                  |   2 +
 gst/inter/Makefile.am         |  56 ++++
 gst/inter/gstinter.c          |  51 ++++
 gst/inter/gstinteraudiosink.c | 342 +++++++++++++++++++++++
 gst/inter/gstinteraudiosink.h |  58 ++++
 gst/inter/gstinteraudiosrc.c  | 481 ++++++++++++++++++++++++++++++++
 gst/inter/gstinteraudiosrc.h  |  57 ++++
 gst/inter/gstintersurface.c   |  42 +++
 gst/inter/gstintersurface.h   |  58 ++++
 gst/inter/gstintertest.c      | 502 +++++++++++++++++++++++++++++++++
 gst/inter/gstintervideosink.c | 332 ++++++++++++++++++++++
 gst/inter/gstintervideosink.h |  58 ++++
 gst/inter/gstintervideosrc.c  | 510 ++++++++++++++++++++++++++++++++++
 gst/inter/gstintervideosrc.h  |  62 +++++
 14 files changed, 2611 insertions(+)
 create mode 100644 gst/inter/Makefile.am
 create mode 100644 gst/inter/gstinter.c
 create mode 100644 gst/inter/gstinteraudiosink.c
 create mode 100644 gst/inter/gstinteraudiosink.h
 create mode 100644 gst/inter/gstinteraudiosrc.c
 create mode 100644 gst/inter/gstinteraudiosrc.h
 create mode 100644 gst/inter/gstintersurface.c
 create mode 100644 gst/inter/gstintersurface.h
 create mode 100644 gst/inter/gstintertest.c
 create mode 100644 gst/inter/gstintervideosink.c
 create mode 100644 gst/inter/gstintervideosink.h
 create mode 100644 gst/inter/gstintervideosrc.c
 create mode 100644 gst/inter/gstintervideosrc.h

diff --git a/configure.ac b/configure.ac
index 72689615f3..7322eaa934 100644
--- a/configure.ac
+++ b/configure.ac
@@ -322,6 +322,7 @@ AG_GST_CHECK_PLUGIN(h264parse)
 AG_GST_CHECK_PLUGIN(hdvparse)
 AG_GST_CHECK_PLUGIN(hls)
 AG_GST_CHECK_PLUGIN(id3tag)
+AG_GST_CHECK_PLUGIN(inter)
 AG_GST_CHECK_PLUGIN(interlace)
 AG_GST_CHECK_PLUGIN(ivfparse)
 AG_GST_CHECK_PLUGIN(jp2kdecimator)
@@ -1873,6 +1874,7 @@ gst/h264parse/Makefile
 gst/hdvparse/Makefile
 gst/hls/Makefile
 gst/id3tag/Makefile
+gst/inter/Makefile
 gst/interlace/Makefile
 gst/ivfparse/Makefile
 gst/jp2kdecimator/Makefile
diff --git a/gst/inter/Makefile.am b/gst/inter/Makefile.am
new file mode 100644
index 0000000000..ce39e50fc8
--- /dev/null
+++ b/gst/inter/Makefile.am
@@ -0,0 +1,56 @@
+plugin_LTLIBRARIES = libgstinter.la
+
+noinst_PROGRAMS = gstintertest
+
+libgstinter_la_SOURCES = \
+	gstinteraudiosink.c \
+	gstinteraudiosrc.c \
+	gstintervideosink.c \
+	gstintervideosrc.c \
+	gstinter.c \
+	gstintersurface.c
+
+noinst_HEADERS = \
+	gstinteraudiosink.h \
+	gstinteraudiosrc.h \
+	gstintervideosink.h \
+	gstintervideosrc.h \
+	gstintersurface.h
+
+libgstinter_la_CFLAGS = \
+	$(GST_CFLAGS) \
+	$(GST_PLUGINS_BASE_CFLAGS)
+
+libgstinter_la_LIBADD = \
+	$(GST_LIBS) \
+	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ -lgstaudio-@GST_MAJORMINOR@ \
+	$(LIBM)
+
+libgstinter_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstinter_la_LIBTOOLFLAGS = --tag=disable-static
+
+gstintertest_SOURCES = \
+	gstintertest.c
+
+gstintertest_CFLAGS = \
+	$(GST_CFLAGS) \
+	$(GST_PLUGINS_BASE_CFLAGS)
+
+gstintertest_LDADD = \
+	$(GST_LIBS) \
+	$(GST_PLUGINS_BASE_LIBS) \
+	$(LIBM)
+
+Android.mk: Makefile.am $(BUILT_SOURCES)
+	androgenizer \
+	-:PROJECT libgstinter -:SHARED libgstinter \
+	 -:TAGS eng debug \
+         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+	 -:SOURCES $(libgstinter_la_SOURCES) \
+	 -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstinter_la_CFLAGS) \
+	 -:LDFLAGS $(libgstinter_la_LDFLAGS) \
+	           $(libgstinter_la_LIBADD) \
+	           -ldl \
+	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
+		       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
+	> $@
diff --git a/gst/inter/gstinter.c b/gst/inter/gstinter.c
new file mode 100644
index 0000000000..2ecc71df6b
--- /dev/null
+++ b/gst/inter/gstinter.c
@@ -0,0 +1,51 @@
+/* GStreamer
+ * Copyright (C) 2011 FIXME <fixme@example.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., 51 Franklin Street, Suite 500,
+ * Boston, MA 02110-1335, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstinteraudiosrc.h"
+#include "gstinteraudiosink.h"
+#include "gstintervideosrc.h"
+#include "gstintervideosink.h"
+#include "gstintersurface.h"
+
+static gboolean
+plugin_init (GstPlugin * plugin)
+{
+  gst_element_register (plugin, "interaudiosrc", GST_RANK_NONE,
+      GST_TYPE_INTER_AUDIO_SRC);
+  gst_element_register (plugin, "interaudiosink", GST_RANK_NONE,
+      GST_TYPE_INTER_AUDIO_SINK);
+  gst_element_register (plugin, "intervideosrc", GST_RANK_NONE,
+      GST_TYPE_INTER_VIDEO_SRC);
+  gst_element_register (plugin, "intervideosink", GST_RANK_NONE,
+      GST_TYPE_INTER_VIDEO_SINK);
+
+  gst_inter_surface_init ();
+
+  return TRUE;
+}
+
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+    GST_VERSION_MINOR,
+    "inter",
+    "plugin for inter-pipeline communication",
+    plugin_init, VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/inter/gstinteraudiosink.c b/gst/inter/gstinteraudiosink.c
new file mode 100644
index 0000000000..d5eb98b0f5
--- /dev/null
+++ b/gst/inter/gstinteraudiosink.c
@@ -0,0 +1,342 @@
+/* GStreamer
+ * Copyright (C) 2011 David A. Schleef <ds@schleef.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., 51 Franklin Street, Suite 500,
+ * Boston, MA 02110-1335, USA.
+ */
+/**
+ * SECTION:element-gstinteraudiosink
+ *
+ * The interaudiosink element does FIXME stuff.
+ *
+ * <refsect2>
+ * <title>Example launch line</title>
+ * |[
+ * gst-launch -v fakesrc ! interaudiosink ! FIXME ! fakesink
+ * ]|
+ * FIXME Describe what the pipeline does.
+ * </refsect2>
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/gst.h>
+#include <gst/base/gstbasesink.h>
+#include <gst/audio/audio.h>
+#include "gstinteraudiosink.h"
+#include <string.h>
+
+GST_DEBUG_CATEGORY_STATIC (gst_inter_audio_sink_debug_category);
+#define GST_CAT_DEFAULT gst_inter_audio_sink_debug_category
+
+/* prototypes */
+
+
+static void gst_inter_audio_sink_set_property (GObject * object,
+    guint property_id, const GValue * value, GParamSpec * pspec);
+static void gst_inter_audio_sink_get_property (GObject * object,
+    guint property_id, GValue * value, GParamSpec * pspec);
+static void gst_inter_audio_sink_dispose (GObject * object);
+static void gst_inter_audio_sink_finalize (GObject * object);
+
+static GstCaps *gst_inter_audio_sink_get_caps (GstBaseSink * sink);
+static gboolean gst_inter_audio_sink_set_caps (GstBaseSink * sink,
+    GstCaps * caps);
+static GstFlowReturn gst_inter_audio_sink_buffer_alloc (GstBaseSink * sink,
+    guint64 offset, guint size, GstCaps * caps, GstBuffer ** buf);
+static void gst_inter_audio_sink_get_times (GstBaseSink * sink,
+    GstBuffer * buffer, GstClockTime * start, GstClockTime * end);
+static gboolean gst_inter_audio_sink_start (GstBaseSink * sink);
+static gboolean gst_inter_audio_sink_stop (GstBaseSink * sink);
+static gboolean gst_inter_audio_sink_unlock (GstBaseSink * sink);
+static gboolean gst_inter_audio_sink_event (GstBaseSink * sink,
+    GstEvent * event);
+static GstFlowReturn gst_inter_audio_sink_preroll (GstBaseSink * sink,
+    GstBuffer * buffer);
+static GstFlowReturn gst_inter_audio_sink_render (GstBaseSink * sink,
+    GstBuffer * buffer);
+static GstStateChangeReturn gst_inter_audio_sink_async_play (GstBaseSink *
+    sink);
+static gboolean gst_inter_audio_sink_activate_pull (GstBaseSink * sink,
+    gboolean active);
+static gboolean gst_inter_audio_sink_unlock_stop (GstBaseSink * sink);
+
+enum
+{
+  PROP_0
+};
+
+/* pad templates */
+
+static GstStaticPadTemplate gst_inter_audio_sink_sink_template =
+GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("audio/x-raw-int, "
+        "endianness = (int) BYTE_ORDER, "
+        "signed = (boolean) true, "
+        "width = (int) 16, "
+        "depth = (int) 16, "
+        "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, 2 ]")
+    );
+
+
+/* class initialization */
+
+#define DEBUG_INIT(bla) \
+  GST_DEBUG_CATEGORY_INIT (gst_inter_audio_sink_debug_category, "interaudiosink", 0, \
+      "debug category for interaudiosink element");
+
+GST_BOILERPLATE_FULL (GstInterAudioSink, gst_inter_audio_sink, GstBaseSink,
+    GST_TYPE_BASE_SINK, DEBUG_INIT);
+
+static void
+gst_inter_audio_sink_base_init (gpointer g_class)
+{
+  GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
+
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_inter_audio_sink_sink_template));
+
+  gst_element_class_set_details_simple (element_class, "FIXME Long name",
+      "Generic", "FIXME Description", "FIXME <fixme@example.com>");
+}
+
+static void
+gst_inter_audio_sink_class_init (GstInterAudioSinkClass * klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  GstBaseSinkClass *base_sink_class = GST_BASE_SINK_CLASS (klass);
+
+  gobject_class->set_property = gst_inter_audio_sink_set_property;
+  gobject_class->get_property = gst_inter_audio_sink_get_property;
+  gobject_class->dispose = gst_inter_audio_sink_dispose;
+  gobject_class->finalize = gst_inter_audio_sink_finalize;
+  base_sink_class->get_caps = GST_DEBUG_FUNCPTR (gst_inter_audio_sink_get_caps);
+  base_sink_class->set_caps = GST_DEBUG_FUNCPTR (gst_inter_audio_sink_set_caps);
+  if (0)
+    base_sink_class->buffer_alloc =
+        GST_DEBUG_FUNCPTR (gst_inter_audio_sink_buffer_alloc);
+  base_sink_class->get_times =
+      GST_DEBUG_FUNCPTR (gst_inter_audio_sink_get_times);
+  base_sink_class->start = GST_DEBUG_FUNCPTR (gst_inter_audio_sink_start);
+  base_sink_class->stop = GST_DEBUG_FUNCPTR (gst_inter_audio_sink_stop);
+  base_sink_class->unlock = GST_DEBUG_FUNCPTR (gst_inter_audio_sink_unlock);
+  if (0)
+    base_sink_class->event = GST_DEBUG_FUNCPTR (gst_inter_audio_sink_event);
+  //if (0)
+  base_sink_class->preroll = GST_DEBUG_FUNCPTR (gst_inter_audio_sink_preroll);
+  base_sink_class->render = GST_DEBUG_FUNCPTR (gst_inter_audio_sink_render);
+  if (0)
+    base_sink_class->async_play =
+        GST_DEBUG_FUNCPTR (gst_inter_audio_sink_async_play);
+  if (0)
+    base_sink_class->activate_pull =
+        GST_DEBUG_FUNCPTR (gst_inter_audio_sink_activate_pull);
+  base_sink_class->unlock_stop =
+      GST_DEBUG_FUNCPTR (gst_inter_audio_sink_unlock_stop);
+
+}
+
+static void
+gst_inter_audio_sink_init (GstInterAudioSink * interaudiosink,
+    GstInterAudioSinkClass * interaudiosink_class)
+{
+
+  interaudiosink->sinkpad =
+      gst_pad_new_from_static_template (&gst_inter_audio_sink_sink_template,
+      "sink");
+
+  interaudiosink->surface = gst_inter_surface_get ("default");
+}
+
+void
+gst_inter_audio_sink_set_property (GObject * object, guint property_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  /* GstInterAudioSink *interaudiosink = GST_INTER_AUDIO_SINK (object); */
+
+  switch (property_id) {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+  }
+}
+
+void
+gst_inter_audio_sink_get_property (GObject * object, guint property_id,
+    GValue * value, GParamSpec * pspec)
+{
+  /* GstInterAudioSink *interaudiosink = GST_INTER_AUDIO_SINK (object); */
+
+  switch (property_id) {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+  }
+}
+
+void
+gst_inter_audio_sink_dispose (GObject * object)
+{
+  /* GstInterAudioSink *interaudiosink = GST_INTER_AUDIO_SINK (object); */
+
+  /* clean up as possible.  may be called multiple times */
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+void
+gst_inter_audio_sink_finalize (GObject * object)
+{
+  /* GstInterAudioSink *interaudiosink = GST_INTER_AUDIO_SINK (object); */
+
+  /* clean up object here */
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+
+
+static GstCaps *
+gst_inter_audio_sink_get_caps (GstBaseSink * sink)
+{
+
+  return NULL;
+}
+
+static gboolean
+gst_inter_audio_sink_set_caps (GstBaseSink * sink, GstCaps * caps)
+{
+
+  return TRUE;
+}
+
+static GstFlowReturn
+gst_inter_audio_sink_buffer_alloc (GstBaseSink * sink, guint64 offset,
+    guint size, GstCaps * caps, GstBuffer ** buf)
+{
+
+  return GST_FLOW_ERROR;
+}
+
+static void
+gst_inter_audio_sink_get_times (GstBaseSink * sink, GstBuffer * buffer,
+    GstClockTime * start, GstClockTime * end)
+{
+  GstInterAudioSink *interaudiosink = GST_INTER_AUDIO_SINK (sink);
+
+  if (GST_BUFFER_TIMESTAMP_IS_VALID (buffer)) {
+    *start = GST_BUFFER_TIMESTAMP (buffer);
+    if (GST_BUFFER_DURATION_IS_VALID (buffer)) {
+      *end = *start + GST_BUFFER_DURATION (buffer);
+    } else {
+      if (interaudiosink->fps_n > 0) {
+        *end = *start +
+            gst_util_uint64_scale_int (GST_SECOND, interaudiosink->fps_d,
+            interaudiosink->fps_n);
+      }
+    }
+  }
+
+
+}
+
+static gboolean
+gst_inter_audio_sink_start (GstBaseSink * sink)
+{
+
+  return TRUE;
+}
+
+static gboolean
+gst_inter_audio_sink_stop (GstBaseSink * sink)
+{
+  GstInterAudioSink *interaudiosink = GST_INTER_AUDIO_SINK (sink);
+
+  GST_DEBUG ("stop");
+
+  g_mutex_lock (interaudiosink->surface->mutex);
+  gst_adapter_clear (interaudiosink->surface->audio_adapter);
+  g_mutex_unlock (interaudiosink->surface->mutex);
+
+  return TRUE;
+}
+
+static gboolean
+gst_inter_audio_sink_unlock (GstBaseSink * sink)
+{
+
+  return TRUE;
+}
+
+static gboolean
+gst_inter_audio_sink_event (GstBaseSink * sink, GstEvent * event)
+{
+
+  return TRUE;
+}
+
+static GstFlowReturn
+gst_inter_audio_sink_preroll (GstBaseSink * sink, GstBuffer * buffer)
+{
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_inter_audio_sink_render (GstBaseSink * sink, GstBuffer * buffer)
+{
+  GstInterAudioSink *interaudiosink = GST_INTER_AUDIO_SINK (sink);
+  int n;
+
+  GST_DEBUG ("render %d", GST_BUFFER_SIZE (buffer));
+
+  g_mutex_lock (interaudiosink->surface->mutex);
+  n = gst_adapter_available (interaudiosink->surface->audio_adapter) / 4;
+  if (n > (800 * 2 * 2)) {
+    GST_INFO ("flushing 800 samples");
+    gst_adapter_flush (interaudiosink->surface->audio_adapter, 800 * 4);
+    n -= 800;
+  }
+  gst_adapter_push (interaudiosink->surface->audio_adapter,
+      gst_buffer_ref (buffer));
+  g_mutex_unlock (interaudiosink->surface->mutex);
+
+  return GST_FLOW_OK;
+}
+
+static GstStateChangeReturn
+gst_inter_audio_sink_async_play (GstBaseSink * sink)
+{
+
+  return GST_STATE_CHANGE_SUCCESS;
+}
+
+static gboolean
+gst_inter_audio_sink_activate_pull (GstBaseSink * sink, gboolean active)
+{
+
+  return TRUE;
+}
+
+static gboolean
+gst_inter_audio_sink_unlock_stop (GstBaseSink * sink)
+{
+
+  return TRUE;
+}
diff --git a/gst/inter/gstinteraudiosink.h b/gst/inter/gstinteraudiosink.h
new file mode 100644
index 0000000000..53597e7c9b
--- /dev/null
+++ b/gst/inter/gstinteraudiosink.h
@@ -0,0 +1,58 @@
+/* GStreamer
+ * Copyright (C) 2011 David A. Schleef <ds@schleef.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.
+ */
+
+#ifndef _GST_INTER_AUDIO_SINK_H_
+#define _GST_INTER_AUDIO_SINK_H_
+
+#include <gst/base/gstbasesink.h>
+#include "gstintersurface.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_INTER_AUDIO_SINK   (gst_inter_audio_sink_get_type())
+#define GST_INTER_AUDIO_SINK(obj)   (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_INTER_AUDIO_SINK,GstInterAudioSink))
+#define GST_INTER_AUDIO_SINK_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_INTER_AUDIO_SINK,GstInterAudioSinkClass))
+#define GST_IS_INTER_AUDIO_SINK(obj)   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_INTER_AUDIO_SINK))
+#define GST_IS_INTER_AUDIO_SINK_CLASS(obj)   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_INTER_AUDIO_SINK))
+
+typedef struct _GstInterAudioSink GstInterAudioSink;
+typedef struct _GstInterAudioSinkClass GstInterAudioSinkClass;
+
+struct _GstInterAudioSink
+{
+  GstBaseSink base_interaudiosink;
+
+  GstInterSurface *surface;
+
+  GstPad *sinkpad;
+
+  int fps_n;
+  int fps_d;
+};
+
+struct _GstInterAudioSinkClass
+{
+  GstBaseSinkClass base_interaudiosink_class;
+};
+
+GType gst_inter_audio_sink_get_type (void);
+
+G_END_DECLS
+
+#endif
diff --git a/gst/inter/gstinteraudiosrc.c b/gst/inter/gstinteraudiosrc.c
new file mode 100644
index 0000000000..df7c16f70d
--- /dev/null
+++ b/gst/inter/gstinteraudiosrc.c
@@ -0,0 +1,481 @@
+/* GStreamer
+ * Copyright (C) 2011 David A. Schleef <ds@schleef.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., 51 Franklin Street, Suite 500,
+ * Boston, MA 02110-1335, USA.
+ */
+/**
+ * SECTION:element-gstinteraudiosrc
+ *
+ * The interaudiosrc element does FIXME stuff.
+ *
+ * <refsect2>
+ * <title>Example launch line</title>
+ * |[
+ * gst-launch -v fakesrc ! interaudiosrc ! FIXME ! fakesink
+ * ]|
+ * FIXME Describe what the pipeline does.
+ * </refsect2>
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/gst.h>
+#include <gst/base/gstbasesrc.h>
+#include "gstinteraudiosrc.h"
+#include <string.h>
+
+GST_DEBUG_CATEGORY_STATIC (gst_inter_audio_src_debug_category);
+#define GST_CAT_DEFAULT gst_inter_audio_src_debug_category
+
+/* prototypes */
+
+
+static void gst_inter_audio_src_set_property (GObject * object,
+    guint property_id, const GValue * value, GParamSpec * pspec);
+static void gst_inter_audio_src_get_property (GObject * object,
+    guint property_id, GValue * value, GParamSpec * pspec);
+static void gst_inter_audio_src_dispose (GObject * object);
+static void gst_inter_audio_src_finalize (GObject * object);
+
+static GstCaps *gst_inter_audio_src_get_caps (GstBaseSrc * src);
+static gboolean gst_inter_audio_src_set_caps (GstBaseSrc * src, GstCaps * caps);
+static gboolean gst_inter_audio_src_negotiate (GstBaseSrc * src);
+static gboolean gst_inter_audio_src_newsegment (GstBaseSrc * src);
+static gboolean gst_inter_audio_src_start (GstBaseSrc * src);
+static gboolean gst_inter_audio_src_stop (GstBaseSrc * src);
+static void
+gst_inter_audio_src_get_times (GstBaseSrc * src, GstBuffer * buffer,
+    GstClockTime * start, GstClockTime * end);
+static gboolean gst_inter_audio_src_is_seekable (GstBaseSrc * src);
+static gboolean gst_inter_audio_src_unlock (GstBaseSrc * src);
+static gboolean gst_inter_audio_src_event (GstBaseSrc * src, GstEvent * event);
+static GstFlowReturn
+gst_inter_audio_src_create (GstBaseSrc * src, guint64 offset, guint size,
+    GstBuffer ** buf);
+static gboolean gst_inter_audio_src_do_seek (GstBaseSrc * src,
+    GstSegment * segment);
+static gboolean gst_inter_audio_src_query (GstBaseSrc * src, GstQuery * query);
+static gboolean gst_inter_audio_src_check_get_range (GstBaseSrc * src);
+static void gst_inter_audio_src_fixate (GstBaseSrc * src, GstCaps * caps);
+static gboolean gst_inter_audio_src_unlock_stop (GstBaseSrc * src);
+static gboolean
+gst_inter_audio_src_prepare_seek_segment (GstBaseSrc * src, GstEvent * seek,
+    GstSegment * segment);
+
+enum
+{
+  PROP_0
+};
+
+/* pad templates */
+
+static GstStaticPadTemplate gst_inter_audio_src_src_template =
+GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("audio/x-raw-int, "
+        "endianness = (int) BYTE_ORDER, "
+        "signed = (boolean) true, "
+        "width = (int) 16, "
+        "depth = (int) 16, "
+        "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, 2 ]")
+    );
+
+
+/* class initialization */
+
+#define DEBUG_INIT(bla) \
+  GST_DEBUG_CATEGORY_INIT (gst_inter_audio_src_debug_category, "interaudiosrc", 0, \
+      "debug category for interaudiosrc element");
+
+GST_BOILERPLATE_FULL (GstInterAudioSrc, gst_inter_audio_src, GstBaseSrc,
+    GST_TYPE_BASE_SRC, DEBUG_INIT);
+
+static void
+gst_inter_audio_src_base_init (gpointer g_class)
+{
+  GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
+
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_inter_audio_src_src_template));
+
+  gst_element_class_set_details_simple (element_class, "FIXME Long name",
+      "Generic", "FIXME Description", "FIXME <fixme@example.com>");
+}
+
+static void
+gst_inter_audio_src_class_init (GstInterAudioSrcClass * klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  GstBaseSrcClass *base_src_class = GST_BASE_SRC_CLASS (klass);
+
+  gobject_class->set_property = gst_inter_audio_src_set_property;
+  gobject_class->get_property = gst_inter_audio_src_get_property;
+  gobject_class->dispose = gst_inter_audio_src_dispose;
+  gobject_class->finalize = gst_inter_audio_src_finalize;
+  base_src_class->get_caps = GST_DEBUG_FUNCPTR (gst_inter_audio_src_get_caps);
+  base_src_class->set_caps = GST_DEBUG_FUNCPTR (gst_inter_audio_src_set_caps);
+  if (0)
+    base_src_class->negotiate =
+        GST_DEBUG_FUNCPTR (gst_inter_audio_src_negotiate);
+  base_src_class->newsegment =
+      GST_DEBUG_FUNCPTR (gst_inter_audio_src_newsegment);
+  base_src_class->start = GST_DEBUG_FUNCPTR (gst_inter_audio_src_start);
+  base_src_class->stop = GST_DEBUG_FUNCPTR (gst_inter_audio_src_stop);
+  base_src_class->get_times = GST_DEBUG_FUNCPTR (gst_inter_audio_src_get_times);
+  if (0)
+    base_src_class->is_seekable =
+        GST_DEBUG_FUNCPTR (gst_inter_audio_src_is_seekable);
+  base_src_class->unlock = GST_DEBUG_FUNCPTR (gst_inter_audio_src_unlock);
+  base_src_class->event = GST_DEBUG_FUNCPTR (gst_inter_audio_src_event);
+  base_src_class->create = GST_DEBUG_FUNCPTR (gst_inter_audio_src_create);
+  if (0)
+    base_src_class->do_seek = GST_DEBUG_FUNCPTR (gst_inter_audio_src_do_seek);
+  base_src_class->query = GST_DEBUG_FUNCPTR (gst_inter_audio_src_query);
+  if (0)
+    base_src_class->check_get_range =
+        GST_DEBUG_FUNCPTR (gst_inter_audio_src_check_get_range);
+  base_src_class->fixate = GST_DEBUG_FUNCPTR (gst_inter_audio_src_fixate);
+  if (0)
+    base_src_class->unlock_stop =
+        GST_DEBUG_FUNCPTR (gst_inter_audio_src_unlock_stop);
+  if (0)
+    base_src_class->prepare_seek_segment =
+        GST_DEBUG_FUNCPTR (gst_inter_audio_src_prepare_seek_segment);
+
+
+}
+
+static void
+gst_inter_audio_src_init (GstInterAudioSrc * interaudiosrc,
+    GstInterAudioSrcClass * interaudiosrc_class)
+{
+
+  interaudiosrc->srcpad =
+      gst_pad_new_from_static_template (&gst_inter_audio_src_src_template,
+      "src");
+
+  gst_base_src_set_live (GST_BASE_SRC (interaudiosrc), TRUE);
+  gst_base_src_set_blocksize (GST_BASE_SRC (interaudiosrc), -1);
+
+  interaudiosrc->surface = gst_inter_surface_get ("default");
+}
+
+void
+gst_inter_audio_src_set_property (GObject * object, guint property_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  /* GstInterAudioSrc *interaudiosrc = GST_INTER_AUDIO_SRC (object); */
+
+  switch (property_id) {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+  }
+}
+
+void
+gst_inter_audio_src_get_property (GObject * object, guint property_id,
+    GValue * value, GParamSpec * pspec)
+{
+  /* GstInterAudioSrc *interaudiosrc = GST_INTER_AUDIO_SRC (object); */
+
+  switch (property_id) {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+  }
+}
+
+void
+gst_inter_audio_src_dispose (GObject * object)
+{
+  /* GstInterAudioSrc *interaudiosrc = GST_INTER_AUDIO_SRC (object); */
+
+  /* clean up as possible.  may be called multiple times */
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+void
+gst_inter_audio_src_finalize (GObject * object)
+{
+  /* GstInterAudioSrc *interaudiosrc = GST_INTER_AUDIO_SRC (object); */
+
+  /* clean up object here */
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+
+static GstCaps *
+gst_inter_audio_src_get_caps (GstBaseSrc * src)
+{
+  GstInterAudioSrc *interaudiosrc = GST_INTER_AUDIO_SRC (src);
+
+  GST_DEBUG_OBJECT (interaudiosrc, "get_caps");
+
+  return NULL;
+}
+
+static gboolean
+gst_inter_audio_src_set_caps (GstBaseSrc * src, GstCaps * caps)
+{
+  GstInterAudioSrc *interaudiosrc = GST_INTER_AUDIO_SRC (src);
+  const GstStructure *structure;
+  gboolean ret;
+  int sample_rate;
+
+  GST_DEBUG_OBJECT (interaudiosrc, "set_caps");
+
+  structure = gst_caps_get_structure (caps, 0);
+
+  ret = gst_structure_get_int (structure, "rate", &sample_rate);
+  if (ret) {
+    interaudiosrc->sample_rate = sample_rate;
+  }
+
+  return ret;
+}
+
+static gboolean
+gst_inter_audio_src_negotiate (GstBaseSrc * src)
+{
+  GstInterAudioSrc *interaudiosrc = GST_INTER_AUDIO_SRC (src);
+
+  GST_DEBUG_OBJECT (interaudiosrc, "negotiate");
+
+  return TRUE;
+}
+
+static gboolean
+gst_inter_audio_src_newsegment (GstBaseSrc * src)
+{
+  GstInterAudioSrc *interaudiosrc = GST_INTER_AUDIO_SRC (src);
+
+  GST_DEBUG_OBJECT (interaudiosrc, "newsegment");
+
+  return TRUE;
+}
+
+static gboolean
+gst_inter_audio_src_start (GstBaseSrc * src)
+{
+  GstInterAudioSrc *interaudiosrc = GST_INTER_AUDIO_SRC (src);
+
+  GST_DEBUG_OBJECT (interaudiosrc, "start");
+
+  return TRUE;
+}
+
+static gboolean
+gst_inter_audio_src_stop (GstBaseSrc * src)
+{
+  GstInterAudioSrc *interaudiosrc = GST_INTER_AUDIO_SRC (src);
+
+  GST_DEBUG_OBJECT (interaudiosrc, "stop");
+
+  return TRUE;
+}
+
+static void
+gst_inter_audio_src_get_times (GstBaseSrc * src, GstBuffer * buffer,
+    GstClockTime * start, GstClockTime * end)
+{
+  GstInterAudioSrc *interaudiosrc = GST_INTER_AUDIO_SRC (src);
+
+  GST_DEBUG_OBJECT (interaudiosrc, "get_times");
+
+  /* for live sources, sync on the timestamp of the buffer */
+  if (gst_base_src_is_live (src)) {
+    GstClockTime timestamp = GST_BUFFER_TIMESTAMP (buffer);
+
+    if (GST_CLOCK_TIME_IS_VALID (timestamp)) {
+      /* get duration to calculate end time */
+      GstClockTime duration = GST_BUFFER_DURATION (buffer);
+
+      if (GST_CLOCK_TIME_IS_VALID (duration)) {
+        *end = timestamp + duration;
+      }
+      *start = timestamp;
+    }
+  } else {
+    *start = -1;
+    *end = -1;
+  }
+}
+
+static gboolean
+gst_inter_audio_src_is_seekable (GstBaseSrc * src)
+{
+  GstInterAudioSrc *interaudiosrc = GST_INTER_AUDIO_SRC (src);
+
+  GST_DEBUG_OBJECT (interaudiosrc, "is_seekable");
+
+  return FALSE;
+}
+
+static gboolean
+gst_inter_audio_src_unlock (GstBaseSrc * src)
+{
+  GstInterAudioSrc *interaudiosrc = GST_INTER_AUDIO_SRC (src);
+
+  GST_DEBUG_OBJECT (interaudiosrc, "unlock");
+
+  return TRUE;
+}
+
+static gboolean
+gst_inter_audio_src_event (GstBaseSrc * src, GstEvent * event)
+{
+  GstInterAudioSrc *interaudiosrc = GST_INTER_AUDIO_SRC (src);
+
+  GST_DEBUG_OBJECT (interaudiosrc, "event");
+
+  return TRUE;
+}
+
+static GstFlowReturn
+gst_inter_audio_src_create (GstBaseSrc * src, guint64 offset, guint size,
+    GstBuffer ** buf)
+{
+  GstInterAudioSrc *interaudiosrc = GST_INTER_AUDIO_SRC (src);
+  GstBuffer *buffer;
+  int n;
+
+  GST_DEBUG_OBJECT (interaudiosrc, "create");
+
+  buffer = NULL;
+
+  g_mutex_lock (interaudiosrc->surface->mutex);
+  n = gst_adapter_available (interaudiosrc->surface->audio_adapter) / 4;
+  if (n > 1600 * 2) {
+    GST_DEBUG ("flushing %d samples", 800);
+    gst_adapter_flush (interaudiosrc->surface->audio_adapter, 800 * 4);
+    n -= 800;
+  }
+  if (n > 1600)
+    n = 1600;
+  if (n > 0) {
+    buffer = gst_adapter_take_buffer (interaudiosrc->surface->audio_adapter,
+        n * 4);
+  }
+  g_mutex_unlock (interaudiosrc->surface->mutex);
+
+  if (n < 1600) {
+    GstBuffer *newbuf = gst_buffer_new_and_alloc (1600 * 4);
+
+    GST_DEBUG ("creating %d samples of silence", 1600 - n);
+    memset (GST_BUFFER_DATA (newbuf) + n * 4, 0, 1600 * 4 - n * 4);
+    if (buffer) {
+      memcpy (GST_BUFFER_DATA (newbuf), GST_BUFFER_DATA (buffer), n * 4);
+      gst_buffer_unref (buffer);
+    }
+    buffer = newbuf;
+  }
+  n = 1600;
+
+  GST_BUFFER_OFFSET (buffer) = interaudiosrc->n_samples;
+  GST_BUFFER_OFFSET_END (buffer) = interaudiosrc->n_samples + n;
+  GST_BUFFER_TIMESTAMP (buffer) =
+      gst_util_uint64_scale_int (interaudiosrc->n_samples, GST_SECOND,
+      interaudiosrc->sample_rate);
+  GST_DEBUG_OBJECT (interaudiosrc, "create ts %" GST_TIME_FORMAT,
+      GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buffer)));
+  GST_BUFFER_DURATION (buffer) =
+      gst_util_uint64_scale_int (interaudiosrc->n_samples + n, GST_SECOND,
+      interaudiosrc->sample_rate) - GST_BUFFER_TIMESTAMP (buffer);
+  GST_BUFFER_OFFSET (buffer) = interaudiosrc->n_samples;
+  GST_BUFFER_OFFSET_END (buffer) = -1;
+  GST_BUFFER_FLAG_UNSET (buffer, GST_BUFFER_FLAG_DISCONT);
+  if (interaudiosrc->n_samples == 0) {
+    GST_BUFFER_FLAG_SET (buffer, GST_BUFFER_FLAG_DISCONT);
+  }
+  gst_buffer_set_caps (buffer, GST_PAD_CAPS (GST_BASE_SRC_PAD (interaudiosrc)));
+  interaudiosrc->n_samples += n;
+
+  *buf = buffer;
+
+  return GST_FLOW_OK;
+}
+
+static gboolean
+gst_inter_audio_src_do_seek (GstBaseSrc * src, GstSegment * segment)
+{
+  GstInterAudioSrc *interaudiosrc = GST_INTER_AUDIO_SRC (src);
+
+  GST_DEBUG_OBJECT (interaudiosrc, "do_seek");
+
+  return FALSE;
+}
+
+static gboolean
+gst_inter_audio_src_query (GstBaseSrc * src, GstQuery * query)
+{
+  GstInterAudioSrc *interaudiosrc = GST_INTER_AUDIO_SRC (src);
+
+  GST_DEBUG_OBJECT (interaudiosrc, "query");
+
+  return TRUE;
+}
+
+static gboolean
+gst_inter_audio_src_check_get_range (GstBaseSrc * src)
+{
+  GstInterAudioSrc *interaudiosrc = GST_INTER_AUDIO_SRC (src);
+
+  GST_DEBUG_OBJECT (interaudiosrc, "get_range");
+
+  return FALSE;
+}
+
+static void
+gst_inter_audio_src_fixate (GstBaseSrc * src, GstCaps * caps)
+{
+  GstInterAudioSrc *interaudiosrc = GST_INTER_AUDIO_SRC (src);
+  GstStructure *structure;
+
+  structure = gst_caps_get_structure (caps, 0);
+
+  GST_DEBUG_OBJECT (interaudiosrc, "fixate");
+
+  gst_structure_fixate_field_nearest_int (structure, "channels", 2);
+  gst_structure_fixate_field_nearest_int (structure, "rate", 48000);
+
+}
+
+static gboolean
+gst_inter_audio_src_unlock_stop (GstBaseSrc * src)
+{
+  GstInterAudioSrc *interaudiosrc = GST_INTER_AUDIO_SRC (src);
+
+  GST_DEBUG_OBJECT (interaudiosrc, "stop");
+
+  return TRUE;
+}
+
+static gboolean
+gst_inter_audio_src_prepare_seek_segment (GstBaseSrc * src, GstEvent * seek,
+    GstSegment * segment)
+{
+  GstInterAudioSrc *interaudiosrc = GST_INTER_AUDIO_SRC (src);
+
+  GST_DEBUG_OBJECT (interaudiosrc, "seek_segment");
+
+  return FALSE;
+}
diff --git a/gst/inter/gstinteraudiosrc.h b/gst/inter/gstinteraudiosrc.h
new file mode 100644
index 0000000000..cac928f702
--- /dev/null
+++ b/gst/inter/gstinteraudiosrc.h
@@ -0,0 +1,57 @@
+/* GStreamer
+ * Copyright (C) 2011 David A. Schleef <ds@schleef.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.
+ */
+
+#ifndef _GST_INTER_AUDIO_SRC_H_
+#define _GST_INTER_AUDIO_SRC_H_
+
+#include <gst/base/gstbasesrc.h>
+#include "gstintersurface.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_INTER_AUDIO_SRC   (gst_inter_audio_src_get_type())
+#define GST_INTER_AUDIO_SRC(obj)   (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_INTER_AUDIO_SRC,GstInterAudioSrc))
+#define GST_INTER_AUDIO_SRC_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_INTER_AUDIO_SRC,GstInterAudioSrcClass))
+#define GST_IS_INTER_AUDIO_SRC(obj)   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_INTER_AUDIO_SRC))
+#define GST_IS_INTER_AUDIO_SRC_CLASS(obj)   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_INTER_AUDIO_SRC))
+
+typedef struct _GstInterAudioSrc GstInterAudioSrc;
+typedef struct _GstInterAudioSrcClass GstInterAudioSrcClass;
+
+struct _GstInterAudioSrc
+{
+  GstBaseSrc base_interaudiosrc;
+
+  GstPad *srcpad;
+  GstInterSurface *surface;
+
+  guint64 n_samples;
+  int sample_rate;
+};
+
+struct _GstInterAudioSrcClass
+{
+  GstBaseSrcClass base_interaudiosrc_class;
+};
+
+GType gst_inter_audio_src_get_type (void);
+
+G_END_DECLS
+
+#endif
diff --git a/gst/inter/gstintersurface.c b/gst/inter/gstintersurface.c
new file mode 100644
index 0000000000..9a43fb9a48
--- /dev/null
+++ b/gst/inter/gstintersurface.c
@@ -0,0 +1,42 @@
+/* GStreamer
+ * Copyright (C) 2011 FIXME <fixme@example.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., 51 Franklin Street, Suite 500,
+ * Boston, MA 02110-1335, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstintersurface.h"
+
+static GstInterSurface *surface;
+
+
+GstInterSurface *
+gst_inter_surface_get (const char *name)
+{
+  return surface;
+
+}
+
+void
+gst_inter_surface_init (void)
+{
+  surface = g_malloc0 (sizeof (GstInterSurface));
+  surface->mutex = g_mutex_new ();
+  surface->audio_adapter = gst_adapter_new ();
+}
diff --git a/gst/inter/gstintersurface.h b/gst/inter/gstintersurface.h
new file mode 100644
index 0000000000..92440448ad
--- /dev/null
+++ b/gst/inter/gstintersurface.h
@@ -0,0 +1,58 @@
+/* GStreamer
+ * Copyright (C) 2011 David A. Schleef <ds@schleef.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.
+ */
+
+#ifndef _GST_INTER_SURFACE_H_
+#define _GST_INTER_SURFACE_H_
+
+#include <gst/base/gstadapter.h>
+#include <gst/video/video.h>
+
+G_BEGIN_DECLS
+
+typedef struct _GstInterSurface GstInterSurface;
+
+struct _GstInterSurface
+{
+  GMutex *mutex;
+
+  /* video */
+  GstVideoFormat format;
+  int fps_n;
+  int fps_d;
+  int width;
+  int height;
+  int n_frames;
+  int video_buffer_count;
+
+  /* audio */
+  int sample_rate;
+  int n_channels;
+
+  GstBuffer *video_buffer;
+  GstAdapter *audio_adapter;
+};
+
+
+GstInterSurface * gst_inter_surface_get (const char *name);
+void gst_inter_surface_init (void);
+
+
+G_END_DECLS
+
+#endif
diff --git a/gst/inter/gstintertest.c b/gst/inter/gstintertest.c
new file mode 100644
index 0000000000..cb7b08c668
--- /dev/null
+++ b/gst/inter/gstintertest.c
@@ -0,0 +1,502 @@
+/* GstInterTest
+ * Copyright (C) 2011 FIXME <fixme@example.com>
+ * Copyright (C) 2010 Entropy Wave Inc
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/gst.h>
+#include <stdlib.h>
+
+//#define GETTEXT_PACKAGE "intertest"
+
+
+typedef struct _GstInterTest GstInterTest;
+struct _GstInterTest
+{
+  GstElement *pipeline;
+  GstBus *bus;
+  GMainLoop *main_loop;
+
+  GstElement *source_element;
+  GstElement *sink_element;
+
+  gboolean paused_for_buffering;
+  guint timer_id;
+};
+
+GstInterTest *gst_inter_test_new (void);
+void gst_inter_test_free (GstInterTest * intertest);
+void gst_inter_test_create_pipeline_server (GstInterTest * intertest);
+void gst_inter_test_create_pipeline_vts (GstInterTest * intertest);
+void gst_inter_test_create_pipeline_playbin (GstInterTest * intertest,
+    const char *uri);
+void gst_inter_test_start (GstInterTest * intertest);
+void gst_inter_test_stop (GstInterTest * intertest);
+
+static gboolean gst_inter_test_handle_message (GstBus * bus,
+    GstMessage * message, gpointer data);
+static gboolean onesecond_timer (gpointer priv);
+
+
+gboolean verbose;
+
+static GOptionEntry entries[] = {
+  {"verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, "Be verbose", NULL},
+
+  {NULL}
+
+};
+
+int
+main (int argc, char *argv[])
+{
+  GError *error = NULL;
+  GOptionContext *context;
+  GstInterTest *intertest1;
+  GstInterTest *intertest2;
+  GMainLoop *main_loop;
+
+  if (!g_thread_supported ())
+    g_thread_init (NULL);
+
+  context = g_option_context_new ("- FIXME");
+  g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
+  g_option_context_add_group (context, gst_init_get_option_group ());
+  if (!g_option_context_parse (context, &argc, &argv, &error)) {
+    g_print ("option parsing failed: %s\n", error->message);
+    exit (1);
+  }
+  g_option_context_free (context);
+
+  intertest1 = gst_inter_test_new ();
+  gst_inter_test_create_pipeline_server (intertest1);
+  gst_inter_test_start (intertest1);
+
+  intertest2 = gst_inter_test_new ();
+  gst_inter_test_create_pipeline_playbin (intertest2, NULL);
+  gst_inter_test_start (intertest2);
+
+  main_loop = g_main_loop_new (NULL, TRUE);
+  intertest1->main_loop = main_loop;
+  intertest2->main_loop = main_loop;
+
+  g_main_loop_run (main_loop);
+
+  exit (0);
+}
+
+
+GstInterTest *
+gst_inter_test_new (void)
+{
+  GstInterTest *intertest;
+
+  intertest = g_new0 (GstInterTest, 1);
+
+  return intertest;
+}
+
+void
+gst_inter_test_free (GstInterTest * intertest)
+{
+  if (intertest->source_element) {
+    gst_object_unref (intertest->source_element);
+    intertest->source_element = NULL;
+  }
+  if (intertest->sink_element) {
+    gst_object_unref (intertest->sink_element);
+    intertest->sink_element = NULL;
+  }
+
+  if (intertest->pipeline) {
+    gst_element_set_state (intertest->pipeline, GST_STATE_NULL);
+    gst_object_unref (intertest->pipeline);
+    intertest->pipeline = NULL;
+  }
+  g_free (intertest);
+}
+
+void
+gst_inter_test_create_pipeline_playbin (GstInterTest * intertest,
+    const char *uri)
+{
+  GstElement *pipeline;
+  GError *error = NULL;
+
+  if (uri == NULL) {
+    gst_inter_test_create_pipeline_vts (intertest);
+    return;
+  }
+
+  pipeline = gst_pipeline_new (NULL);
+  gst_bin_add (GST_BIN (pipeline),
+      gst_element_factory_make ("playbin2", "source"));
+
+  if (error) {
+    g_print ("pipeline parsing error: %s\n", error->message);
+    gst_object_unref (pipeline);
+    return;
+  }
+
+  intertest->pipeline = pipeline;
+
+  gst_pipeline_set_auto_flush_bus (GST_PIPELINE (pipeline), FALSE);
+  intertest->bus = gst_pipeline_get_bus (GST_PIPELINE (pipeline));
+  gst_bus_add_watch (intertest->bus, gst_inter_test_handle_message, intertest);
+
+  intertest->source_element =
+      gst_bin_get_by_name (GST_BIN (pipeline), "source");
+  g_print ("source_element is %p\n", intertest->source_element);
+
+  g_print ("setting uri to %s\n", uri);
+  g_object_set (intertest->source_element, "uri", uri, NULL);
+}
+
+void
+gst_inter_test_create_pipeline_vts (GstInterTest * intertest)
+{
+  GString *pipe_desc;
+  GstElement *pipeline;
+  GError *error = NULL;
+
+  pipe_desc = g_string_new ("");
+
+  g_string_append (pipe_desc, "videotestsrc name=source num-buffers=10000 ! ");
+  g_string_append (pipe_desc,
+      "video/x-raw-yuv,format=(fourcc)I420,width=320,height=240 ! ");
+  g_string_append (pipe_desc, "timeoverlay ! ");
+  g_string_append (pipe_desc, "intervideosink name=sink sync=true ");
+  g_string_append (pipe_desc,
+      "audiotestsrc samplesperbuffer=1600 num-buffers=100 ! ");
+  g_string_append (pipe_desc, "interaudiosink ");
+
+  if (verbose)
+    g_print ("pipeline: %s\n", pipe_desc->str);
+
+  pipeline = (GstElement *) gst_parse_launch (pipe_desc->str, &error);
+  g_string_free (pipe_desc, FALSE);
+
+  if (error) {
+    g_print ("pipeline parsing error: %s\n", error->message);
+    gst_object_unref (pipeline);
+    return;
+  }
+
+  intertest->pipeline = pipeline;
+
+  gst_pipeline_set_auto_flush_bus (GST_PIPELINE (pipeline), FALSE);
+  intertest->bus = gst_pipeline_get_bus (GST_PIPELINE (pipeline));
+  gst_bus_add_watch (intertest->bus, gst_inter_test_handle_message, intertest);
+
+  intertest->source_element =
+      gst_bin_get_by_name (GST_BIN (pipeline), "source");
+  intertest->sink_element = gst_bin_get_by_name (GST_BIN (pipeline), "sink");
+}
+
+void
+gst_inter_test_create_pipeline_server (GstInterTest * intertest)
+{
+  GString *pipe_desc;
+  GstElement *pipeline;
+  GError *error = NULL;
+
+  pipe_desc = g_string_new ("");
+
+  g_string_append (pipe_desc, "intervideosrc ! queue ! ");
+  g_string_append (pipe_desc, "xvimagesink name=sink ");
+  g_string_append (pipe_desc, "interaudiosrc ! queue ! ");
+  g_string_append (pipe_desc, "alsasink latency-time=100000000 ");
+
+  if (verbose)
+    g_print ("pipeline: %s\n", pipe_desc->str);
+
+  pipeline = (GstElement *) gst_parse_launch (pipe_desc->str, &error);
+  g_string_free (pipe_desc, FALSE);
+
+  if (error) {
+    g_print ("pipeline parsing error: %s\n", error->message);
+    gst_object_unref (pipeline);
+    return;
+  }
+
+  intertest->pipeline = pipeline;
+
+  gst_pipeline_set_auto_flush_bus (GST_PIPELINE (pipeline), FALSE);
+  intertest->bus = gst_pipeline_get_bus (GST_PIPELINE (pipeline));
+  gst_bus_add_watch (intertest->bus, gst_inter_test_handle_message, intertest);
+
+  intertest->source_element =
+      gst_bin_get_by_name (GST_BIN (pipeline), "source");
+  intertest->sink_element = gst_bin_get_by_name (GST_BIN (pipeline), "sink");
+}
+
+void
+gst_inter_test_start (GstInterTest * intertest)
+{
+  gst_element_set_state (intertest->pipeline, GST_STATE_READY);
+
+  intertest->timer_id = g_timeout_add (1000, onesecond_timer, intertest);
+}
+
+void
+gst_inter_test_stop (GstInterTest * intertest)
+{
+  gst_element_set_state (intertest->pipeline, GST_STATE_NULL);
+
+  g_source_remove (intertest->timer_id);
+}
+
+static void
+gst_inter_test_handle_eos (GstInterTest * intertest)
+{
+  gst_inter_test_stop (intertest);
+}
+
+static void
+gst_inter_test_handle_error (GstInterTest * intertest, GError * error,
+    const char *debug)
+{
+  g_print ("error: %s\n", error->message);
+  gst_inter_test_stop (intertest);
+}
+
+static void
+gst_inter_test_handle_warning (GstInterTest * intertest, GError * error,
+    const char *debug)
+{
+  g_print ("warning: %s\n", error->message);
+}
+
+static void
+gst_inter_test_handle_info (GstInterTest * intertest, GError * error,
+    const char *debug)
+{
+  g_print ("info: %s\n", error->message);
+}
+
+static void
+gst_inter_test_handle_null_to_ready (GstInterTest * intertest)
+{
+  gst_element_set_state (intertest->pipeline, GST_STATE_PAUSED);
+
+}
+
+static void
+gst_inter_test_handle_ready_to_paused (GstInterTest * intertest)
+{
+  if (!intertest->paused_for_buffering) {
+    gst_element_set_state (intertest->pipeline, GST_STATE_PLAYING);
+  }
+}
+
+static void
+gst_inter_test_handle_paused_to_playing (GstInterTest * intertest)
+{
+
+}
+
+static void
+gst_inter_test_handle_playing_to_paused (GstInterTest * intertest)
+{
+
+}
+
+static void
+gst_inter_test_handle_paused_to_ready (GstInterTest * intertest)
+{
+
+}
+
+static void
+gst_inter_test_handle_ready_to_null (GstInterTest * intertest)
+{
+  g_main_loop_quit (intertest->main_loop);
+
+}
+
+
+static gboolean
+gst_inter_test_handle_message (GstBus * bus, GstMessage * message,
+    gpointer data)
+{
+  GstInterTest *intertest = (GstInterTest *) data;
+
+  switch (GST_MESSAGE_TYPE (message)) {
+    case GST_MESSAGE_EOS:
+      gst_inter_test_handle_eos (intertest);
+      break;
+    case GST_MESSAGE_ERROR:
+    {
+      GError *error = NULL;
+      gchar *debug;
+
+      gst_message_parse_error (message, &error, &debug);
+      gst_inter_test_handle_error (intertest, error, debug);
+    }
+      break;
+    case GST_MESSAGE_WARNING:
+    {
+      GError *error = NULL;
+      gchar *debug;
+
+      gst_message_parse_warning (message, &error, &debug);
+      gst_inter_test_handle_warning (intertest, error, debug);
+    }
+      break;
+    case GST_MESSAGE_INFO:
+    {
+      GError *error = NULL;
+      gchar *debug;
+
+      gst_message_parse_info (message, &error, &debug);
+      gst_inter_test_handle_info (intertest, error, debug);
+    }
+      break;
+    case GST_MESSAGE_TAG:
+    {
+      GstTagList *tag_list;
+
+      gst_message_parse_tag (message, &tag_list);
+      if (verbose)
+        g_print ("tag\n");
+    }
+      break;
+    case GST_MESSAGE_STATE_CHANGED:
+    {
+      GstState oldstate, newstate, pending;
+
+      gst_message_parse_state_changed (message, &oldstate, &newstate, &pending);
+      if (GST_ELEMENT (message->src) == intertest->pipeline) {
+        if (verbose)
+          g_print ("state change from %s to %s\n",
+              gst_element_state_get_name (oldstate),
+              gst_element_state_get_name (newstate));
+        switch (GST_STATE_TRANSITION (oldstate, newstate)) {
+          case GST_STATE_CHANGE_NULL_TO_READY:
+            gst_inter_test_handle_null_to_ready (intertest);
+            break;
+          case GST_STATE_CHANGE_READY_TO_PAUSED:
+            gst_inter_test_handle_ready_to_paused (intertest);
+            break;
+          case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
+            gst_inter_test_handle_paused_to_playing (intertest);
+            break;
+          case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
+            gst_inter_test_handle_playing_to_paused (intertest);
+            break;
+          case GST_STATE_CHANGE_PAUSED_TO_READY:
+            gst_inter_test_handle_paused_to_ready (intertest);
+            break;
+          case GST_STATE_CHANGE_READY_TO_NULL:
+            gst_inter_test_handle_ready_to_null (intertest);
+            break;
+          default:
+            if (verbose)
+              g_print ("unknown state change from %s to %s\n",
+                  gst_element_state_get_name (oldstate),
+                  gst_element_state_get_name (newstate));
+        }
+      }
+    }
+      break;
+    case GST_MESSAGE_BUFFERING:
+    {
+      int percent;
+      gst_message_parse_buffering (message, &percent);
+      //g_print("buffering %d\n", percent);
+      if (!intertest->paused_for_buffering && percent < 100) {
+        g_print ("pausing for buffing\n");
+        intertest->paused_for_buffering = TRUE;
+        gst_element_set_state (intertest->pipeline, GST_STATE_PAUSED);
+      } else if (intertest->paused_for_buffering && percent == 100) {
+        g_print ("unpausing for buffing\n");
+        intertest->paused_for_buffering = FALSE;
+        gst_element_set_state (intertest->pipeline, GST_STATE_PLAYING);
+      }
+    }
+      break;
+    case GST_MESSAGE_STATE_DIRTY:
+    case GST_MESSAGE_CLOCK_PROVIDE:
+    case GST_MESSAGE_CLOCK_LOST:
+    case GST_MESSAGE_NEW_CLOCK:
+    case GST_MESSAGE_STRUCTURE_CHANGE:
+    case GST_MESSAGE_STREAM_STATUS:
+      break;
+    case GST_MESSAGE_STEP_DONE:
+    case GST_MESSAGE_APPLICATION:
+    case GST_MESSAGE_ELEMENT:
+    case GST_MESSAGE_SEGMENT_START:
+    case GST_MESSAGE_SEGMENT_DONE:
+    case GST_MESSAGE_DURATION:
+    case GST_MESSAGE_LATENCY:
+    case GST_MESSAGE_ASYNC_START:
+    case GST_MESSAGE_ASYNC_DONE:
+    case GST_MESSAGE_REQUEST_STATE:
+    case GST_MESSAGE_STEP_START:
+    default:
+      if (verbose) {
+        g_print ("message: %s\n", GST_MESSAGE_TYPE_NAME (message));
+      }
+      break;
+    case GST_MESSAGE_QOS:
+      break;
+  }
+
+  return TRUE;
+}
+
+
+
+static gboolean
+onesecond_timer (gpointer priv)
+{
+  //GstInterTest *intertest = (GstInterTest *)priv;
+
+  g_print (".\n");
+
+  return TRUE;
+}
+
+
+
+/* helper functions */
+
+#if 0
+gboolean
+have_element (const gchar * element_name)
+{
+  GstPluginFeature *feature;
+
+  feature = gst_default_registry_find_feature (element_name,
+      GST_TYPE_ELEMENT_FACTORY);
+  if (feature) {
+    g_object_unref (feature);
+    return TRUE;
+  }
+  return FALSE;
+}
+#endif
diff --git a/gst/inter/gstintervideosink.c b/gst/inter/gstintervideosink.c
new file mode 100644
index 0000000000..940d7b27e7
--- /dev/null
+++ b/gst/inter/gstintervideosink.c
@@ -0,0 +1,332 @@
+/* GStreamer
+ * Copyright (C) 2011 David A. Schleef <ds@schleef.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., 51 Franklin Street, Suite 500,
+ * Boston, MA 02110-1335, USA.
+ */
+/**
+ * SECTION:element-gstintervideosink
+ *
+ * The intervideosink element does FIXME stuff.
+ *
+ * <refsect2>
+ * <title>Example launch line</title>
+ * |[
+ * gst-launch -v fakesrc ! intervideosink ! FIXME ! fakesink
+ * ]|
+ * FIXME Describe what the pipeline does.
+ * </refsect2>
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/gst.h>
+#include <gst/base/gstbasesink.h>
+#include <gst/video/video.h>
+#include "gstintervideosink.h"
+
+GST_DEBUG_CATEGORY_STATIC (gst_inter_video_sink_debug_category);
+#define GST_CAT_DEFAULT gst_inter_video_sink_debug_category
+
+/* prototypes */
+
+
+static void gst_inter_video_sink_set_property (GObject * object,
+    guint property_id, const GValue * value, GParamSpec * pspec);
+static void gst_inter_video_sink_get_property (GObject * object,
+    guint property_id, GValue * value, GParamSpec * pspec);
+static void gst_inter_video_sink_dispose (GObject * object);
+static void gst_inter_video_sink_finalize (GObject * object);
+
+static GstCaps *gst_inter_video_sink_get_caps (GstBaseSink * sink);
+static gboolean gst_inter_video_sink_set_caps (GstBaseSink * sink,
+    GstCaps * caps);
+static GstFlowReturn gst_inter_video_sink_buffer_alloc (GstBaseSink * sink,
+    guint64 offset, guint size, GstCaps * caps, GstBuffer ** buf);
+static void gst_inter_video_sink_get_times (GstBaseSink * sink,
+    GstBuffer * buffer, GstClockTime * start, GstClockTime * end);
+static gboolean gst_inter_video_sink_start (GstBaseSink * sink);
+static gboolean gst_inter_video_sink_stop (GstBaseSink * sink);
+static gboolean gst_inter_video_sink_unlock (GstBaseSink * sink);
+static gboolean gst_inter_video_sink_event (GstBaseSink * sink,
+    GstEvent * event);
+static GstFlowReturn gst_inter_video_sink_preroll (GstBaseSink * sink,
+    GstBuffer * buffer);
+static GstFlowReturn gst_inter_video_sink_render (GstBaseSink * sink,
+    GstBuffer * buffer);
+static GstStateChangeReturn gst_inter_video_sink_async_play (GstBaseSink *
+    sink);
+static gboolean gst_inter_video_sink_activate_pull (GstBaseSink * sink,
+    gboolean active);
+static gboolean gst_inter_video_sink_unlock_stop (GstBaseSink * sink);
+
+enum
+{
+  PROP_0
+};
+
+/* pad templates */
+
+static GstStaticPadTemplate gst_inter_video_sink_sink_template =
+GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("I420"))
+    );
+
+
+/* class initialization */
+
+#define DEBUG_INIT(bla) \
+  GST_DEBUG_CATEGORY_INIT (gst_inter_video_sink_debug_category, "intervideosink", 0, \
+      "debug category for intervideosink element");
+
+GST_BOILERPLATE_FULL (GstInterVideoSink, gst_inter_video_sink, GstBaseSink,
+    GST_TYPE_BASE_SINK, DEBUG_INIT);
+
+static void
+gst_inter_video_sink_base_init (gpointer g_class)
+{
+  GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
+
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_inter_video_sink_sink_template));
+
+  gst_element_class_set_details_simple (element_class, "FIXME Long name",
+      "Generic", "FIXME Description", "FIXME <fixme@example.com>");
+}
+
+static void
+gst_inter_video_sink_class_init (GstInterVideoSinkClass * klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  GstBaseSinkClass *base_sink_class = GST_BASE_SINK_CLASS (klass);
+
+  gobject_class->set_property = gst_inter_video_sink_set_property;
+  gobject_class->get_property = gst_inter_video_sink_get_property;
+  gobject_class->dispose = gst_inter_video_sink_dispose;
+  gobject_class->finalize = gst_inter_video_sink_finalize;
+  base_sink_class->get_caps = GST_DEBUG_FUNCPTR (gst_inter_video_sink_get_caps);
+  base_sink_class->set_caps = GST_DEBUG_FUNCPTR (gst_inter_video_sink_set_caps);
+  if (0)
+    base_sink_class->buffer_alloc =
+        GST_DEBUG_FUNCPTR (gst_inter_video_sink_buffer_alloc);
+  base_sink_class->get_times =
+      GST_DEBUG_FUNCPTR (gst_inter_video_sink_get_times);
+  base_sink_class->start = GST_DEBUG_FUNCPTR (gst_inter_video_sink_start);
+  base_sink_class->stop = GST_DEBUG_FUNCPTR (gst_inter_video_sink_stop);
+  base_sink_class->unlock = GST_DEBUG_FUNCPTR (gst_inter_video_sink_unlock);
+  if (0)
+    base_sink_class->event = GST_DEBUG_FUNCPTR (gst_inter_video_sink_event);
+  //if (0)
+  base_sink_class->preroll = GST_DEBUG_FUNCPTR (gst_inter_video_sink_preroll);
+  base_sink_class->render = GST_DEBUG_FUNCPTR (gst_inter_video_sink_render);
+  if (0)
+    base_sink_class->async_play =
+        GST_DEBUG_FUNCPTR (gst_inter_video_sink_async_play);
+  if (0)
+    base_sink_class->activate_pull =
+        GST_DEBUG_FUNCPTR (gst_inter_video_sink_activate_pull);
+  base_sink_class->unlock_stop =
+      GST_DEBUG_FUNCPTR (gst_inter_video_sink_unlock_stop);
+
+}
+
+static void
+gst_inter_video_sink_init (GstInterVideoSink * intervideosink,
+    GstInterVideoSinkClass * intervideosink_class)
+{
+
+  intervideosink->sinkpad =
+      gst_pad_new_from_static_template (&gst_inter_video_sink_sink_template,
+      "sink");
+
+  intervideosink->surface = gst_inter_surface_get ("default");
+}
+
+void
+gst_inter_video_sink_set_property (GObject * object, guint property_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  /* GstInterVideoSink *intervideosink = GST_INTER_VIDEO_SINK (object); */
+
+  switch (property_id) {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+  }
+}
+
+void
+gst_inter_video_sink_get_property (GObject * object, guint property_id,
+    GValue * value, GParamSpec * pspec)
+{
+  /* GstInterVideoSink *intervideosink = GST_INTER_VIDEO_SINK (object); */
+
+  switch (property_id) {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+  }
+}
+
+void
+gst_inter_video_sink_dispose (GObject * object)
+{
+  /* GstInterVideoSink *intervideosink = GST_INTER_VIDEO_SINK (object); */
+
+  /* clean up as possible.  may be called multiple times */
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+void
+gst_inter_video_sink_finalize (GObject * object)
+{
+  /* GstInterVideoSink *intervideosink = GST_INTER_VIDEO_SINK (object); */
+
+  /* clean up object here */
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+
+
+static GstCaps *
+gst_inter_video_sink_get_caps (GstBaseSink * sink)
+{
+
+  return NULL;
+}
+
+static gboolean
+gst_inter_video_sink_set_caps (GstBaseSink * sink, GstCaps * caps)
+{
+
+  return TRUE;
+}
+
+static GstFlowReturn
+gst_inter_video_sink_buffer_alloc (GstBaseSink * sink, guint64 offset,
+    guint size, GstCaps * caps, GstBuffer ** buf)
+{
+
+  return GST_FLOW_ERROR;
+}
+
+static void
+gst_inter_video_sink_get_times (GstBaseSink * sink, GstBuffer * buffer,
+    GstClockTime * start, GstClockTime * end)
+{
+  GstInterVideoSink *intervideosink = GST_INTER_VIDEO_SINK (sink);
+
+  if (GST_BUFFER_TIMESTAMP_IS_VALID (buffer)) {
+    *start = GST_BUFFER_TIMESTAMP (buffer);
+    if (GST_BUFFER_DURATION_IS_VALID (buffer)) {
+      *end = *start + GST_BUFFER_DURATION (buffer);
+    } else {
+      if (intervideosink->fps_n > 0) {
+        *end = *start +
+            gst_util_uint64_scale_int (GST_SECOND, intervideosink->fps_d,
+            intervideosink->fps_n);
+      }
+    }
+  }
+
+
+}
+
+static gboolean
+gst_inter_video_sink_start (GstBaseSink * sink)
+{
+
+  return TRUE;
+}
+
+static gboolean
+gst_inter_video_sink_stop (GstBaseSink * sink)
+{
+  GstInterVideoSink *intervideosink = GST_INTER_VIDEO_SINK (sink);
+
+  g_mutex_lock (intervideosink->surface->mutex);
+  if (intervideosink->surface->video_buffer) {
+    gst_buffer_unref (intervideosink->surface->video_buffer);
+  }
+  intervideosink->surface->video_buffer = NULL;
+  g_mutex_unlock (intervideosink->surface->mutex);
+
+  return TRUE;
+}
+
+static gboolean
+gst_inter_video_sink_unlock (GstBaseSink * sink)
+{
+
+  return TRUE;
+}
+
+static gboolean
+gst_inter_video_sink_event (GstBaseSink * sink, GstEvent * event)
+{
+
+  return TRUE;
+}
+
+static GstFlowReturn
+gst_inter_video_sink_preroll (GstBaseSink * sink, GstBuffer * buffer)
+{
+  //return gst_inter_video_sink_render (sink, buffer);
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_inter_video_sink_render (GstBaseSink * sink, GstBuffer * buffer)
+{
+  GstInterVideoSink *intervideosink = GST_INTER_VIDEO_SINK (sink);
+
+  g_mutex_lock (intervideosink->surface->mutex);
+  if (intervideosink->surface->video_buffer) {
+    gst_buffer_unref (intervideosink->surface->video_buffer);
+  }
+  intervideosink->surface->video_buffer = gst_buffer_ref (buffer);
+  intervideosink->surface->video_buffer_count = 0;
+  g_mutex_unlock (intervideosink->surface->mutex);
+
+  return GST_FLOW_OK;
+}
+
+static GstStateChangeReturn
+gst_inter_video_sink_async_play (GstBaseSink * sink)
+{
+
+  return GST_STATE_CHANGE_SUCCESS;
+}
+
+static gboolean
+gst_inter_video_sink_activate_pull (GstBaseSink * sink, gboolean active)
+{
+
+  return TRUE;
+}
+
+static gboolean
+gst_inter_video_sink_unlock_stop (GstBaseSink * sink)
+{
+
+  return TRUE;
+}
diff --git a/gst/inter/gstintervideosink.h b/gst/inter/gstintervideosink.h
new file mode 100644
index 0000000000..00bbd6e857
--- /dev/null
+++ b/gst/inter/gstintervideosink.h
@@ -0,0 +1,58 @@
+/* GStreamer
+ * Copyright (C) 2011 David A. Schleef <ds@schleef.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.
+ */
+
+#ifndef _GST_INTER_VIDEO_SINK_H_
+#define _GST_INTER_VIDEO_SINK_H_
+
+#include <gst/base/gstbasesink.h>
+#include "gstintersurface.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_INTER_VIDEO_SINK   (gst_inter_video_sink_get_type())
+#define GST_INTER_VIDEO_SINK(obj)   (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_INTER_VIDEO_SINK,GstInterVideoSink))
+#define GST_INTER_VIDEO_SINK_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_INTER_VIDEO_SINK,GstInterVideoSinkClass))
+#define GST_IS_INTER_VIDEO_SINK(obj)   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_INTER_VIDEO_SINK))
+#define GST_IS_INTER_VIDEO_SINK_CLASS(obj)   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_INTER_VIDEO_SINK))
+
+typedef struct _GstInterVideoSink GstInterVideoSink;
+typedef struct _GstInterVideoSinkClass GstInterVideoSinkClass;
+
+struct _GstInterVideoSink
+{
+  GstBaseSink base_intervideosink;
+
+  GstInterSurface *surface;
+
+  GstPad *sinkpad;
+
+  int fps_n;
+  int fps_d;
+};
+
+struct _GstInterVideoSinkClass
+{
+  GstBaseSinkClass base_intervideosink_class;
+};
+
+GType gst_inter_video_sink_get_type (void);
+
+G_END_DECLS
+
+#endif
diff --git a/gst/inter/gstintervideosrc.c b/gst/inter/gstintervideosrc.c
new file mode 100644
index 0000000000..04d9655305
--- /dev/null
+++ b/gst/inter/gstintervideosrc.c
@@ -0,0 +1,510 @@
+/* GStreamer
+ * Copyright (C) 2011 David A. Schleef <ds@schleef.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., 51 Franklin Street, Suite 500,
+ * Boston, MA 02110-1335, USA.
+ */
+/**
+ * SECTION:element-gstintervideosrc
+ *
+ * The intervideosrc element does FIXME stuff.
+ *
+ * <refsect2>
+ * <title>Example launch line</title>
+ * |[
+ * gst-launch -v fakesrc ! intervideosrc ! FIXME ! fakesink
+ * ]|
+ * FIXME Describe what the pipeline does.
+ * </refsect2>
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/gst.h>
+#include <gst/base/gstbasesrc.h>
+#include <gst/video/video.h>
+#include "gstintervideosrc.h"
+#include <string.h>
+
+GST_DEBUG_CATEGORY_STATIC (gst_inter_video_src_debug_category);
+#define GST_CAT_DEFAULT gst_inter_video_src_debug_category
+
+/* prototypes */
+
+
+static void gst_inter_video_src_set_property (GObject * object,
+    guint property_id, const GValue * value, GParamSpec * pspec);
+static void gst_inter_video_src_get_property (GObject * object,
+    guint property_id, GValue * value, GParamSpec * pspec);
+static void gst_inter_video_src_dispose (GObject * object);
+static void gst_inter_video_src_finalize (GObject * object);
+
+static GstCaps *gst_inter_video_src_get_caps (GstBaseSrc * src);
+static gboolean gst_inter_video_src_set_caps (GstBaseSrc * src, GstCaps * caps);
+static gboolean gst_inter_video_src_negotiate (GstBaseSrc * src);
+static gboolean gst_inter_video_src_newsegment (GstBaseSrc * src);
+static gboolean gst_inter_video_src_start (GstBaseSrc * src);
+static gboolean gst_inter_video_src_stop (GstBaseSrc * src);
+static void
+gst_inter_video_src_get_times (GstBaseSrc * src, GstBuffer * buffer,
+    GstClockTime * start, GstClockTime * end);
+static gboolean gst_inter_video_src_is_seekable (GstBaseSrc * src);
+static gboolean gst_inter_video_src_unlock (GstBaseSrc * src);
+static gboolean gst_inter_video_src_event (GstBaseSrc * src, GstEvent * event);
+static GstFlowReturn
+gst_inter_video_src_create (GstBaseSrc * src, guint64 offset, guint size,
+    GstBuffer ** buf);
+static gboolean gst_inter_video_src_do_seek (GstBaseSrc * src,
+    GstSegment * segment);
+static gboolean gst_inter_video_src_query (GstBaseSrc * src, GstQuery * query);
+static gboolean gst_inter_video_src_check_get_range (GstBaseSrc * src);
+static void gst_inter_video_src_fixate (GstBaseSrc * src, GstCaps * caps);
+static gboolean gst_inter_video_src_unlock_stop (GstBaseSrc * src);
+static gboolean
+gst_inter_video_src_prepare_seek_segment (GstBaseSrc * src, GstEvent * seek,
+    GstSegment * segment);
+
+enum
+{
+  PROP_0
+};
+
+/* pad templates */
+
+static GstStaticPadTemplate gst_inter_video_src_src_template =
+GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("I420"))
+    );
+
+
+/* class initialization */
+
+#define DEBUG_INIT(bla) \
+  GST_DEBUG_CATEGORY_INIT (gst_inter_video_src_debug_category, "intervideosrc", 0, \
+      "debug category for intervideosrc element");
+
+GST_BOILERPLATE_FULL (GstInterVideoSrc, gst_inter_video_src, GstBaseSrc,
+    GST_TYPE_BASE_SRC, DEBUG_INIT);
+
+static void
+gst_inter_video_src_base_init (gpointer g_class)
+{
+  GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
+
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_inter_video_src_src_template));
+
+  gst_element_class_set_details_simple (element_class, "FIXME Long name",
+      "Generic", "FIXME Description", "FIXME <fixme@example.com>");
+}
+
+static void
+gst_inter_video_src_class_init (GstInterVideoSrcClass * klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  GstBaseSrcClass *base_src_class = GST_BASE_SRC_CLASS (klass);
+
+  gobject_class->set_property = gst_inter_video_src_set_property;
+  gobject_class->get_property = gst_inter_video_src_get_property;
+  gobject_class->dispose = gst_inter_video_src_dispose;
+  gobject_class->finalize = gst_inter_video_src_finalize;
+  if (0)
+    base_src_class->get_caps = GST_DEBUG_FUNCPTR (gst_inter_video_src_get_caps);
+  base_src_class->set_caps = GST_DEBUG_FUNCPTR (gst_inter_video_src_set_caps);
+  if (0)
+    base_src_class->negotiate =
+        GST_DEBUG_FUNCPTR (gst_inter_video_src_negotiate);
+  if (0)
+    base_src_class->newsegment =
+        GST_DEBUG_FUNCPTR (gst_inter_video_src_newsegment);
+  base_src_class->start = GST_DEBUG_FUNCPTR (gst_inter_video_src_start);
+  base_src_class->stop = GST_DEBUG_FUNCPTR (gst_inter_video_src_stop);
+  base_src_class->get_times = GST_DEBUG_FUNCPTR (gst_inter_video_src_get_times);
+  if (0)
+    base_src_class->is_seekable =
+        GST_DEBUG_FUNCPTR (gst_inter_video_src_is_seekable);
+  base_src_class->unlock = GST_DEBUG_FUNCPTR (gst_inter_video_src_unlock);
+  base_src_class->event = GST_DEBUG_FUNCPTR (gst_inter_video_src_event);
+  base_src_class->create = GST_DEBUG_FUNCPTR (gst_inter_video_src_create);
+  if (0)
+    base_src_class->do_seek = GST_DEBUG_FUNCPTR (gst_inter_video_src_do_seek);
+  base_src_class->query = GST_DEBUG_FUNCPTR (gst_inter_video_src_query);
+  if (0)
+    base_src_class->check_get_range =
+        GST_DEBUG_FUNCPTR (gst_inter_video_src_check_get_range);
+  base_src_class->fixate = GST_DEBUG_FUNCPTR (gst_inter_video_src_fixate);
+  if (0)
+    base_src_class->unlock_stop =
+        GST_DEBUG_FUNCPTR (gst_inter_video_src_unlock_stop);
+  if (0)
+    base_src_class->prepare_seek_segment =
+        GST_DEBUG_FUNCPTR (gst_inter_video_src_prepare_seek_segment);
+
+
+}
+
+static void
+gst_inter_video_src_init (GstInterVideoSrc * intervideosrc,
+    GstInterVideoSrcClass * intervideosrc_class)
+{
+
+  intervideosrc->srcpad =
+      gst_pad_new_from_static_template (&gst_inter_video_src_src_template,
+      "src");
+
+  gst_base_src_set_format (GST_BASE_SRC (intervideosrc), GST_FORMAT_TIME);
+  gst_base_src_set_live (GST_BASE_SRC (intervideosrc), TRUE);
+
+  intervideosrc->surface = gst_inter_surface_get ("default");
+}
+
+void
+gst_inter_video_src_set_property (GObject * object, guint property_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  /* GstInterVideoSrc *intervideosrc = GST_INTER_VIDEO_SRC (object); */
+
+  switch (property_id) {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+  }
+}
+
+void
+gst_inter_video_src_get_property (GObject * object, guint property_id,
+    GValue * value, GParamSpec * pspec)
+{
+  /* GstInterVideoSrc *intervideosrc = GST_INTER_VIDEO_SRC (object); */
+
+  switch (property_id) {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+  }
+}
+
+void
+gst_inter_video_src_dispose (GObject * object)
+{
+  /* GstInterVideoSrc *intervideosrc = GST_INTER_VIDEO_SRC (object); */
+
+  /* clean up as possible.  may be called multiple times */
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+void
+gst_inter_video_src_finalize (GObject * object)
+{
+  /* GstInterVideoSrc *intervideosrc = GST_INTER_VIDEO_SRC (object); */
+
+  /* clean up object here */
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+
+static GstCaps *
+gst_inter_video_src_get_caps (GstBaseSrc * src)
+{
+  GstInterVideoSrc *intervideosrc = GST_INTER_VIDEO_SRC (src);
+
+  GST_DEBUG_OBJECT (intervideosrc, "get_caps");
+
+  return NULL;
+}
+
+static gboolean
+gst_inter_video_src_set_caps (GstBaseSrc * src, GstCaps * caps)
+{
+  GstInterVideoSrc *intervideosrc = GST_INTER_VIDEO_SRC (src);
+  gboolean ret;
+  GstVideoFormat format;
+  int width, height;
+  int fps_n, fps_d;
+
+  GST_DEBUG_OBJECT (intervideosrc, "set_caps");
+
+  ret = gst_video_format_parse_caps (caps, &format, &width, &height);
+  ret &= gst_video_parse_caps_framerate (caps, &fps_n, &fps_d);
+
+  if (ret) {
+    intervideosrc->format = format;
+    intervideosrc->width = width;
+    intervideosrc->height = height;
+    intervideosrc->fps_n = fps_n;
+    intervideosrc->fps_d = fps_d;
+    GST_DEBUG ("fps %d/%d", fps_n, fps_d);
+  }
+
+  return ret;
+}
+
+static gboolean
+gst_inter_video_src_negotiate (GstBaseSrc * src)
+{
+  GstInterVideoSrc *intervideosrc = GST_INTER_VIDEO_SRC (src);
+
+  GST_DEBUG_OBJECT (intervideosrc, "negotiate");
+
+  return TRUE;
+}
+
+static gboolean
+gst_inter_video_src_newsegment (GstBaseSrc * src)
+{
+  GstInterVideoSrc *intervideosrc = GST_INTER_VIDEO_SRC (src);
+
+  GST_DEBUG_OBJECT (intervideosrc, "newsegment");
+
+  return TRUE;
+}
+
+static gboolean
+gst_inter_video_src_start (GstBaseSrc * src)
+{
+  GstInterVideoSrc *intervideosrc = GST_INTER_VIDEO_SRC (src);
+
+  GST_DEBUG_OBJECT (intervideosrc, "start");
+
+  return TRUE;
+}
+
+static gboolean
+gst_inter_video_src_stop (GstBaseSrc * src)
+{
+  GstInterVideoSrc *intervideosrc = GST_INTER_VIDEO_SRC (src);
+
+  GST_DEBUG_OBJECT (intervideosrc, "stop");
+
+  return TRUE;
+}
+
+static void
+gst_inter_video_src_get_times (GstBaseSrc * src, GstBuffer * buffer,
+    GstClockTime * start, GstClockTime * end)
+{
+  GstInterVideoSrc *intervideosrc = GST_INTER_VIDEO_SRC (src);
+
+  GST_DEBUG_OBJECT (intervideosrc, "get_times");
+
+  /* for live sources, sync on the timestamp of the buffer */
+  if (gst_base_src_is_live (src)) {
+    GstClockTime timestamp = GST_BUFFER_TIMESTAMP (buffer);
+
+    if (GST_CLOCK_TIME_IS_VALID (timestamp)) {
+      /* get duration to calculate end time */
+      GstClockTime duration = GST_BUFFER_DURATION (buffer);
+
+      if (GST_CLOCK_TIME_IS_VALID (duration)) {
+        *end = timestamp + duration;
+      }
+      *start = timestamp;
+    }
+  } else {
+    *start = -1;
+    *end = -1;
+  }
+}
+
+static gboolean
+gst_inter_video_src_is_seekable (GstBaseSrc * src)
+{
+  GstInterVideoSrc *intervideosrc = GST_INTER_VIDEO_SRC (src);
+
+  GST_DEBUG_OBJECT (intervideosrc, "is_seekable");
+
+  return FALSE;
+}
+
+static gboolean
+gst_inter_video_src_unlock (GstBaseSrc * src)
+{
+  GstInterVideoSrc *intervideosrc = GST_INTER_VIDEO_SRC (src);
+
+  GST_DEBUG_OBJECT (intervideosrc, "unlock");
+
+  return TRUE;
+}
+
+static gboolean
+gst_inter_video_src_event (GstBaseSrc * src, GstEvent * event)
+{
+  GstInterVideoSrc *intervideosrc = GST_INTER_VIDEO_SRC (src);
+
+  GST_DEBUG_OBJECT (intervideosrc, "event");
+
+  return TRUE;
+}
+
+static GstFlowReturn
+gst_inter_video_src_create (GstBaseSrc * src, guint64 offset, guint size,
+    GstBuffer ** buf)
+{
+  GstInterVideoSrc *intervideosrc = GST_INTER_VIDEO_SRC (src);
+  GstBuffer *buffer;
+  guint8 *data;
+
+  GST_DEBUG_OBJECT (intervideosrc, "create");
+
+  buffer = NULL;
+
+  g_mutex_lock (intervideosrc->surface->mutex);
+  if (intervideosrc->surface->video_buffer) {
+    buffer = gst_buffer_ref (intervideosrc->surface->video_buffer);
+    intervideosrc->surface->video_buffer_count++;
+    if (intervideosrc->surface->video_buffer_count >= 30) {
+      gst_buffer_unref (intervideosrc->surface->video_buffer);
+      intervideosrc->surface->video_buffer = NULL;
+    }
+  }
+  g_mutex_unlock (intervideosrc->surface->mutex);
+
+  if (buffer == NULL) {
+    buffer =
+        gst_buffer_new_and_alloc (gst_video_format_get_size
+        (intervideosrc->format, intervideosrc->width, intervideosrc->height));
+
+    data = GST_BUFFER_DATA (buffer);
+    memset (data, 16,
+        gst_video_format_get_row_stride (intervideosrc->format, 0,
+            intervideosrc->width) *
+        gst_video_format_get_component_height (intervideosrc->format, 0,
+            intervideosrc->height));
+
+    memset (data + gst_video_format_get_component_offset (intervideosrc->format,
+            1, intervideosrc->width, intervideosrc->height),
+        128,
+        2 * gst_video_format_get_row_stride (intervideosrc->format, 1,
+            intervideosrc->width) *
+        gst_video_format_get_component_height (intervideosrc->format, 1,
+            intervideosrc->height));
+
+#if 0
+    {
+      int i;
+      for (i = 0; i < 10000; i++) {
+        data[i] = g_random_int () & 0xff;
+      }
+    }
+#endif
+  }
+
+  buffer = gst_buffer_make_metadata_writable (buffer);
+
+  GST_BUFFER_TIMESTAMP (buffer) =
+      gst_util_uint64_scale_int (GST_SECOND * intervideosrc->n_frames,
+      intervideosrc->fps_d, intervideosrc->fps_n);
+  GST_DEBUG_OBJECT (intervideosrc, "create ts %" GST_TIME_FORMAT,
+      GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buffer)));
+  GST_BUFFER_DURATION (buffer) =
+      gst_util_uint64_scale_int (GST_SECOND * (intervideosrc->n_frames + 1),
+      intervideosrc->fps_d,
+      intervideosrc->fps_n) - GST_BUFFER_TIMESTAMP (buffer);
+  GST_BUFFER_OFFSET (buffer) = intervideosrc->n_frames;
+  GST_BUFFER_OFFSET_END (buffer) = -1;
+  GST_BUFFER_FLAG_UNSET (buffer, GST_BUFFER_FLAG_DISCONT);
+  if (intervideosrc->n_frames == 0) {
+    GST_BUFFER_FLAG_SET (buffer, GST_BUFFER_FLAG_DISCONT);
+  }
+  gst_buffer_set_caps (buffer, GST_PAD_CAPS (GST_BASE_SRC_PAD (intervideosrc)));
+  intervideosrc->n_frames++;
+
+  *buf = buffer;
+
+  return GST_FLOW_OK;
+}
+
+static gboolean
+gst_inter_video_src_do_seek (GstBaseSrc * src, GstSegment * segment)
+{
+  GstInterVideoSrc *intervideosrc = GST_INTER_VIDEO_SRC (src);
+
+  GST_DEBUG_OBJECT (intervideosrc, "do_seek");
+
+  return FALSE;
+}
+
+static gboolean
+gst_inter_video_src_query (GstBaseSrc * src, GstQuery * query)
+{
+  GstInterVideoSrc *intervideosrc = GST_INTER_VIDEO_SRC (src);
+
+  GST_DEBUG_OBJECT (intervideosrc, "query");
+
+  return TRUE;
+}
+
+static gboolean
+gst_inter_video_src_check_get_range (GstBaseSrc * src)
+{
+  GstInterVideoSrc *intervideosrc = GST_INTER_VIDEO_SRC (src);
+
+  GST_DEBUG_OBJECT (intervideosrc, "get_range");
+
+  return FALSE;
+}
+
+static void
+gst_inter_video_src_fixate (GstBaseSrc * src, GstCaps * caps)
+{
+  GstInterVideoSrc *intervideosrc = GST_INTER_VIDEO_SRC (src);
+  GstStructure *structure;
+
+  GST_DEBUG_OBJECT (intervideosrc, "fixate");
+
+  structure = gst_caps_get_structure (caps, 0);
+
+  gst_structure_fixate_field_nearest_int (structure, "width", 320);
+  gst_structure_fixate_field_nearest_int (structure, "height", 240);
+  gst_structure_fixate_field_nearest_fraction (structure, "framerate", 30, 1);
+  if (gst_structure_has_field (structure, "pixel-aspect-ratio"))
+    gst_structure_fixate_field_nearest_fraction (structure,
+        "pixel-aspect-ratio", 1, 1);
+  if (gst_structure_has_field (structure, "color-matrix"))
+    gst_structure_fixate_field_string (structure, "color-matrix", "sdtv");
+  if (gst_structure_has_field (structure, "chroma-site"))
+    gst_structure_fixate_field_string (structure, "chroma-site", "mpeg2");
+
+  if (gst_structure_has_field (structure, "interlaced"))
+    gst_structure_fixate_field_boolean (structure, "interlaced", FALSE);
+
+}
+
+static gboolean
+gst_inter_video_src_unlock_stop (GstBaseSrc * src)
+{
+  GstInterVideoSrc *intervideosrc = GST_INTER_VIDEO_SRC (src);
+
+  GST_DEBUG_OBJECT (intervideosrc, "stop");
+
+  return TRUE;
+}
+
+static gboolean
+gst_inter_video_src_prepare_seek_segment (GstBaseSrc * src, GstEvent * seek,
+    GstSegment * segment)
+{
+  GstInterVideoSrc *intervideosrc = GST_INTER_VIDEO_SRC (src);
+
+  GST_DEBUG_OBJECT (intervideosrc, "seek_segment");
+
+  return FALSE;
+}
diff --git a/gst/inter/gstintervideosrc.h b/gst/inter/gstintervideosrc.h
new file mode 100644
index 0000000000..909410a186
--- /dev/null
+++ b/gst/inter/gstintervideosrc.h
@@ -0,0 +1,62 @@
+/* GStreamer
+ * Copyright (C) 2011 David A. Schleef <ds@schleef.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.
+ */
+
+#ifndef _GST_INTER_VIDEO_SRC_H_
+#define _GST_INTER_VIDEO_SRC_H_
+
+#include <gst/base/gstbasesrc.h>
+#include <gst/video/video.h>
+#include "gstintersurface.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_INTER_VIDEO_SRC   (gst_inter_video_src_get_type())
+#define GST_INTER_VIDEO_SRC(obj)   (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_INTER_VIDEO_SRC,GstInterVideoSrc))
+#define GST_INTER_VIDEO_SRC_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_INTER_VIDEO_SRC,GstInterVideoSrcClass))
+#define GST_IS_INTER_VIDEO_SRC(obj)   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_INTER_VIDEO_SRC))
+#define GST_IS_INTER_VIDEO_SRC_CLASS(obj)   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_INTER_VIDEO_SRC))
+
+typedef struct _GstInterVideoSrc GstInterVideoSrc;
+typedef struct _GstInterVideoSrcClass GstInterVideoSrcClass;
+
+struct _GstInterVideoSrc
+{
+  GstBaseSrc base_intervideosrc;
+
+  GstPad *srcpad;
+  GstInterSurface *surface;
+
+  GstVideoFormat format;
+  int fps_n;
+  int fps_d;
+  int n_frames;
+  int width;
+  int height;
+};
+
+struct _GstInterVideoSrcClass
+{
+  GstBaseSrcClass base_intervideosrc_class;
+};
+
+GType gst_inter_video_src_get_type (void);
+
+G_END_DECLS
+
+#endif

From ae49fa1f78f0726a406ba4dfe2a5615c3e01ac6b Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Tue, 28 Jun 2011 23:47:18 -0700
Subject: [PATCH 038/158] decklink: Add more modes

---
 sys/decklink/gstdecklink.cpp    | 106 ++++++++++++++++++++++++--------
 sys/decklink/gstdecklink.h      |  54 ++++++++++++----
 sys/decklink/gstdecklinksrc.cpp |  15 ++---
 3 files changed, 129 insertions(+), 46 deletions(-)

diff --git a/sys/decklink/gstdecklink.cpp b/sys/decklink/gstdecklink.cpp
index 942882e3a9..56dd23b4c0 100644
--- a/sys/decklink/gstdecklink.cpp
+++ b/sys/decklink/gstdecklink.cpp
@@ -34,11 +34,29 @@ gst_decklink_mode_get_type (void)
   if (!type) {
     static const GEnumValue modes[] = {
       {GST_DECKLINK_MODE_NTSC, "ntsc", "NTSC SD 60i"},
+      {GST_DECKLINK_MODE_NTSC2398, "ntsc2398", "NTSC SD 60i (24 fps)"},
       {GST_DECKLINK_MODE_PAL, "pal", "PAL SD 50i"},
+      {GST_DECKLINK_MODE_NTSC_P, "ntsc-p", "NTSC SD 60p"},
+      {GST_DECKLINK_MODE_PAL_P, "pal-p", "PAL SD 50p"},
+
+      {GST_DECKLINK_MODE_1080p2398, "1080p2398", "HD1080 23.98p"},
+      {GST_DECKLINK_MODE_1080p24, "1080p24", "HD1080 24p"},
+      {GST_DECKLINK_MODE_1080p25, "1080p25", "HD1080 25p"},
+      {GST_DECKLINK_MODE_1080p2997, "1080p2997", "HD1080 29.97p"},
+      {GST_DECKLINK_MODE_1080p30, "1080p30", "HD1080 30p"},
+
       {GST_DECKLINK_MODE_1080i50, "1080i50", "HD1080 50i"},
+      {GST_DECKLINK_MODE_1080i5994, "1080i5994", "HD1080 59.94i"},
       {GST_DECKLINK_MODE_1080i60, "1080i60", "HD1080 60i"},
+
+      {GST_DECKLINK_MODE_1080p50, "1080p50", "HD1080 50p"},
+      {GST_DECKLINK_MODE_1080p5994, "1080p5994", "HD1080 59.94p"},
+      {GST_DECKLINK_MODE_1080p60, "1080p60", "HD1080 60p"},
+
       {GST_DECKLINK_MODE_720p50, "720p50", "HD720 50p"},
+      {GST_DECKLINK_MODE_720p5994, "720p5994", "HD720 59.94p"},
       {GST_DECKLINK_MODE_720p60, "720p60", "HD720 60p"},
+
       {0, NULL, NULL}
     };
 
@@ -68,25 +86,36 @@ gst_decklink_connection_get_type (void)
   return type;
 }
 
-static const GstDecklinkMode modes[] = {
-  {bmdModeNTSC, 720, 486, 30000, 1001, true},
-  {bmdModePAL, 720, 576, 25, 1, true},
-  {bmdModeHD1080i50, 1920, 1080, 25, 1, true},
-  {bmdModeHD1080i5994, 1920, 1080, 30000, 1001, true},
-  {bmdModeHD720p50, 1280, 720, 50, 1, true},
-  {bmdModeHD720p5994, 1280, 720, 60000, 1001, true}
-};
+#define NTSC 10, 11, false, false
+#define PAL 12, 11, true, false
+#define HD 12, 11, false, true
 
-#if 0
-  //{ bmdModeNTSC2398, 720,486,24000,1001,true },
-  //{ bmdModeHD1080p2398, 1920,1080,24000,1001,false },
-  //{ bmdModeHD1080p24, 1920,1080,24,1,false },
-  //{ bmdModeHD1080p25, 1920,1080,25,1,false },
-  //{ bmdModeHD1080p2997, 1920,1080,30000,1001,false },
-  //{ bmdModeHD1080p30, 1920,1080,30,1,false },
-  //{ bmdModeHD1080i6000, 1920,1080,30,1,true },
-  //{ bmdModeHD720p60, 1280,720,60,1,true }
-#endif
+static const GstDecklinkMode modes[] = {
+  {bmdModeNTSC, 720, 486, 30000, 1001, true, NTSC },
+  {bmdModeNTSC2398, 720, 486, 24000, 1001, true, NTSC },
+  {bmdModePAL, 720, 576, 25, 1, true, PAL },
+  {bmdModeNTSCp, 720, 486, 30000, 1001, false, NTSC },
+  {bmdModePALp, 720, 576, 25, 1, false, PAL },
+
+  {bmdModeHD1080p2398, 1920, 1080, 24000, 1001, false, HD },
+  {bmdModeHD1080p24, 1920, 1080, 24, 1, false, HD },
+  {bmdModeHD1080p25, 1920, 1080, 25, 1, false, HD },
+  {bmdModeHD1080p2997, 1920, 1080, 30000, 1001, false, HD },
+  {bmdModeHD1080p30, 1920, 1080, 30, 1, false, HD },
+
+  {bmdModeHD1080i50, 1920, 1080, 25, 1, true, HD },
+  {bmdModeHD1080i5994, 1920, 1080, 30000, 1001, true, HD },
+  {bmdModeHD1080i6000, 1920, 1080, 30, 1, true, HD },
+
+  {bmdModeHD1080p50, 1920, 1080, 50, 1, false, HD },
+  {bmdModeHD1080p5994, 1920, 1080, 30000, 1001, false, HD },
+  {bmdModeHD1080p6000, 1920, 1080, 60, 1, false, HD },
+
+  {bmdModeHD720p50, 1280, 720, 50, 1, false, HD },
+  {bmdModeHD720p5994, 1280, 720, 60000, 1001, false, HD },
+  {bmdModeHD720p60, 1280, 720, 60, 1, false, HD }
+
+};
 
 const GstDecklinkMode *
 gst_decklink_get_mode (GstDecklinkModeEnum e)
@@ -94,20 +123,49 @@ gst_decklink_get_mode (GstDecklinkModeEnum e)
   return &modes[e];
 }
 
-GstCaps *
-gst_decklink_mode_get_caps (GstDecklinkModeEnum e)
+static GstStructure *
+gst_decklink_mode_get_structure (GstDecklinkModeEnum e)
 {
   const GstDecklinkMode *mode = &modes[e];
 
-  return gst_caps_new_simple ("video/x-raw-yuv",
+  return gst_structure_new ("video/x-raw-yuv",
       "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC ('U', 'Y', 'V', 'Y'),
       "width", G_TYPE_INT, mode->width,
       "height", G_TYPE_INT, mode->height,
-      "framerate", GST_TYPE_FRACTION,
-      mode->fps_n, mode->fps_d,
-      "interlaced", G_TYPE_BOOLEAN, mode->interlaced, NULL);
+      "framerate", GST_TYPE_FRACTION, mode->fps_n, mode->fps_d,
+      "interlaced", G_TYPE_BOOLEAN, mode->interlaced,
+      "pixel-aspect-ratio", GST_TYPE_FRACTION, mode->par_n, mode->par_d,
+      "color-matrix", G_TYPE_STRING, mode->is_hdtv ? "hdtv" : "sdtv",
+      "chroma-site", G_TYPE_STRING, "mpeg2",
+      NULL);
 }
 
+GstCaps *
+gst_decklink_mode_get_caps (GstDecklinkModeEnum e)
+{
+  GstCaps *caps;
+
+  caps = gst_caps_new_empty ();
+  gst_caps_append_structure (caps, gst_decklink_mode_get_structure (e));
+
+  return caps;
+}
+
+GstCaps *
+gst_decklink_mode_get_template_caps (void)
+{
+  int i;
+  GstCaps *caps;
+  GstStructure *s;
+
+  caps = gst_caps_new_empty ();
+  for(i=0;i<(int)G_N_ELEMENTS(modes);i++) {
+    s = gst_decklink_mode_get_structure ((GstDecklinkModeEnum)i);
+    gst_caps_append_structure (caps, s);
+  }
+
+  return caps;
+}
 
 static gboolean
 plugin_init (GstPlugin * plugin)
diff --git a/sys/decklink/gstdecklink.h b/sys/decklink/gstdecklink.h
index 5792d611c6..2363dd47c4 100644
--- a/sys/decklink/gstdecklink.h
+++ b/sys/decklink/gstdecklink.h
@@ -26,10 +26,27 @@
 
 typedef enum {
   GST_DECKLINK_MODE_NTSC,
+  GST_DECKLINK_MODE_NTSC2398,
   GST_DECKLINK_MODE_PAL,
+  GST_DECKLINK_MODE_NTSC_P,
+  GST_DECKLINK_MODE_PAL_P,
+
+  GST_DECKLINK_MODE_1080p2398,
+  GST_DECKLINK_MODE_1080p24,
+  GST_DECKLINK_MODE_1080p25,
+  GST_DECKLINK_MODE_1080p2997,
+  GST_DECKLINK_MODE_1080p30,
+
   GST_DECKLINK_MODE_1080i50,
+  GST_DECKLINK_MODE_1080i5994,
   GST_DECKLINK_MODE_1080i60,
+
+  GST_DECKLINK_MODE_1080p50,
+  GST_DECKLINK_MODE_1080p5994,
+  GST_DECKLINK_MODE_1080p60,
+
   GST_DECKLINK_MODE_720p50,
+  GST_DECKLINK_MODE_720p5994,
   GST_DECKLINK_MODE_720p60
 } GstDecklinkModeEnum;
 #define GST_TYPE_DECKLINK_MODE (gst_decklink_mode_get_type ())
@@ -54,10 +71,15 @@ struct _GstDecklinkMode {
   int fps_n;
   int fps_d;
   gboolean interlaced;
+  int par_n;
+  int par_d;
+  gboolean tff;
+  gboolean is_hdtv;
 };
 
 const GstDecklinkMode * gst_decklink_get_mode (GstDecklinkModeEnum e);
 GstCaps * gst_decklink_mode_get_caps (GstDecklinkModeEnum e);
+GstCaps * gst_decklink_mode_get_template_caps (void);
 
 #define GST_DECKLINK_MODE_CAPS(w,h,n,d,i) \
   "video/x-raw-yuv,format=(fourcc)UYVY,width=" #w ",height=" #h \
@@ -65,22 +87,28 @@ GstCaps * gst_decklink_mode_get_caps (GstDecklinkModeEnum e);
 
 #define GST_DECKLINK_CAPS \
   GST_DECKLINK_MODE_CAPS(720,486,30000,1001,true) ";" \
+  GST_DECKLINK_MODE_CAPS(720,486,24000,1001,true) ";" \
   GST_DECKLINK_MODE_CAPS(720,576,25,1,true) ";" \
+  GST_DECKLINK_MODE_CAPS(720,486,30000,1001,false) ";" \
+  GST_DECKLINK_MODE_CAPS(720,576,25,1,false) ";" \
+  \
+  GST_DECKLINK_MODE_CAPS(1920,1080,24000,1001,false) ";" \
+  GST_DECKLINK_MODE_CAPS(1920,1080,24,1,false) ";" \
+  GST_DECKLINK_MODE_CAPS(1920,1080,25,1,false) ";" \
+  GST_DECKLINK_MODE_CAPS(1920,1080,30000,1001,false) ";" \
+  GST_DECKLINK_MODE_CAPS(1920,1080,30,1,false) ";" \
+  \
   GST_DECKLINK_MODE_CAPS(1920,1080,25,1,true) ";" \
   GST_DECKLINK_MODE_CAPS(1920,1080,30000,1001,true) ";" \
-  GST_DECKLINK_MODE_CAPS(1280,720,50,1,true) ";" \
-  GST_DECKLINK_MODE_CAPS(1280,720,60000,1001,true)
-
-#if 0
-  MODE(720,486,24000,1001,true) ";" \
-  MODE(1920,1080,24000,1001,false) ";" \
-  MODE(1920,1080,24,1,false) ";" \
-  MODE(1920,1080,25,1,false) ";" \
-  MODE(1920,1080,30000,1001,false) ";" \
-  MODE(1920,1080,30,1,false) ";" \
-  MODE(1920,1080,30,1,true) ";" \
-  MODE(1280,720,60,1,true)
-#endif
+  GST_DECKLINK_MODE_CAPS(1920,1080,30,1,true) ";" \
+  \
+  GST_DECKLINK_MODE_CAPS(1920,1080,50,1,false) ";" \
+  GST_DECKLINK_MODE_CAPS(1920,1080,60000,1001,false) ";" \
+  GST_DECKLINK_MODE_CAPS(1920,1080,60,1,false) ";" \
+  \
+  GST_DECKLINK_MODE_CAPS(1280,720,50,1,false) ";" \
+  GST_DECKLINK_MODE_CAPS(1280,720,60000,1001,false) ";" \
+  GST_DECKLINK_MODE_CAPS(1280,720,60,1,false)
 
 
 #endif
diff --git a/sys/decklink/gstdecklinksrc.cpp b/sys/decklink/gstdecklinksrc.cpp
index 5976a62984..979b02517a 100644
--- a/sys/decklink/gstdecklinksrc.cpp
+++ b/sys/decklink/gstdecklinksrc.cpp
@@ -131,11 +131,7 @@ GST_STATIC_PAD_TEMPLATE ("audiosrc",
     GST_STATIC_CAPS ("audio/x-raw-int,width=16,depth=16,channels=2,rate=48000")
     );
 
-static GstStaticPadTemplate gst_decklink_src_video_src_template =
-GST_STATIC_PAD_TEMPLATE ("videosrc",
-    GST_PAD_SRC,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_DECKLINK_CAPS));
+/* the video source pad template is created on the fly */
 
 /* class initialization */
 
@@ -154,7 +150,8 @@ gst_decklink_src_base_init (gpointer g_class)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&gst_decklink_src_audio_src_template));
   gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&gst_decklink_src_video_src_template));
+      gst_pad_template_new ("videosrc", GST_PAD_SRC, GST_PAD_ALWAYS,
+        gst_decklink_mode_get_template_caps ()));
 
   gst_element_class_set_details_simple (element_class, "Decklink source",
       "Source/Video", "DeckLink Source", "David Schleef <ds@entropywave.com>");
@@ -235,9 +232,9 @@ gst_decklink_src_init (GstDecklinkSrc * decklinksrc,
 
 
 
-  decklinksrc->videosrcpad =
-      gst_pad_new_from_static_template (&gst_decklink_src_video_src_template,
-      "videosrc");
+  decklinksrc->videosrcpad = gst_pad_new_from_template (
+      gst_element_class_get_pad_template(GST_ELEMENT_CLASS(decklinksrc_class),
+        "videosrc"), "videosrc");
   gst_pad_set_getcaps_function (decklinksrc->videosrcpad,
       GST_DEBUG_FUNCPTR (gst_decklink_src_video_src_getcaps));
   gst_pad_set_setcaps_function (decklinksrc->videosrcpad,

From ab1e013bb89f88de22d7b05bd5a4156a56ad330e Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Sun, 3 Jul 2011 18:32:37 -0700
Subject: [PATCH 039/158] decklink: properly set up analog input

---
 sys/decklink/gstdecklinksrc.cpp | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/sys/decklink/gstdecklinksrc.cpp b/sys/decklink/gstdecklinksrc.cpp
index 979b02517a..e918b1d2d7 100644
--- a/sys/decklink/gstdecklinksrc.cpp
+++ b/sys/decklink/gstdecklinksrc.cpp
@@ -439,6 +439,27 @@ gst_decklink_src_start (GstElement * element)
     GST_ERROR ("set configuration (input source)");
     return FALSE;
   }
+
+  if (decklinksrc->connection == GST_DECKLINK_CONNECTION_COMPOSITE) {
+    ret = config->SetInt (bmdDeckLinkConfigAnalogVideoInputFlags,
+        bmdAnalogVideoFlagCompositeSetup75);
+    if (ret != S_OK) {
+      GST_ERROR ("set configuration (composite setup)");
+      return FALSE;
+    }
+  }
+
+  if (decklinksrc->connection == GST_DECKLINK_CONNECTION_COMPOSITE ||
+      decklinksrc->connection == GST_DECKLINK_CONNECTION_COMPONENT ||
+      decklinksrc->connection == GST_DECKLINK_CONNECTION_SVIDEO) {
+    ret = config->SetInt (bmdDeckLinkConfigAudioInputConnection,
+        bmdAudioConnectionAnalog);
+    if (ret != S_OK) {
+      GST_ERROR ("set configuration (audio input connection)");
+      return FALSE;
+    }
+  }
+
 #if 0
   ret = decklinksrc->input->GetDisplayModeIterator (&mode_iterator);
   if (ret != S_OK) {

From f21e36b54bf5ad51eb8c35621754916ab410eac2 Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Mon, 4 Jul 2011 16:18:18 -0700
Subject: [PATCH 040/158] diracparse: make diracparse work correctly

---
 gst/videoparsers/gstdiracparse.c | 149 +++++++++++++++++++------------
 gst/videoparsers/gstdiracparse.h |   4 +
 2 files changed, 96 insertions(+), 57 deletions(-)

diff --git a/gst/videoparsers/gstdiracparse.c b/gst/videoparsers/gstdiracparse.c
index fbd157abb5..3feaa41926 100644
--- a/gst/videoparsers/gstdiracparse.c
+++ b/gst/videoparsers/gstdiracparse.c
@@ -36,7 +36,9 @@
 
 #include <gst/gst.h>
 #include <gst/base/gstbytereader.h>
+#include <string.h>
 #include "gstdiracparse.h"
+#include "dirac_parse.h"
 
 /* prototypes */
 
@@ -190,6 +192,8 @@ gst_dirac_parse_finalize (GObject * object)
 static gboolean
 gst_dirac_parse_start (GstBaseParse * parse)
 {
+  gst_base_parse_set_min_frame_size (parse, 13);
+
   return TRUE;
 }
 
@@ -206,102 +210,133 @@ gst_dirac_parse_set_sink_caps (GstBaseParse * parse, GstCaps * caps)
   return TRUE;
 }
 
-static gboolean
-gst_dirac_parse_frame_header (GstDiracParse * diracparse,
-    GstBuffer * buffer, guint * framesize)
-{
-  int next_header;
-
-  next_header = GST_READ_UINT32_BE (GST_BUFFER_DATA (buffer) + 5);
-
-  *framesize = next_header;
-  return TRUE;
-}
-
 static gboolean
 gst_dirac_parse_check_valid_frame (GstBaseParse * parse,
     GstBaseParseFrame * frame, guint * framesize, gint * skipsize)
 {
   GstByteReader reader = GST_BYTE_READER_INIT_FROM_BUFFER (frame->buffer);
-  GstDiracParse *diracparse = GST_DIRAC_PARSE (parse);
   int off;
   guint32 next_header;
-  gboolean lost_sync;
-  gboolean draining;
+  guint8 *data;
+  int size;
+  gboolean have_picture = FALSE;
+  int offset;
 
-  if (G_UNLIKELY (GST_BUFFER_SIZE (frame->buffer) < 13))
+  data = GST_BUFFER_DATA (frame->buffer);
+  size = GST_BUFFER_SIZE (frame->buffer);
+
+  if (G_UNLIKELY (size < 13))
     return FALSE;
 
-  off = gst_byte_reader_masked_scan_uint32 (&reader, 0xffffffff,
-      0x42424344, 0, GST_BUFFER_SIZE (frame->buffer));
+  GST_DEBUG ("%d: %02x %02x %02x %02x", size, data[0], data[1], data[2],
+      data[3]);
 
-  if (off < 0) {
-    *skipsize = GST_BUFFER_SIZE (frame->buffer) - 3;
-    return FALSE;
-  }
+  if (GST_READ_UINT32_BE (data) != 0x42424344) {
+    off = gst_byte_reader_masked_scan_uint32 (&reader, 0xffffffff,
+        0x42424344, 0, GST_BUFFER_SIZE (frame->buffer));
 
-  GST_LOG_OBJECT (parse, "possible sync at buffer offset %d", off);
+    if (off < 0) {
+      *skipsize = GST_BUFFER_SIZE (frame->buffer) - 3;
+      return FALSE;
+    }
 
-  if (off > 0) {
-    GST_ERROR ("skipping %d", off);
+    GST_LOG_OBJECT (parse, "possible sync at buffer offset %d", off);
+
+    GST_DEBUG ("skipping %d", off);
     *skipsize = off;
     return FALSE;
   }
 
-  if (!gst_dirac_parse_frame_header (diracparse, frame->buffer, framesize)) {
-    GST_ERROR ("bad header");
-    *skipsize = 3;
-    return FALSE;
-  }
+  /* have sync, parse chunks */
 
-  GST_LOG ("framesize %d", *framesize);
+  offset = 0;
+  while (!have_picture) {
+    GST_DEBUG ("offset %d:", offset);
 
-  lost_sync = GST_BASE_PARSE_LOST_SYNC (frame);
-  draining = GST_BASE_PARSE_DRAINING (frame);
-
-  if (lost_sync && !draining) {
-    guint32 next_sync_word = 0;
-
-    next_header = GST_READ_UINT32_BE (GST_BUFFER_DATA (frame->buffer) + 5);
-    GST_LOG ("next header %d", next_header);
-
-    if (!gst_byte_reader_skip (&reader, next_header) ||
-        !gst_byte_reader_get_uint32_be (&reader, &next_sync_word)) {
-      gst_base_parse_set_min_frame_size (parse, next_header + 4);
-      *skipsize = 0;
+    if (offset + 13 >= size) {
+      *framesize = offset + 13;
       return FALSE;
-    } else {
-      if (next_sync_word != 0x42424344) {
-        *skipsize = 3;
-        return FALSE;
-      } else {
-        gst_base_parse_set_min_frame_size (parse, next_header);
+    }
 
-      }
+    GST_DEBUG ("chunk type %02x", data[offset + 4]);
+
+    if (GST_READ_UINT32_BE (data + offset) != 0x42424344) {
+      GST_DEBUG ("bad header");
+      *skipsize = 3;
+      return FALSE;
+    }
+
+    next_header = GST_READ_UINT32_BE (data + offset + 5);
+    GST_DEBUG ("next_header %d", next_header);
+    if (next_header == 0)
+      next_header = 13;
+
+    if (SCHRO_PARSE_CODE_IS_PICTURE (data[offset + 4])) {
+      have_picture = TRUE;
+    }
+
+    offset += next_header;
+    if (offset >= size) {
+      *framesize = offset;
+      return FALSE;
     }
   }
 
+  *framesize = offset;
+  GST_DEBUG ("framesize %d", *framesize);
+
   return TRUE;
 }
 
 static GstFlowReturn
 gst_dirac_parse_parse_frame (GstBaseParse * parse, GstBaseParseFrame * frame)
 {
-  //GstDiracParse * diracparse = GST_DIRAC_PARSE (parse);
+  GstDiracParse *diracparse = GST_DIRAC_PARSE (parse);
+  guint8 *data;
+  int size;
 
   /* Called when processing incoming buffers.  Function should parse
      a checked frame. */
   /* MUST implement */
 
-  if (GST_PAD_CAPS (GST_BASE_PARSE_SRC_PAD (parse)) == NULL) {
-    GstCaps *caps = gst_caps_new_simple ("video/x-dirac", NULL);
+  data = GST_BUFFER_DATA (frame->buffer);
+  size = GST_BUFFER_SIZE (frame->buffer);
 
-    gst_buffer_set_caps (frame->buffer, caps);
-    gst_pad_set_caps (GST_BASE_PARSE_SRC_PAD (parse), caps);
-    gst_caps_unref (caps);
+  //GST_ERROR("got here %d", size);
 
+  if (data[4] == SCHRO_PARSE_CODE_SEQUENCE_HEADER) {
+    GstCaps *caps;
+    DiracSequenceHeader sequence_header;
+    int ret;
+
+    ret = dirac_sequence_header_parse (&sequence_header, data + 13, size - 13);
+    if (ret) {
+      memcpy (&diracparse->sequence_header, &sequence_header,
+          sizeof (sequence_header));
+      caps = gst_caps_new_simple ("video/x-dirac",
+          "width", G_TYPE_INT, sequence_header.width,
+          "height", G_TYPE_INT, sequence_header.height,
+          "framerate", GST_TYPE_FRACTION,
+          sequence_header.frame_rate_numerator,
+          sequence_header.frame_rate_denominator,
+          "pixel-aspect-ratio", GST_TYPE_FRACTION,
+          sequence_header.aspect_ratio_numerator,
+          sequence_header.aspect_ratio_denominator,
+          "interlaced", G_TYPE_BOOLEAN, sequence_header.interlaced,
+          "profile", G_TYPE_INT, sequence_header.profile,
+          "level", G_TYPE_INT, sequence_header.level, NULL);
+      gst_pad_set_caps (GST_BASE_PARSE_SRC_PAD (parse), caps);
+      gst_caps_unref (caps);
+
+      gst_base_parse_set_frame_rate (parse,
+          sequence_header.frame_rate_numerator,
+          sequence_header.frame_rate_denominator, 0, 0);
+    }
   }
 
+  gst_buffer_set_caps (frame->buffer,
+      GST_PAD_CAPS (GST_BASE_PARSE_SRC_PAD (parse)));
+
   gst_base_parse_set_min_frame_size (parse, 13);
 
   return GST_FLOW_OK;
diff --git a/gst/videoparsers/gstdiracparse.h b/gst/videoparsers/gstdiracparse.h
index abf3821f15..7691c5790a 100644
--- a/gst/videoparsers/gstdiracparse.h
+++ b/gst/videoparsers/gstdiracparse.h
@@ -22,6 +22,7 @@
 
 #include <gst/gst.h>
 #include <gst/base/gstbaseparse.h>
+#include "dirac_parse.h"
 
 G_BEGIN_DECLS
 
@@ -38,6 +39,9 @@ struct _GstDiracParse
 {
   GstBaseParse base_diracparse;
 
+  DiracSequenceHeader sequence_header;
+
+  guint32 frame_number;
 };
 
 struct _GstDiracParseClass

From 5056c34761a3eb61affca601ecdd5d45d284147d Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Wed, 6 Jul 2011 15:56:32 -0700
Subject: [PATCH 041/158] decklink: HD modes are square pixels

---
 sys/decklink/gstdecklink.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/decklink/gstdecklink.cpp b/sys/decklink/gstdecklink.cpp
index 56dd23b4c0..e720b9a4d4 100644
--- a/sys/decklink/gstdecklink.cpp
+++ b/sys/decklink/gstdecklink.cpp
@@ -88,7 +88,7 @@ gst_decklink_connection_get_type (void)
 
 #define NTSC 10, 11, false, false
 #define PAL 12, 11, true, false
-#define HD 12, 11, false, true
+#define HD 1, 1, false, true
 
 static const GstDecklinkMode modes[] = {
   {bmdModeNTSC, 720, 486, 30000, 1001, true, NTSC },

From 3b6cd3d35c77f1413a8fd1d52269120c3eabfe20 Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Sun, 5 Jun 2011 00:54:19 -0700
Subject: [PATCH 042/158] opus: duplicate from CELT

Copy the celt plugin and convert it to Opus.  Mostly works.
---
 configure.ac          |   15 +
 ext/Makefile.am       |    8 +
 ext/opus/Makefile.am  |   16 +
 ext/opus/gstopus.c    |   50 ++
 ext/opus/gstopusdec.c |  865 +++++++++++++++++++++++++++++
 ext/opus/gstopusdec.h |   77 +++
 ext/opus/gstopusenc.c | 1198 +++++++++++++++++++++++++++++++++++++++++
 ext/opus/gstopusenc.h |  105 ++++
 8 files changed, 2334 insertions(+)
 create mode 100644 ext/opus/Makefile.am
 create mode 100644 ext/opus/gstopus.c
 create mode 100644 ext/opus/gstopusdec.c
 create mode 100644 ext/opus/gstopusdec.h
 create mode 100644 ext/opus/gstopusenc.c
 create mode 100644 ext/opus/gstopusenc.h

diff --git a/configure.ac b/configure.ac
index 7322eaa934..1aac3360a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1385,6 +1385,19 @@ AG_GST_CHECK_FEATURE(OPENCV, [opencv plugins], opencv, [
   AC_SUBST(OPENCV_LIBS)
 ])
 
+dnl *** Opus ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_OPUS, true)
+AG_GST_CHECK_FEATURE(OPUS, [opus], opus, [
+  PKG_CHECK_MODULES(OPUS, opus >= 0.9.4, [
+          AC_DEFINE([HAVE_OPUS], 1, [Define if Opus >= 0.9.4 is installed])
+          HAVE_OPUS="yes"
+  ], [
+          HAVE_OPUS="no"
+  ])
+  AC_SUBST(OPUS_CFLAGS)
+  AC_SUBST(OPUS_LIBS)
+])
+
 dnl *** rsvg ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_RSVG, true)
 AG_GST_CHECK_FEATURE(RSVG, [rsvg decoder], rsvg, [
@@ -1750,6 +1763,7 @@ AM_CONDITIONAL(USE_NEON, false)
 AM_CONDITIONAL(USE_OFA, false)
 AM_CONDITIONAL(USE_OPENAL, false)
 AM_CONDITIONAL(USE_OPENCV, false)
+AM_CONDITIONAL(USE_OPUS, false)
 AM_CONDITIONAL(USE_RSVG, false)
 AM_CONDITIONAL(USE_TIMIDITY, false)
 AM_CONDITIONAL(USE_WILDMIDI, false)
@@ -1994,6 +2008,7 @@ ext/neon/Makefile
 ext/ofa/Makefile
 ext/openal/Makefile
 ext/opencv/Makefile
+ext/opus/Makefile
 ext/rsvg/Makefile
 ext/resindvd/Makefile
 ext/rtmp/Makefile
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 70d4c69c31..2a6f8ec760 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -262,6 +262,12 @@ else
 OPENCV_DIR=
 endif
 
+if USE_OPUS
+OPUS_DIR=opus
+else
+OPUS_DIR=
+endif
+
 if USE_RSVG
 RSVG_DIR=rsvg
 else
@@ -419,6 +425,7 @@ SUBDIRS=\
 	$(OFA_DIR) \
 	$(OPENAL_DIR) \
 	$(OPENCV_DIR) \
+	$(OPUS_DIR) \
 	$(RSVG_DIR) \
 	$(SCHRO_DIR) \
 	$(SDL_DIR) \
@@ -471,6 +478,7 @@ DIST_SUBDIRS = \
 	ofa \
 	openal \
 	opencv \
+	opus \
 	rsvg \
 	resindvd \
 	schroedinger \
diff --git a/ext/opus/Makefile.am b/ext/opus/Makefile.am
new file mode 100644
index 0000000000..aa50ba96ef
--- /dev/null
+++ b/ext/opus/Makefile.am
@@ -0,0 +1,16 @@
+plugin_LTLIBRARIES = libgstopus.la
+
+libgstopus_la_SOURCES = gstopus.c gstopusdec.c gstopusenc.c
+libgstopus_la_CFLAGS = \
+	$(GST_PLUGINS_BASE_CFLAGS) \
+	$(GST_CFLAGS) \
+	$(OPUS_CFLAGS)
+libgstopus_la_LIBADD = \
+	$(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \
+	$(GST_BASE_LIBS) \
+	$(GST_LIBS) \
+	$(OPUS_LIBS)
+libgstopus_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(LIBM)
+libgstopus_la_LIBTOOLFLAGS = --tag=disable-static
+
+noinst_HEADERS = gstopusenc.h gstopusdec.h 
diff --git a/ext/opus/gstopus.c b/ext/opus/gstopus.c
new file mode 100644
index 0000000000..65e9dcdc58
--- /dev/null
+++ b/ext/opus/gstopus.c
@@ -0,0 +1,50 @@
+/* GStreamer
+ * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
+ * Copyright (C) <2008> Sebastian Dröge <sebastian.droege@collabora.co.uk>
+ *
+ * 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 "gstopusdec.h"
+#include "gstopusenc.h"
+
+#include <gst/tag/tag.h>
+
+static gboolean
+plugin_init (GstPlugin * plugin)
+{
+
+  if (!gst_element_register (plugin, "opusenc", GST_RANK_NONE,
+          GST_TYPE_OPUS_ENC))
+    return FALSE;
+
+  if (!gst_element_register (plugin, "opusdec", GST_RANK_PRIMARY,
+          GST_TYPE_OPUS_DEC))
+    return FALSE;
+
+  gst_tag_register_musicbrainz_tags ();
+
+  return TRUE;
+}
+
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+    GST_VERSION_MINOR,
+    "opus",
+    "OPUS plugin library",
+    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/ext/opus/gstopusdec.c b/ext/opus/gstopusdec.c
new file mode 100644
index 0000000000..47c06cec0a
--- /dev/null
+++ b/ext/opus/gstopusdec.c
@@ -0,0 +1,865 @@
+/* GStreamer
+ * Copyright (C) 2004 Wim Taymans <wim@fluendo.com>
+ * Copyright (C) 2006 Tim-Philipp Müller <tim centricular net>
+ * Copyright (C) 2008 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+ *
+ * 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 the speexdec element.
+ */
+
+/**
+ * SECTION:element-opusdec
+ * @see_also: opusenc, oggdemux
+ *
+ * This element decodes a OPUS stream to raw integer audio.
+ *
+ * <refsect2>
+ * <title>Example pipelines</title>
+ * |[
+ * gst-launch -v filesrc location=opus.ogg ! oggdemux ! opusdec ! audioconvert ! audioresample ! alsasink
+ * ]| Decode an Ogg/Opus file. To create an Ogg/Opus file refer to the documentation of opusenc.
+ * </refsect2>
+ */
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include "gstopusdec.h"
+#include <string.h>
+#include <gst/tag/tag.h>
+
+GST_DEBUG_CATEGORY_STATIC (opusdec_debug);
+#define GST_CAT_DEFAULT opusdec_debug
+
+#define DEC_MAX_FRAME_SIZE 2000
+
+static GstStaticPadTemplate opus_dec_src_factory =
+GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("audio/x-raw-int, "
+        "rate = (int) [ 32000, 64000 ], "
+        "channels = (int) [ 1, 2 ], "
+        "endianness = (int) BYTE_ORDER, "
+        "signed = (boolean) true, " "width = (int) 16, " "depth = (int) 16")
+    );
+
+static GstStaticPadTemplate opus_dec_sink_factory =
+GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("audio/x-opus")
+    );
+
+GST_BOILERPLATE (GstOpusDec, gst_opus_dec, GstElement, GST_TYPE_ELEMENT);
+
+static gboolean opus_dec_sink_event (GstPad * pad, GstEvent * event);
+static GstFlowReturn opus_dec_chain (GstPad * pad, GstBuffer * buf);
+static gboolean opus_dec_sink_setcaps (GstPad * pad, GstCaps * caps);
+static GstStateChangeReturn opus_dec_change_state (GstElement * element,
+    GstStateChange transition);
+
+static gboolean opus_dec_src_event (GstPad * pad, GstEvent * event);
+static gboolean opus_dec_src_query (GstPad * pad, GstQuery * query);
+static gboolean opus_dec_sink_query (GstPad * pad, GstQuery * query);
+static const GstQueryType *opus_get_src_query_types (GstPad * pad);
+static const GstQueryType *opus_get_sink_query_types (GstPad * pad);
+static gboolean opus_dec_convert (GstPad * pad,
+    GstFormat src_format, gint64 src_value,
+    GstFormat * dest_format, gint64 * dest_value);
+
+static GstFlowReturn opus_dec_chain_parse_data (GstOpusDec * dec,
+    GstBuffer * buf, GstClockTime timestamp, GstClockTime duration);
+static GstFlowReturn opus_dec_chain_parse_header (GstOpusDec * dec,
+    GstBuffer * buf);
+#if 0
+static GstFlowReturn opus_dec_chain_parse_comments (GstOpusDec * dec,
+    GstBuffer * buf);
+#endif
+
+static void
+gst_opus_dec_base_init (gpointer g_class)
+{
+  GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
+
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&opus_dec_src_factory));
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&opus_dec_sink_factory));
+  gst_element_class_set_details_simple (element_class, "Opus audio decoder",
+      "Codec/Decoder/Audio",
+      "decode opus streams to audio",
+      "Sebastian Dröge <sebastian.droege@collabora.co.uk>");
+}
+
+static void
+gst_opus_dec_class_init (GstOpusDecClass * klass)
+{
+  GstElementClass *gstelement_class;
+
+  gstelement_class = (GstElementClass *) klass;
+
+  gstelement_class->change_state = GST_DEBUG_FUNCPTR (opus_dec_change_state);
+
+  GST_DEBUG_CATEGORY_INIT (opusdec_debug, "opusdec", 0,
+      "opus decoding element");
+}
+
+static void
+gst_opus_dec_reset (GstOpusDec * dec)
+{
+  gst_segment_init (&dec->segment, GST_FORMAT_UNDEFINED);
+  dec->granulepos = -1;
+  dec->packetno = 0;
+  dec->frame_size = 0;
+  dec->frame_samples = 960;
+  dec->frame_duration = 0;
+  if (dec->state) {
+    opus_decoder_destroy (dec->state);
+    dec->state = NULL;
+  }
+#if 0
+  if (dec->mode) {
+    opus_mode_destroy (dec->mode);
+    dec->mode = NULL;
+  }
+#endif
+
+  gst_buffer_replace (&dec->streamheader, NULL);
+  gst_buffer_replace (&dec->vorbiscomment, NULL);
+  g_list_foreach (dec->extra_headers, (GFunc) gst_mini_object_unref, NULL);
+  g_list_free (dec->extra_headers);
+  dec->extra_headers = NULL;
+
+#if 0
+  memset (&dec->header, 0, sizeof (dec->header));
+#endif
+}
+
+static void
+gst_opus_dec_init (GstOpusDec * dec, GstOpusDecClass * g_class)
+{
+  dec->sinkpad =
+      gst_pad_new_from_static_template (&opus_dec_sink_factory, "sink");
+  gst_pad_set_chain_function (dec->sinkpad, GST_DEBUG_FUNCPTR (opus_dec_chain));
+  gst_pad_set_event_function (dec->sinkpad,
+      GST_DEBUG_FUNCPTR (opus_dec_sink_event));
+  gst_pad_set_query_type_function (dec->sinkpad,
+      GST_DEBUG_FUNCPTR (opus_get_sink_query_types));
+  gst_pad_set_query_function (dec->sinkpad,
+      GST_DEBUG_FUNCPTR (opus_dec_sink_query));
+  gst_pad_set_setcaps_function (dec->sinkpad,
+      GST_DEBUG_FUNCPTR (opus_dec_sink_setcaps));
+  gst_element_add_pad (GST_ELEMENT (dec), dec->sinkpad);
+
+  dec->srcpad = gst_pad_new_from_static_template (&opus_dec_src_factory, "src");
+  gst_pad_use_fixed_caps (dec->srcpad);
+  gst_pad_set_event_function (dec->srcpad,
+      GST_DEBUG_FUNCPTR (opus_dec_src_event));
+  gst_pad_set_query_type_function (dec->srcpad,
+      GST_DEBUG_FUNCPTR (opus_get_src_query_types));
+  gst_pad_set_query_function (dec->srcpad,
+      GST_DEBUG_FUNCPTR (opus_dec_src_query));
+  gst_element_add_pad (GST_ELEMENT (dec), dec->srcpad);
+
+  dec->sample_rate = 48000;
+  dec->n_channels = 2;
+
+  gst_opus_dec_reset (dec);
+}
+
+static gboolean
+opus_dec_sink_setcaps (GstPad * pad, GstCaps * caps)
+{
+  GstOpusDec *dec = GST_OPUS_DEC (gst_pad_get_parent (pad));
+  gboolean ret = TRUE;
+  GstStructure *s;
+  const GValue *streamheader;
+
+  s = gst_caps_get_structure (caps, 0);
+  if ((streamheader = gst_structure_get_value (s, "streamheader")) &&
+      G_VALUE_HOLDS (streamheader, GST_TYPE_ARRAY) &&
+      gst_value_array_get_size (streamheader) >= 2) {
+    const GValue *header;
+    GstBuffer *buf;
+    GstFlowReturn res = GST_FLOW_OK;
+
+    header = gst_value_array_get_value (streamheader, 0);
+    if (header && G_VALUE_HOLDS (header, GST_TYPE_BUFFER)) {
+      buf = gst_value_get_buffer (header);
+      res = opus_dec_chain_parse_header (dec, buf);
+      if (res != GST_FLOW_OK)
+        goto done;
+      gst_buffer_replace (&dec->streamheader, buf);
+    }
+#if 0
+    vorbiscomment = gst_value_array_get_value (streamheader, 1);
+    if (vorbiscomment && G_VALUE_HOLDS (vorbiscomment, GST_TYPE_BUFFER)) {
+      buf = gst_value_get_buffer (vorbiscomment);
+      res = opus_dec_chain_parse_comments (dec, buf);
+      if (res != GST_FLOW_OK)
+        goto done;
+      gst_buffer_replace (&dec->vorbiscomment, buf);
+    }
+#endif
+
+    g_list_foreach (dec->extra_headers, (GFunc) gst_mini_object_unref, NULL);
+    g_list_free (dec->extra_headers);
+    dec->extra_headers = NULL;
+
+    if (gst_value_array_get_size (streamheader) > 2) {
+      gint i, n;
+
+      n = gst_value_array_get_size (streamheader);
+      for (i = 2; i < n; i++) {
+        header = gst_value_array_get_value (streamheader, i);
+        buf = gst_value_get_buffer (header);
+        dec->extra_headers =
+            g_list_prepend (dec->extra_headers, gst_buffer_ref (buf));
+      }
+    }
+  }
+
+done:
+  gst_object_unref (dec);
+  return ret;
+}
+
+static gboolean
+opus_dec_convert (GstPad * pad,
+    GstFormat src_format, gint64 src_value,
+    GstFormat * dest_format, gint64 * dest_value)
+{
+  gboolean res = TRUE;
+  GstOpusDec *dec;
+  guint64 scale = 1;
+
+  dec = GST_OPUS_DEC (gst_pad_get_parent (pad));
+
+  if (dec->packetno < 1) {
+    res = FALSE;
+    goto cleanup;
+  }
+
+  if (src_format == *dest_format) {
+    *dest_value = src_value;
+    res = TRUE;
+    goto cleanup;
+  }
+
+  if (pad == dec->sinkpad &&
+      (src_format == GST_FORMAT_BYTES || *dest_format == GST_FORMAT_BYTES)) {
+    res = FALSE;
+    goto cleanup;
+  }
+
+  switch (src_format) {
+    case GST_FORMAT_TIME:
+      switch (*dest_format) {
+        case GST_FORMAT_BYTES:
+          scale = sizeof (gint16) * dec->n_channels;
+        case GST_FORMAT_DEFAULT:
+          *dest_value =
+              gst_util_uint64_scale_int (scale * src_value,
+              dec->sample_rate, GST_SECOND);
+          break;
+        default:
+          res = FALSE;
+          break;
+      }
+      break;
+    case GST_FORMAT_DEFAULT:
+      switch (*dest_format) {
+        case GST_FORMAT_BYTES:
+          *dest_value = src_value * sizeof (gint16) * dec->n_channels;
+          break;
+        case GST_FORMAT_TIME:
+          *dest_value =
+              gst_util_uint64_scale_int (src_value, GST_SECOND,
+              dec->sample_rate);
+          break;
+        default:
+          res = FALSE;
+          break;
+      }
+      break;
+    case GST_FORMAT_BYTES:
+      switch (*dest_format) {
+        case GST_FORMAT_DEFAULT:
+          *dest_value = src_value / (sizeof (gint16) * dec->n_channels);
+          break;
+        case GST_FORMAT_TIME:
+          *dest_value = gst_util_uint64_scale_int (src_value, GST_SECOND,
+              dec->sample_rate * sizeof (gint16) * dec->n_channels);
+          break;
+        default:
+          res = FALSE;
+          break;
+      }
+      break;
+    default:
+      res = FALSE;
+      break;
+  }
+
+cleanup:
+  gst_object_unref (dec);
+  return res;
+}
+
+static const GstQueryType *
+opus_get_sink_query_types (GstPad * pad)
+{
+  static const GstQueryType opus_dec_sink_query_types[] = {
+    GST_QUERY_CONVERT,
+    0
+  };
+
+  return opus_dec_sink_query_types;
+}
+
+static gboolean
+opus_dec_sink_query (GstPad * pad, GstQuery * query)
+{
+  GstOpusDec *dec;
+  gboolean res;
+
+  dec = GST_OPUS_DEC (gst_pad_get_parent (pad));
+
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_CONVERT:
+    {
+      GstFormat src_fmt, dest_fmt;
+      gint64 src_val, dest_val;
+
+      gst_query_parse_convert (query, &src_fmt, &src_val, &dest_fmt, &dest_val);
+      res = opus_dec_convert (pad, src_fmt, src_val, &dest_fmt, &dest_val);
+      if (res) {
+        gst_query_set_convert (query, src_fmt, src_val, dest_fmt, dest_val);
+      }
+      break;
+    }
+    default:
+      res = gst_pad_query_default (pad, query);
+      break;
+  }
+
+  gst_object_unref (dec);
+  return res;
+}
+
+static const GstQueryType *
+opus_get_src_query_types (GstPad * pad)
+{
+  static const GstQueryType opus_dec_src_query_types[] = {
+    GST_QUERY_POSITION,
+    GST_QUERY_DURATION,
+    0
+  };
+
+  return opus_dec_src_query_types;
+}
+
+static gboolean
+opus_dec_src_query (GstPad * pad, GstQuery * query)
+{
+  GstOpusDec *dec;
+  gboolean res = FALSE;
+
+  dec = GST_OPUS_DEC (gst_pad_get_parent (pad));
+
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_POSITION:{
+      GstSegment segment;
+      GstFormat format;
+      gint64 cur;
+
+      gst_query_parse_position (query, &format, NULL);
+
+      GST_PAD_STREAM_LOCK (dec->sinkpad);
+      segment = dec->segment;
+      GST_PAD_STREAM_UNLOCK (dec->sinkpad);
+
+      if (segment.format != GST_FORMAT_TIME) {
+        GST_DEBUG_OBJECT (dec, "segment not initialised yet");
+        break;
+      }
+
+      if ((res = opus_dec_convert (dec->srcpad, GST_FORMAT_TIME,
+                  segment.last_stop, &format, &cur))) {
+        gst_query_set_position (query, format, cur);
+      }
+      break;
+    }
+    case GST_QUERY_DURATION:{
+      GstFormat format = GST_FORMAT_TIME;
+      gint64 dur;
+
+      /* get duration from demuxer */
+      if (!gst_pad_query_peer_duration (dec->sinkpad, &format, &dur))
+        break;
+
+      gst_query_parse_duration (query, &format, NULL);
+
+      /* and convert it into the requested format */
+      if ((res = opus_dec_convert (dec->srcpad, GST_FORMAT_TIME,
+                  dur, &format, &dur))) {
+        gst_query_set_duration (query, format, dur);
+      }
+      break;
+    }
+    default:
+      res = gst_pad_query_default (pad, query);
+      break;
+  }
+
+  gst_object_unref (dec);
+  return res;
+}
+
+static gboolean
+opus_dec_src_event (GstPad * pad, GstEvent * event)
+{
+  gboolean res = FALSE;
+  GstOpusDec *dec = GST_OPUS_DEC (gst_pad_get_parent (pad));
+
+  GST_LOG_OBJECT (dec, "handling %s event", GST_EVENT_TYPE_NAME (event));
+
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_SEEK:{
+      GstFormat format, tformat;
+      gdouble rate;
+      GstEvent *real_seek;
+      GstSeekFlags flags;
+      GstSeekType cur_type, stop_type;
+      gint64 cur, stop;
+      gint64 tcur, tstop;
+
+      gst_event_parse_seek (event, &rate, &format, &flags, &cur_type, &cur,
+          &stop_type, &stop);
+
+      /* we have to ask our peer to seek to time here as we know
+       * nothing about how to generate a granulepos from the src
+       * formats or anything.
+       *
+       * First bring the requested format to time
+       */
+      tformat = GST_FORMAT_TIME;
+      if (!(res = opus_dec_convert (pad, format, cur, &tformat, &tcur)))
+        break;
+      if (!(res = opus_dec_convert (pad, format, stop, &tformat, &tstop)))
+        break;
+
+      /* then seek with time on the peer */
+      real_seek = gst_event_new_seek (rate, GST_FORMAT_TIME,
+          flags, cur_type, tcur, stop_type, tstop);
+
+      GST_LOG_OBJECT (dec, "seek to %" GST_TIME_FORMAT, GST_TIME_ARGS (tcur));
+
+      res = gst_pad_push_event (dec->sinkpad, real_seek);
+      gst_event_unref (event);
+      break;
+    }
+    default:
+      res = gst_pad_event_default (pad, event);
+      break;
+  }
+
+  gst_object_unref (dec);
+  return res;
+}
+
+static gboolean
+opus_dec_sink_event (GstPad * pad, GstEvent * event)
+{
+  GstOpusDec *dec;
+  gboolean ret = FALSE;
+
+  dec = GST_OPUS_DEC (gst_pad_get_parent (pad));
+
+  GST_LOG_OBJECT (dec, "handling %s event", GST_EVENT_TYPE_NAME (event));
+
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_NEWSEGMENT:{
+      GstFormat format;
+      gdouble rate, arate;
+      gint64 start, stop, time;
+      gboolean update;
+
+      gst_event_parse_new_segment_full (event, &update, &rate, &arate, &format,
+          &start, &stop, &time);
+
+      if (format != GST_FORMAT_TIME)
+        goto newseg_wrong_format;
+
+      if (rate <= 0.0)
+        goto newseg_wrong_rate;
+
+      if (update) {
+        /* time progressed without data, see if we can fill the gap with
+         * some concealment data */
+        if (dec->segment.last_stop < start) {
+          GstClockTime duration;
+
+          duration = start - dec->segment.last_stop;
+          opus_dec_chain_parse_data (dec, NULL, dec->segment.last_stop,
+              duration);
+        }
+      }
+
+      /* now configure the values */
+      gst_segment_set_newsegment_full (&dec->segment, update,
+          rate, arate, GST_FORMAT_TIME, start, stop, time);
+
+      dec->granulepos = -1;
+
+      GST_DEBUG_OBJECT (dec, "segment now: cur = %" GST_TIME_FORMAT " [%"
+          GST_TIME_FORMAT " - %" GST_TIME_FORMAT "]",
+          GST_TIME_ARGS (dec->segment.last_stop),
+          GST_TIME_ARGS (dec->segment.start),
+          GST_TIME_ARGS (dec->segment.stop));
+
+      ret = gst_pad_push_event (dec->srcpad, event);
+      break;
+    }
+    default:
+      ret = gst_pad_event_default (pad, event);
+      break;
+  }
+
+  gst_object_unref (dec);
+  return ret;
+
+  /* ERRORS */
+newseg_wrong_format:
+  {
+    GST_DEBUG_OBJECT (dec, "received non TIME newsegment");
+    gst_object_unref (dec);
+    return FALSE;
+  }
+newseg_wrong_rate:
+  {
+    GST_DEBUG_OBJECT (dec, "negative rates not supported yet");
+    gst_object_unref (dec);
+    return FALSE;
+  }
+}
+
+static GstFlowReturn
+opus_dec_chain_parse_header (GstOpusDec * dec, GstBuffer * buf)
+{
+  GstCaps *caps;
+  //gint error = OPUS_OK;
+
+#if 0
+  dec->samples_per_frame = opus_packet_get_samples_per_frame (
+      (const unsigned char *) GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf));
+#endif
+
+#if 0
+  if (memcmp (dec->header.codec_id, "OPUS    ", 8) != 0)
+    goto invalid_header;
+#endif
+
+#if 0
+#ifdef HAVE_OPUS_0_7
+  dec->mode =
+      opus_mode_create (dec->sample_rate, dec->header.frame_size, &error);
+#else
+  dec->mode =
+      opus_mode_create (dec->sample_rate, dec->header.nb_channels,
+      dec->header.frame_size, &error);
+#endif
+  if (!dec->mode)
+    goto mode_init_failed;
+
+  /* initialize the decoder */
+#ifdef HAVE_OPUS_0_11
+  dec->state =
+      opus_decoder_create_custom (dec->mode, dec->header.nb_channels, &error);
+#else
+#ifdef HAVE_OPUS_0_7
+  dec->state = opus_decoder_create (dec->mode, dec->header.nb_channels, &error);
+#else
+  dec->state = opus_decoder_create (dec->mode);
+#endif
+#endif
+#endif
+  dec->state = opus_decoder_create (dec->sample_rate, dec->n_channels);
+  if (!dec->state)
+    goto init_failed;
+
+#if 0
+#ifdef HAVE_OPUS_0_8
+  dec->frame_size = dec->header.frame_size;
+#else
+  opus_mode_info (dec->mode, OPUS_GET_FRAME_SIZE, &dec->frame_size);
+#endif
+#endif
+
+  dec->frame_duration = gst_util_uint64_scale_int (dec->frame_size,
+      GST_SECOND, dec->sample_rate);
+
+  /* set caps */
+  caps = gst_caps_new_simple ("audio/x-raw-int",
+      "rate", G_TYPE_INT, dec->sample_rate,
+      "channels", G_TYPE_INT, dec->n_channels,
+      "signed", G_TYPE_BOOLEAN, TRUE,
+      "endianness", G_TYPE_INT, G_BYTE_ORDER,
+      "width", G_TYPE_INT, 16, "depth", G_TYPE_INT, 16, NULL);
+
+  GST_DEBUG_OBJECT (dec, "rate=%d channels=%d frame-size=%d",
+      dec->sample_rate, dec->n_channels, dec->frame_size);
+
+  if (!gst_pad_set_caps (dec->srcpad, caps))
+    goto nego_failed;
+
+  gst_caps_unref (caps);
+  return GST_FLOW_OK;
+
+  /* ERRORS */
+#if 0
+invalid_header:
+  {
+    GST_ELEMENT_ERROR (GST_ELEMENT (dec), STREAM, DECODE,
+        (NULL), ("Invalid header"));
+    return GST_FLOW_ERROR;
+  }
+mode_init_failed:
+  {
+    GST_ELEMENT_ERROR (GST_ELEMENT (dec), STREAM, DECODE,
+        (NULL), ("Mode initialization failed: %d", error));
+    return GST_FLOW_ERROR;
+  }
+#endif
+init_failed:
+  {
+    GST_ELEMENT_ERROR (GST_ELEMENT (dec), STREAM, DECODE,
+        (NULL), ("couldn't initialize decoder"));
+    return GST_FLOW_ERROR;
+  }
+nego_failed:
+  {
+    GST_ELEMENT_ERROR (GST_ELEMENT (dec), STREAM, DECODE,
+        (NULL), ("couldn't negotiate format"));
+    gst_caps_unref (caps);
+    return GST_FLOW_NOT_NEGOTIATED;
+  }
+}
+
+#if 0
+static GstFlowReturn
+opus_dec_chain_parse_comments (GstOpusDec * dec, GstBuffer * buf)
+{
+  GstTagList *list;
+  gchar *encoder = NULL;
+
+  list = gst_tag_list_from_vorbiscomment_buffer (buf, NULL, 0, &encoder);
+
+  if (!list) {
+    GST_WARNING_OBJECT (dec, "couldn't decode comments");
+    list = gst_tag_list_new ();
+  }
+
+  if (encoder) {
+    gst_tag_list_add (list, GST_TAG_MERGE_REPLACE,
+        GST_TAG_ENCODER, encoder, NULL);
+  }
+
+  gst_tag_list_add (list, GST_TAG_MERGE_REPLACE,
+      GST_TAG_AUDIO_CODEC, "Opus", NULL);
+
+  if (dec->header.bytes_per_packet > 0) {
+    gst_tag_list_add (list, GST_TAG_MERGE_REPLACE,
+        GST_TAG_BITRATE, (guint) dec->header.bytes_per_packet * 8, NULL);
+  }
+
+  GST_INFO_OBJECT (dec, "tags: %" GST_PTR_FORMAT, list);
+
+  gst_element_found_tags_for_pad (GST_ELEMENT (dec), dec->srcpad, list);
+
+  g_free (encoder);
+  g_free (ver);
+
+  return GST_FLOW_OK;
+}
+#endif
+
+static GstFlowReturn
+opus_dec_chain_parse_data (GstOpusDec * dec, GstBuffer * buf,
+    GstClockTime timestamp, GstClockTime duration)
+{
+  GstFlowReturn res = GST_FLOW_OK;
+  gint size;
+  guint8 *data;
+  GstBuffer *outbuf;
+  gint16 *out_data;
+  int n;
+
+  if (timestamp != -1) {
+    dec->segment.last_stop = timestamp;
+    dec->granulepos = -1;
+  }
+
+  if (dec->state == NULL) {
+    GstCaps *caps;
+
+    dec->state = opus_decoder_create (dec->sample_rate, dec->n_channels);
+
+    /* set caps */
+    caps = gst_caps_new_simple ("audio/x-raw-int",
+        "rate", G_TYPE_INT, dec->sample_rate,
+        "channels", G_TYPE_INT, dec->n_channels,
+        "signed", G_TYPE_BOOLEAN, TRUE,
+        "endianness", G_TYPE_INT, G_BYTE_ORDER,
+        "width", G_TYPE_INT, 16, "depth", G_TYPE_INT, 16, NULL);
+
+    GST_DEBUG_OBJECT (dec, "rate=%d channels=%d frame-size=%d",
+        dec->sample_rate, dec->n_channels, dec->frame_size);
+
+    if (!gst_pad_set_caps (dec->srcpad, caps))
+      GST_ERROR ("nego failure");
+
+    gst_caps_unref (caps);
+  }
+
+  if (buf) {
+    data = GST_BUFFER_DATA (buf);
+    size = GST_BUFFER_SIZE (buf);
+
+    GST_DEBUG_OBJECT (dec, "received buffer of size %u", size);
+
+    /* copy timestamp */
+  } else {
+    /* concealment data, pass NULL as the bits parameters */
+    GST_DEBUG_OBJECT (dec, "creating concealment data");
+    data = NULL;
+    size = 0;
+  }
+
+  GST_DEBUG ("bandwidth %d", opus_packet_get_bandwidth (data));
+  GST_DEBUG ("samples_per_frame %d", opus_packet_get_samples_per_frame (data,
+          48000));
+  GST_DEBUG ("channels %d", opus_packet_get_nb_channels (data));
+
+  res = gst_pad_alloc_buffer_and_set_caps (dec->srcpad,
+      GST_BUFFER_OFFSET_NONE, dec->frame_samples * dec->n_channels * 2,
+      GST_PAD_CAPS (dec->srcpad), &outbuf);
+
+  if (res != GST_FLOW_OK) {
+    GST_DEBUG_OBJECT (dec, "buf alloc flow: %s", gst_flow_get_name (res));
+    return res;
+  }
+
+  out_data = (gint16 *) GST_BUFFER_DATA (outbuf);
+
+  GST_LOG_OBJECT (dec, "decoding frame");
+
+  n = opus_decode (dec->state, data, size, out_data, dec->frame_samples, TRUE);
+  if (n < 0) {
+    GST_ELEMENT_ERROR (dec, STREAM, DECODE, ("Decoding error: %d", n), (NULL));
+    return GST_FLOW_ERROR;
+  }
+
+  if (!GST_CLOCK_TIME_IS_VALID (timestamp)) {
+    timestamp = gst_util_uint64_scale_int (dec->granulepos - dec->frame_size,
+        GST_SECOND, dec->sample_rate);
+  }
+
+  GST_DEBUG_OBJECT (dec, "timestamp=%" GST_TIME_FORMAT,
+      GST_TIME_ARGS (timestamp));
+
+  GST_BUFFER_TIMESTAMP (outbuf) = GST_BUFFER_TIMESTAMP (buf);
+  GST_BUFFER_DURATION (outbuf) = GST_BUFFER_DURATION (buf);
+  if (dec->discont) {
+    GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_DISCONT);
+    dec->discont = 0;
+  }
+
+  dec->segment.last_stop += dec->frame_duration;
+
+  GST_LOG_OBJECT (dec, "pushing buffer with ts=%" GST_TIME_FORMAT ", dur=%"
+      GST_TIME_FORMAT, GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)),
+      GST_TIME_ARGS (dec->frame_duration));
+
+  res = gst_pad_push (dec->srcpad, outbuf);
+
+  if (res != GST_FLOW_OK)
+    GST_DEBUG_OBJECT (dec, "flow: %s", gst_flow_get_name (res));
+
+  return res;
+}
+
+static GstFlowReturn
+opus_dec_chain (GstPad * pad, GstBuffer * buf)
+{
+  GstFlowReturn res;
+  GstOpusDec *dec;
+
+  dec = GST_OPUS_DEC (gst_pad_get_parent (pad));
+
+  if (GST_BUFFER_IS_DISCONT (buf)) {
+    dec->discont = TRUE;
+  }
+
+  res = opus_dec_chain_parse_data (dec, buf, GST_BUFFER_TIMESTAMP (buf),
+      GST_BUFFER_DURATION (buf));
+
+//done:
+  dec->packetno++;
+
+  gst_buffer_unref (buf);
+  gst_object_unref (dec);
+
+  return res;
+}
+
+static GstStateChangeReturn
+opus_dec_change_state (GstElement * element, GstStateChange transition)
+{
+  GstStateChangeReturn ret;
+  GstOpusDec *dec = GST_OPUS_DEC (element);
+
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
+    default:
+      break;
+  }
+
+  ret = parent_class->change_state (element, transition);
+  if (ret != GST_STATE_CHANGE_SUCCESS)
+    return ret;
+
+  switch (transition) {
+    case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
+      break;
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
+      gst_opus_dec_reset (dec);
+      break;
+    case GST_STATE_CHANGE_READY_TO_NULL:
+      break;
+    default:
+      break;
+  }
+
+  return ret;
+}
diff --git a/ext/opus/gstopusdec.h b/ext/opus/gstopusdec.h
new file mode 100644
index 0000000000..886a907532
--- /dev/null
+++ b/ext/opus/gstopusdec.h
@@ -0,0 +1,77 @@
+/* GStreamer
+ * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
+ * Copyright (C) <2008> Sebastian Dröge <sebastian.droege@collabora.co.uk>
+ *
+ * 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_OPUS_DEC_H__
+#define __GST_OPUS_DEC_H__
+
+#include <gst/gst.h>
+#include <opus/opus.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_OPUS_DEC \
+  (gst_opus_dec_get_type())
+#define GST_OPUS_DEC(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_OPUS_DEC,GstOpusDec))
+#define GST_OPUS_DEC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_OPUS_DEC,GstOpusDecClass))
+#define GST_IS_OPUS_DEC(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_OPUS_DEC))
+#define GST_IS_OPUS_DEC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_OPUS_DEC))
+
+typedef struct _GstOpusDec GstOpusDec;
+typedef struct _GstOpusDecClass GstOpusDecClass;
+
+struct _GstOpusDec {
+  GstElement            element;
+
+  /* pads */
+  GstPad                *sinkpad;
+  GstPad                *srcpad;
+
+  OpusDecoder          *state;
+  int frame_samples;
+
+  gint                  frame_size;
+  GstClockTime          frame_duration;
+  guint64               packetno;
+
+  GstSegment            segment;    /* STREAM LOCK */
+  gint64                granulepos; /* -1 = needs to be set from current time */
+  gboolean              discont;
+
+  GstBuffer            *streamheader;
+  GstBuffer            *vorbiscomment;
+  GList                *extra_headers;
+
+  int sample_rate;
+  int n_channels;
+};
+
+struct _GstOpusDecClass {
+  GstElementClass parent_class;
+};
+
+GType gst_opus_dec_get_type (void);
+
+G_END_DECLS
+
+#endif /* __GST_OPUS_DEC_H__ */
diff --git a/ext/opus/gstopusenc.c b/ext/opus/gstopusenc.c
new file mode 100644
index 0000000000..db57ff75d1
--- /dev/null
+++ b/ext/opus/gstopusenc.c
@@ -0,0 +1,1198 @@
+/* GStreamer Opus Encoder
+ * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
+ * Copyright (C) <2008> Sebastian Dröge <sebastian.droege@collabora.co.uk>
+ *
+ * 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 the speexenc element
+ */
+
+/**
+ * SECTION:element-opusenc
+ * @see_also: opusdec, oggmux
+ *
+ * This element encodes raw audio to OPUS.
+ *
+ * <refsect2>
+ * <title>Example pipelines</title>
+ * |[
+ * gst-launch -v audiotestsrc wave=sine num-buffers=100 ! audioconvert ! opusenc ! oggmux ! filesink location=sine.ogg
+ * ]| Encode a test sine signal to Ogg/OPUS.
+ * </refsect2>
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <math.h>
+#include <opus/opus.h>
+
+#include <gst/gsttagsetter.h>
+#include <gst/tag/tag.h>
+#include <gst/audio/audio.h>
+#include "gstopusenc.h"
+
+GST_DEBUG_CATEGORY_STATIC (opusenc_debug);
+#define GST_CAT_DEFAULT opusenc_debug
+
+#define GST_OPUS_ENC_TYPE_BANDWIDTH (gst_opus_enc_bandwidth_get_type())
+static GType
+gst_opus_enc_bandwidth_get_type (void)
+{
+  static const GEnumValue values[] = {
+    {OPUS_BANDWIDTH_NARROWBAND, "Narrow band", "narrowband"},
+    {OPUS_BANDWIDTH_MEDIUMBAND, "Medium band", "mediumband"},
+    {OPUS_BANDWIDTH_WIDEBAND, "Wide band", "wideband"},
+    {OPUS_BANDWIDTH_SUPERWIDEBAND, "Super wide band", "superwideband"},
+    {OPUS_BANDWIDTH_FULLBAND, "Full band", "fullband"},
+    {OPUS_BANDWIDTH_AUTO, "Auto", "auto"},
+    {0, NULL, NULL}
+  };
+  static volatile GType id = 0;
+
+  if (g_once_init_enter ((gsize *) & id)) {
+    GType _id;
+
+    _id = g_enum_register_static ("GstOpusEncBandwidth", values);
+
+    g_once_init_leave ((gsize *) & id, _id);
+  }
+
+  return id;
+}
+
+static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("audio/x-raw-int, "
+        "rate = (int) { 8000, 12000, 16000, 24000, 48000 }, "
+        "channels = (int) [ 1, 2 ], "
+        "endianness = (int) BYTE_ORDER, "
+        "signed = (boolean) TRUE, " "width = (int) 16, " "depth = (int) 16")
+    );
+
+static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("audio/x-opus, "
+        "rate = (int) { 8000, 12000, 16000, 24000, 48000 }, "
+        "channels = (int) [ 1, 2 ], " "frame-size = (int) [ 2, 60 ]")
+    );
+
+#define DEFAULT_AUDIO           TRUE
+#define DEFAULT_BITRATE         64000
+#define DEFAULT_BANDWIDTH       OPUS_BANDWIDTH_FULLBAND
+#define DEFAULT_FRAMESIZE       20
+#define DEFAULT_CBR             TRUE
+#define DEFAULT_CONSTRAINED_VBR TRUE
+#define DEFAULT_COMPLEXITY      10
+#define DEFAULT_INBAND_FEC      FALSE
+#define DEFAULT_DTX             FALSE
+#define DEFAULT_PACKET_LOSS_PERCENT 0
+
+enum
+{
+  PROP_0,
+  PROP_AUDIO,
+  PROP_BITRATE,
+  PROP_BANDWIDTH,
+  PROP_FRAME_SIZE,
+  PROP_CBR,
+  PROP_CONSTRAINED_VBR,
+  PROP_COMPLEXITY,
+  PROP_INBAND_FEC,
+  PROP_DTX,
+  PROP_PACKET_LOSS_PERCENT
+};
+
+static void gst_opus_enc_finalize (GObject * object);
+
+static gboolean gst_opus_enc_sinkevent (GstPad * pad, GstEvent * event);
+static GstFlowReturn gst_opus_enc_chain (GstPad * pad, GstBuffer * buf);
+static gboolean gst_opus_enc_setup (GstOpusEnc * enc);
+
+static void gst_opus_enc_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+static void gst_opus_enc_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
+static GstStateChangeReturn gst_opus_enc_change_state (GstElement * element,
+    GstStateChange transition);
+
+static GstFlowReturn gst_opus_enc_encode (GstOpusEnc * enc, gboolean flush);
+
+static void
+gst_opus_enc_setup_interfaces (GType opusenc_type)
+{
+  static const GInterfaceInfo tag_setter_info = { NULL, NULL, NULL };
+  const GInterfaceInfo preset_interface_info = {
+    NULL,                       /* interface_init */
+    NULL,                       /* interface_finalize */
+    NULL                        /* interface_data */
+  };
+
+  g_type_add_interface_static (opusenc_type, GST_TYPE_TAG_SETTER,
+      &tag_setter_info);
+  g_type_add_interface_static (opusenc_type, GST_TYPE_PRESET,
+      &preset_interface_info);
+
+  GST_DEBUG_CATEGORY_INIT (opusenc_debug, "opusenc", 0, "Opus encoder");
+}
+
+GST_BOILERPLATE_FULL (GstOpusEnc, gst_opus_enc, GstElement, GST_TYPE_ELEMENT,
+    gst_opus_enc_setup_interfaces);
+
+static void
+gst_opus_enc_base_init (gpointer g_class)
+{
+  GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
+
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&src_factory));
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&sink_factory));
+  gst_element_class_set_details_simple (element_class, "Opus audio encoder",
+      "Codec/Encoder/Audio",
+      "Encodes audio in Opus format",
+      "Sebastian Dröge <sebastian.droege@collabora.co.uk>");
+}
+
+static void
+gst_opus_enc_class_init (GstOpusEncClass * klass)
+{
+  GObjectClass *gobject_class;
+  GstElementClass *gstelement_class;
+
+  gobject_class = (GObjectClass *) klass;
+  gstelement_class = (GstElementClass *) klass;
+
+  gobject_class->set_property = gst_opus_enc_set_property;
+  gobject_class->get_property = gst_opus_enc_get_property;
+
+  g_object_class_install_property (gobject_class, PROP_AUDIO,
+      g_param_spec_boolean ("audio", "Audio or voice",
+          "Audio or voice", DEFAULT_AUDIO,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_BITRATE,
+      g_param_spec_int ("bitrate", "Encoding Bit-rate",
+          "Specify an encoding bit-rate (in bps).",
+          1, 320000, DEFAULT_BITRATE,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class, PROP_BANDWIDTH,
+      g_param_spec_enum ("bandwidth", "Band Width",
+          "Audio Band Width", GST_OPUS_ENC_TYPE_BANDWIDTH, DEFAULT_BANDWIDTH,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class, PROP_FRAME_SIZE,
+      g_param_spec_int ("frame-size", "Frame Size",
+          "The duration of an audio frame, in ms", 2, 60, DEFAULT_FRAMESIZE,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class, PROP_CBR,
+      g_param_spec_boolean ("cbr", "Constant bit rate",
+          "Constant bit rate", DEFAULT_CBR,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class, PROP_CONSTRAINED_VBR,
+      g_param_spec_boolean ("constrained-cbr", "Constrained VBR",
+          "Constrained VBR", DEFAULT_CONSTRAINED_VBR,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class, PROP_COMPLEXITY,
+      g_param_spec_int ("complexity", "Complexity",
+          "Complexity", 0, 10, DEFAULT_COMPLEXITY,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class, PROP_INBAND_FEC,
+      g_param_spec_boolean ("inband-fec", "In-band FEC",
+          "Enable forward error correction", DEFAULT_INBAND_FEC,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class, PROP_DTX,
+      g_param_spec_boolean ("dtx", "DTX",
+          "DTX", DEFAULT_DTX, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (G_OBJECT_CLASS (klass),
+      PROP_PACKET_LOSS_PERCENT, g_param_spec_int ("packet-loss-percentage",
+          "Loss percentage", "Packet loss percentage", 0, 100,
+          DEFAULT_PACKET_LOSS_PERCENT,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_opus_enc_finalize);
+
+  gstelement_class->change_state =
+      GST_DEBUG_FUNCPTR (gst_opus_enc_change_state);
+}
+
+static void
+gst_opus_enc_finalize (GObject * object)
+{
+  GstOpusEnc *enc;
+
+  enc = GST_OPUS_ENC (object);
+
+  g_object_unref (enc->adapter);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gboolean
+gst_opus_enc_sink_setcaps (GstPad * pad, GstCaps * caps)
+{
+  GstOpusEnc *enc;
+  GstStructure *structure;
+  GstCaps *otherpadcaps;
+
+  enc = GST_OPUS_ENC (GST_PAD_PARENT (pad));
+  enc->setup = FALSE;
+  enc->frame_size = DEFAULT_FRAMESIZE;
+  otherpadcaps = gst_pad_get_allowed_caps (pad);
+
+  structure = gst_caps_get_structure (caps, 0);
+  gst_structure_get_int (structure, "channels", &enc->n_channels);
+  gst_structure_get_int (structure, "rate", &enc->sample_rate);
+
+  if (otherpadcaps) {
+    if (!gst_caps_is_empty (otherpadcaps)) {
+      GstStructure *ps = gst_caps_get_structure (otherpadcaps, 0);
+      gst_structure_get_int (ps, "frame-size", &enc->frame_size);
+    }
+    gst_caps_unref (otherpadcaps);
+  }
+
+  GST_ERROR_OBJECT (pad, "channels=%d rate=%d frame-size=%d",
+      enc->n_channels, enc->sample_rate, enc->frame_size);
+  switch (enc->frame_size) {
+    case 2:
+      enc->frame_samples = enc->sample_rate / 400;
+      break;
+    case 5:
+      enc->frame_samples = enc->sample_rate / 200;
+      break;
+    case 10:
+      enc->frame_samples = enc->sample_rate / 100;
+      break;
+    case 20:
+      enc->frame_samples = enc->sample_rate / 50;
+      break;
+    case 40:
+      enc->frame_samples = enc->sample_rate / 20;
+      break;
+    case 60:
+      enc->frame_samples = 3 * enc->sample_rate / 50;
+      break;
+    default:
+      return FALSE;
+      break;
+  }
+  GST_ERROR ("frame_samples %d", enc->frame_samples);
+
+  gst_opus_enc_setup (enc);
+
+  return TRUE;
+}
+
+
+static GstCaps *
+gst_opus_enc_sink_getcaps (GstPad * pad)
+{
+  GstCaps *caps = gst_caps_copy (gst_pad_get_pad_template_caps (pad));
+  GstCaps *peercaps = NULL;
+  GstOpusEnc *enc = GST_OPUS_ENC (gst_pad_get_parent_element (pad));
+
+  peercaps = gst_pad_peer_get_caps (enc->srcpad);
+
+  if (peercaps) {
+    if (!gst_caps_is_empty (peercaps) && !gst_caps_is_any (peercaps)) {
+      GstStructure *ps = gst_caps_get_structure (peercaps, 0);
+      GstStructure *s = gst_caps_get_structure (caps, 0);
+      gint rate, channels;
+
+      if (gst_structure_get_int (ps, "rate", &rate)) {
+        gst_structure_fixate_field_nearest_int (s, "rate", rate);
+      }
+
+      if (gst_structure_get_int (ps, "channels", &channels)) {
+        gst_structure_fixate_field_nearest_int (s, "channels", channels);
+      }
+    }
+    gst_caps_unref (peercaps);
+  }
+
+  gst_object_unref (enc);
+
+  return caps;
+}
+
+
+static gboolean
+gst_opus_enc_convert_src (GstPad * pad, GstFormat src_format, gint64 src_value,
+    GstFormat * dest_format, gint64 * dest_value)
+{
+  gboolean res = TRUE;
+  GstOpusEnc *enc;
+  gint64 avg;
+
+  enc = GST_OPUS_ENC (GST_PAD_PARENT (pad));
+
+  if (enc->samples_in == 0 || enc->bytes_out == 0 || enc->sample_rate == 0)
+    return FALSE;
+
+  avg = (enc->bytes_out * enc->sample_rate) / (enc->samples_in);
+
+  switch (src_format) {
+    case GST_FORMAT_BYTES:
+      switch (*dest_format) {
+        case GST_FORMAT_TIME:
+          *dest_value = src_value * GST_SECOND / avg;
+          break;
+        default:
+          res = FALSE;
+      }
+      break;
+    case GST_FORMAT_TIME:
+      switch (*dest_format) {
+        case GST_FORMAT_BYTES:
+          *dest_value = src_value * avg / GST_SECOND;
+          break;
+        default:
+          res = FALSE;
+      }
+      break;
+    default:
+      res = FALSE;
+  }
+  return res;
+}
+
+static gboolean
+gst_opus_enc_convert_sink (GstPad * pad, GstFormat src_format,
+    gint64 src_value, GstFormat * dest_format, gint64 * dest_value)
+{
+  gboolean res = TRUE;
+  guint scale = 1;
+  gint bytes_per_sample;
+  GstOpusEnc *enc;
+
+  enc = GST_OPUS_ENC (GST_PAD_PARENT (pad));
+
+  bytes_per_sample = enc->n_channels * 2;
+
+  switch (src_format) {
+    case GST_FORMAT_BYTES:
+      switch (*dest_format) {
+        case GST_FORMAT_DEFAULT:
+          if (bytes_per_sample == 0)
+            return FALSE;
+          *dest_value = src_value / bytes_per_sample;
+          break;
+        case GST_FORMAT_TIME:
+        {
+          gint byterate = bytes_per_sample * enc->sample_rate;
+
+          if (byterate == 0)
+            return FALSE;
+          *dest_value = src_value * GST_SECOND / byterate;
+          break;
+        }
+        default:
+          res = FALSE;
+      }
+      break;
+    case GST_FORMAT_DEFAULT:
+      switch (*dest_format) {
+        case GST_FORMAT_BYTES:
+          *dest_value = src_value * bytes_per_sample;
+          break;
+        case GST_FORMAT_TIME:
+          if (enc->sample_rate == 0)
+            return FALSE;
+          *dest_value = src_value * GST_SECOND / enc->sample_rate;
+          break;
+        default:
+          res = FALSE;
+      }
+      break;
+    case GST_FORMAT_TIME:
+      switch (*dest_format) {
+        case GST_FORMAT_BYTES:
+          scale = bytes_per_sample;
+          /* fallthrough */
+        case GST_FORMAT_DEFAULT:
+          *dest_value = src_value * scale * enc->sample_rate / GST_SECOND;
+          break;
+        default:
+          res = FALSE;
+      }
+      break;
+    default:
+      res = FALSE;
+  }
+  return res;
+}
+
+static gint64
+gst_opus_enc_get_latency (GstOpusEnc * enc)
+{
+  return gst_util_uint64_scale (enc->frame_samples, GST_SECOND,
+      enc->sample_rate);
+}
+
+static const GstQueryType *
+gst_opus_enc_get_query_types (GstPad * pad)
+{
+  static const GstQueryType gst_opus_enc_src_query_types[] = {
+    GST_QUERY_POSITION,
+    GST_QUERY_DURATION,
+    GST_QUERY_CONVERT,
+    GST_QUERY_LATENCY,
+    0
+  };
+
+  return gst_opus_enc_src_query_types;
+}
+
+static gboolean
+gst_opus_enc_src_query (GstPad * pad, GstQuery * query)
+{
+  gboolean res = TRUE;
+  GstOpusEnc *enc;
+
+  enc = GST_OPUS_ENC (gst_pad_get_parent (pad));
+
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_POSITION:
+    {
+      GstFormat fmt, req_fmt;
+      gint64 pos, val;
+
+      gst_query_parse_position (query, &req_fmt, NULL);
+      if ((res = gst_pad_query_peer_position (enc->sinkpad, &req_fmt, &val))) {
+        gst_query_set_position (query, req_fmt, val);
+        break;
+      }
+
+      fmt = GST_FORMAT_TIME;
+      if (!(res = gst_pad_query_peer_position (enc->sinkpad, &fmt, &pos)))
+        break;
+
+      if ((res =
+              gst_pad_query_peer_convert (enc->sinkpad, fmt, pos, &req_fmt,
+                  &val)))
+        gst_query_set_position (query, req_fmt, val);
+
+      break;
+    }
+    case GST_QUERY_DURATION:
+    {
+      GstFormat fmt, req_fmt;
+      gint64 dur, val;
+
+      gst_query_parse_duration (query, &req_fmt, NULL);
+      if ((res = gst_pad_query_peer_duration (enc->sinkpad, &req_fmt, &val))) {
+        gst_query_set_duration (query, req_fmt, val);
+        break;
+      }
+
+      fmt = GST_FORMAT_TIME;
+      if (!(res = gst_pad_query_peer_duration (enc->sinkpad, &fmt, &dur)))
+        break;
+
+      if ((res =
+              gst_pad_query_peer_convert (enc->sinkpad, fmt, dur, &req_fmt,
+                  &val))) {
+        gst_query_set_duration (query, req_fmt, val);
+      }
+      break;
+    }
+    case GST_QUERY_CONVERT:
+    {
+      GstFormat src_fmt, dest_fmt;
+      gint64 src_val, dest_val;
+
+      gst_query_parse_convert (query, &src_fmt, &src_val, &dest_fmt, &dest_val);
+      if (!(res = gst_opus_enc_convert_src (pad, src_fmt, src_val, &dest_fmt,
+                  &dest_val)))
+        goto error;
+      gst_query_set_convert (query, src_fmt, src_val, dest_fmt, dest_val);
+      break;
+    }
+    case GST_QUERY_LATENCY:
+    {
+      gboolean live;
+      GstClockTime min_latency, max_latency;
+      gint64 latency;
+
+      if ((res = gst_pad_peer_query (pad, query))) {
+        gst_query_parse_latency (query, &live, &min_latency, &max_latency);
+
+        latency = gst_opus_enc_get_latency (enc);
+
+        /* add our latency */
+        min_latency += latency;
+        if (max_latency != -1)
+          max_latency += latency;
+
+        gst_query_set_latency (query, live, min_latency, max_latency);
+      }
+      break;
+    }
+    default:
+      res = gst_pad_peer_query (pad, query);
+      break;
+  }
+
+error:
+
+  gst_object_unref (enc);
+
+  return res;
+}
+
+static gboolean
+gst_opus_enc_sink_query (GstPad * pad, GstQuery * query)
+{
+  gboolean res = TRUE;
+
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_CONVERT:
+    {
+      GstFormat src_fmt, dest_fmt;
+      gint64 src_val, dest_val;
+
+      gst_query_parse_convert (query, &src_fmt, &src_val, &dest_fmt, &dest_val);
+      if (!(res =
+              gst_opus_enc_convert_sink (pad, src_fmt, src_val, &dest_fmt,
+                  &dest_val)))
+        goto error;
+      gst_query_set_convert (query, src_fmt, src_val, dest_fmt, dest_val);
+      break;
+    }
+    default:
+      res = gst_pad_query_default (pad, query);
+      break;
+  }
+
+error:
+  return res;
+}
+
+static void
+gst_opus_enc_init (GstOpusEnc * enc, GstOpusEncClass * klass)
+{
+  enc->sinkpad = gst_pad_new_from_static_template (&sink_factory, "sink");
+  gst_element_add_pad (GST_ELEMENT (enc), enc->sinkpad);
+  gst_pad_set_event_function (enc->sinkpad,
+      GST_DEBUG_FUNCPTR (gst_opus_enc_sinkevent));
+  gst_pad_set_chain_function (enc->sinkpad,
+      GST_DEBUG_FUNCPTR (gst_opus_enc_chain));
+  gst_pad_set_setcaps_function (enc->sinkpad,
+      GST_DEBUG_FUNCPTR (gst_opus_enc_sink_setcaps));
+  gst_pad_set_getcaps_function (enc->sinkpad,
+      GST_DEBUG_FUNCPTR (gst_opus_enc_sink_getcaps));
+  gst_pad_set_query_function (enc->sinkpad,
+      GST_DEBUG_FUNCPTR (gst_opus_enc_sink_query));
+
+  enc->srcpad = gst_pad_new_from_static_template (&src_factory, "src");
+  gst_pad_set_query_function (enc->srcpad,
+      GST_DEBUG_FUNCPTR (gst_opus_enc_src_query));
+  gst_pad_set_query_type_function (enc->srcpad,
+      GST_DEBUG_FUNCPTR (gst_opus_enc_get_query_types));
+  gst_element_add_pad (GST_ELEMENT (enc), enc->srcpad);
+
+  enc->n_channels = -1;
+  enc->sample_rate = -1;
+  enc->frame_samples = 0;
+
+  enc->bitrate = DEFAULT_BITRATE;
+  enc->bandwidth = DEFAULT_BANDWIDTH;
+  enc->frame_size = DEFAULT_FRAMESIZE;
+  enc->cbr = DEFAULT_CBR;
+  enc->constrained_vbr = DEFAULT_CONSTRAINED_VBR;
+  enc->complexity = DEFAULT_COMPLEXITY;
+  enc->inband_fec = DEFAULT_INBAND_FEC;
+  enc->dtx = DEFAULT_DTX;
+  enc->packet_loss_percentage = DEFAULT_PACKET_LOSS_PERCENT;
+
+  enc->setup = FALSE;
+  enc->header_sent = FALSE;
+
+  enc->adapter = gst_adapter_new ();
+}
+
+#if 0
+static GstBuffer *
+gst_opus_enc_create_metadata_buffer (GstOpusEnc * enc)
+{
+  const GstTagList *tags;
+  GstTagList *empty_tags = NULL;
+  GstBuffer *comments = NULL;
+
+  tags = gst_tag_setter_get_tag_list (GST_TAG_SETTER (enc));
+
+  GST_DEBUG_OBJECT (enc, "tags = %" GST_PTR_FORMAT, tags);
+
+  if (tags == NULL) {
+    /* FIXME: better fix chain of callers to not write metadata at all,
+     * if there is none */
+    empty_tags = gst_tag_list_new ();
+    tags = empty_tags;
+  }
+  comments = gst_tag_list_to_vorbiscomment_buffer (tags, NULL,
+      0, "Encoded with GStreamer Opusenc");
+
+  GST_BUFFER_OFFSET (comments) = enc->bytes_out;
+  GST_BUFFER_OFFSET_END (comments) = 0;
+
+  if (empty_tags)
+    gst_tag_list_free (empty_tags);
+
+  return comments;
+}
+#endif
+
+static gboolean
+gst_opus_enc_setup (GstOpusEnc * enc)
+{
+  //gint error = OPUS_OK;
+
+  enc->setup = FALSE;
+
+#if 0
+#ifdef HAVE_OPUS_0_7
+  enc->mode = opus_mode_create (enc->rate, enc->frame_size, &error);
+#else
+  enc->mode =
+      opus_mode_create (enc->rate, enc->n_channels, enc->frame_size, &error);
+#endif
+  if (!enc->mode)
+    goto mode_initialization_failed;
+
+#ifdef HAVE_OPUS_0_11
+  opus_header_init (&enc->header, enc->mode, enc->frame_size, enc->n_channels);
+#else
+#ifdef HAVE_OPUS_0_7
+  opus_header_init (&enc->header, enc->mode, enc->n_channels);
+#else
+  opus_header_init (&enc->header, enc->mode);
+#endif
+#endif
+  enc->header.nb_channels = enc->n_channels;
+
+#ifdef HAVE_OPUS_0_8
+  enc->frame_size = enc->header.frame_size;
+#else
+  opus_mode_info (enc->mode, OPUS_GET_FRAME_SIZE, &enc->frame_size);
+#endif
+#endif
+
+#if 0
+#ifdef HAVE_OPUS_0_11
+  enc->state = opus_encoder_create_custom (enc->mode, enc->n_channels, &error);
+#else
+#ifdef HAVE_OPUS_0_7
+  enc->state = opus_encoder_create (enc->mode, enc->n_channels, &error);
+#else
+  enc->state = opus_encoder_create (enc->mode);
+#endif
+#endif
+#endif
+  enc->state = opus_encoder_create (enc->sample_rate, enc->n_channels,
+      enc->audio_or_voip ? OPUS_APPLICATION_AUDIO : OPUS_APPLICATION_VOIP);
+  if (!enc->state)
+    goto encoder_creation_failed;
+
+  opus_encoder_ctl (enc->state, OPUS_SET_BITRATE (enc->bitrate), 0);
+  opus_encoder_ctl (enc->state, OPUS_SET_BANDWIDTH (enc->bandwidth), 0);
+  opus_encoder_ctl (enc->state, OPUS_SET_VBR_FLAG (!enc->cbr), 0);
+  opus_encoder_ctl (enc->state, OPUS_SET_VBR_CONSTRAINT (enc->constrained_vbr),
+      0);
+  opus_encoder_ctl (enc->state, OPUS_SET_COMPLEXITY (enc->complexity), 0);
+  opus_encoder_ctl (enc->state, OPUS_SET_INBAND_FEC_FLAG (enc->inband_fec), 0);
+  opus_encoder_ctl (enc->state, OPUS_SET_DTX_FLAG (enc->dtx), 0);
+  opus_encoder_ctl (enc->state,
+      OPUS_SET_PACKET_LOSS_PERC (enc->packet_loss_percentage), 0);
+
+  GST_LOG_OBJECT (enc, "we have frame size %d", enc->frame_size);
+
+  enc->setup = TRUE;
+
+  return TRUE;
+
+#if 0
+mode_initialization_failed:
+  GST_ERROR_OBJECT (enc, "Mode initialization failed: %d", error);
+  return FALSE;
+#endif
+
+encoder_creation_failed:
+  GST_ERROR_OBJECT (enc, "Encoder creation failed");
+  return FALSE;
+}
+
+
+/* push out the buffer and do internal bookkeeping */
+static GstFlowReturn
+gst_opus_enc_push_buffer (GstOpusEnc * enc, GstBuffer * buffer)
+{
+  guint size;
+
+  size = GST_BUFFER_SIZE (buffer);
+
+  enc->bytes_out += size;
+
+  GST_DEBUG_OBJECT (enc, "pushing output buffer of size %u", size);
+
+  return gst_pad_push (enc->srcpad, buffer);
+}
+
+#if 0
+static GstCaps *
+gst_opus_enc_set_header_on_caps (GstCaps * caps, GstBuffer * buf1,
+    GstBuffer * buf2)
+{
+  GstStructure *structure = NULL;
+  GstBuffer *buf;
+  GValue array = { 0 };
+  GValue value = { 0 };
+
+  caps = gst_caps_make_writable (caps);
+  structure = gst_caps_get_structure (caps, 0);
+
+  g_assert (gst_buffer_is_metadata_writable (buf1));
+  g_assert (gst_buffer_is_metadata_writable (buf2));
+
+  /* mark buffers */
+  GST_BUFFER_FLAG_SET (buf1, GST_BUFFER_FLAG_IN_CAPS);
+  GST_BUFFER_FLAG_SET (buf2, GST_BUFFER_FLAG_IN_CAPS);
+
+  /* put buffers in a fixed list */
+  g_value_init (&array, GST_TYPE_ARRAY);
+  g_value_init (&value, GST_TYPE_BUFFER);
+  buf = gst_buffer_copy (buf1);
+  gst_value_set_buffer (&value, buf);
+  gst_buffer_unref (buf);
+  gst_value_array_append_value (&array, &value);
+  g_value_unset (&value);
+  g_value_init (&value, GST_TYPE_BUFFER);
+  buf = gst_buffer_copy (buf2);
+  gst_value_set_buffer (&value, buf);
+  gst_buffer_unref (buf);
+  gst_value_array_append_value (&array, &value);
+  gst_structure_set_value (structure, "streamheader", &array);
+  g_value_unset (&value);
+  g_value_unset (&array);
+
+  return caps;
+}
+#endif
+
+
+static gboolean
+gst_opus_enc_sinkevent (GstPad * pad, GstEvent * event)
+{
+  gboolean res = TRUE;
+  GstOpusEnc *enc;
+
+  enc = GST_OPUS_ENC (gst_pad_get_parent (pad));
+
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_EOS:
+      gst_opus_enc_encode (enc, TRUE);
+      res = gst_pad_event_default (pad, event);
+      break;
+    case GST_EVENT_TAG:
+    {
+      GstTagList *list;
+      GstTagSetter *setter = GST_TAG_SETTER (enc);
+      const GstTagMergeMode mode = gst_tag_setter_get_tag_merge_mode (setter);
+
+      gst_event_parse_tag (event, &list);
+      gst_tag_setter_merge_tags (setter, list, mode);
+      res = gst_pad_event_default (pad, event);
+      break;
+    }
+    default:
+      res = gst_pad_event_default (pad, event);
+      break;
+  }
+
+  gst_object_unref (enc);
+
+  return res;
+}
+
+static GstFlowReturn
+gst_opus_enc_encode (GstOpusEnc * enc, gboolean flush)
+{
+
+  GstFlowReturn ret = GST_FLOW_OK;
+  gint bytes = enc->frame_samples * 2 * enc->n_channels;
+  gint bytes_per_packet;
+
+  bytes_per_packet =
+      (enc->bitrate * enc->frame_samples / enc->sample_rate + 4) / 8;
+
+  if (flush && gst_adapter_available (enc->adapter) % bytes != 0) {
+    guint diff = gst_adapter_available (enc->adapter) % bytes;
+    GstBuffer *buf = gst_buffer_new_and_alloc (diff);
+
+    memset (GST_BUFFER_DATA (buf), 0, diff);
+    gst_adapter_push (enc->adapter, buf);
+  }
+
+
+  while (gst_adapter_available (enc->adapter) >= bytes) {
+    gint16 *data;
+    gint outsize;
+    GstBuffer *outbuf;
+
+    ret = gst_pad_alloc_buffer_and_set_caps (enc->srcpad,
+        GST_BUFFER_OFFSET_NONE, bytes_per_packet, GST_PAD_CAPS (enc->srcpad),
+        &outbuf);
+
+    if (GST_FLOW_OK != ret)
+      goto done;
+
+    data = (gint16 *) gst_adapter_take (enc->adapter, bytes);
+    enc->samples_in += enc->frame_samples;
+
+    GST_DEBUG_OBJECT (enc, "encoding %d samples (%d bytes)",
+        enc->frame_samples, bytes);
+
+    outsize = opus_encode (enc->state, data, enc->frame_samples,
+        GST_BUFFER_DATA (outbuf), bytes_per_packet);
+
+    g_free (data);
+
+    if (outsize < 0) {
+      GST_ERROR_OBJECT (enc, "Encoding failed: %d", outsize);
+      ret = GST_FLOW_ERROR;
+      goto done;
+    }
+
+    GST_BUFFER_TIMESTAMP (outbuf) = enc->start_ts +
+        gst_util_uint64_scale_int (enc->frameno_out * enc->frame_samples,
+        GST_SECOND, enc->sample_rate);
+    GST_BUFFER_DURATION (outbuf) =
+        gst_util_uint64_scale_int (enc->frame_samples, GST_SECOND,
+        enc->sample_rate);
+    GST_BUFFER_OFFSET (outbuf) =
+        gst_util_uint64_scale_int (GST_BUFFER_OFFSET_END (outbuf), GST_SECOND,
+        enc->sample_rate);
+
+    enc->frameno++;
+    enc->frameno_out++;
+
+    ret = gst_opus_enc_push_buffer (enc, outbuf);
+
+    if ((GST_FLOW_OK != ret) && (GST_FLOW_NOT_LINKED != ret))
+      goto done;
+  }
+
+done:
+
+  return ret;
+}
+
+static GstFlowReturn
+gst_opus_enc_chain (GstPad * pad, GstBuffer * buf)
+{
+  GstOpusEnc *enc;
+  GstFlowReturn ret = GST_FLOW_OK;
+
+  enc = GST_OPUS_ENC (GST_PAD_PARENT (pad));
+
+  if (!enc->setup)
+    goto not_setup;
+
+#if 0
+  if (!enc->header_sent) {
+    /* Opus streams begin with two headers; the initial header (with
+       most of the codec setup parameters) which is mandated by the Ogg
+       bitstream spec.  The second header holds any comment fields.
+       We merely need to make the headers, then pass them to libopus 
+       one at a time; libopus handles the additional Ogg bitstream 
+       constraints */
+    GstBuffer *buf1, *buf2;
+    GstCaps *caps;
+    guchar data[100];
+
+    /* create header buffer */
+    opus_header_to_packet (&enc->header, data, 100);
+    buf1 = gst_opus_enc_buffer_from_data (enc, data, 100, 0);
+
+    /* create comment buffer */
+    buf2 = gst_opus_enc_create_metadata_buffer (enc);
+
+    /* mark and put on caps */
+    caps = gst_pad_get_caps (enc->srcpad);
+    caps = gst_opus_enc_set_header_on_caps (caps, buf1, buf2);
+
+    gst_caps_set_simple (caps,
+        "rate", G_TYPE_INT, enc->sample_rate,
+        "channels", G_TYPE_INT, enc->n_channels,
+        "frame-size", G_TYPE_INT, enc->frame_size, NULL);
+
+    /* negotiate with these caps */
+    GST_DEBUG_OBJECT (enc, "here are the caps: %" GST_PTR_FORMAT, caps);
+    GST_LOG_OBJECT (enc, "rate=%d channels=%d frame-size=%d",
+        enc->sample_rate, enc->n_channels, enc->frame_size);
+    gst_pad_set_caps (enc->srcpad, caps);
+
+    gst_buffer_set_caps (buf1, caps);
+    gst_buffer_set_caps (buf2, caps);
+    gst_caps_unref (caps);
+
+    /* push out buffers */
+    ret = gst_opus_enc_push_buffer (enc, buf1);
+
+    if (ret != GST_FLOW_OK) {
+      gst_buffer_unref (buf2);
+      goto done;
+    }
+
+    ret = gst_opus_enc_push_buffer (enc, buf2);
+
+    if (ret != GST_FLOW_OK)
+      goto done;
+
+    enc->header_sent = TRUE;
+  }
+#endif
+
+  GST_DEBUG_OBJECT (enc, "received buffer of %u bytes", GST_BUFFER_SIZE (buf));
+
+  /* Save the timestamp of the first buffer. This will be later
+   * used as offset for all following buffers */
+  if (enc->start_ts == GST_CLOCK_TIME_NONE) {
+    if (GST_BUFFER_TIMESTAMP_IS_VALID (buf)) {
+      enc->start_ts = GST_BUFFER_TIMESTAMP (buf);
+    } else {
+      enc->start_ts = 0;
+    }
+  }
+
+
+  /* Check if we have a continous stream, if not drop some samples or the buffer or
+   * insert some silence samples */
+  if (enc->next_ts != GST_CLOCK_TIME_NONE &&
+      GST_BUFFER_TIMESTAMP (buf) < enc->next_ts) {
+    guint64 diff = enc->next_ts - GST_BUFFER_TIMESTAMP (buf);
+    guint64 diff_bytes;
+
+    GST_WARNING_OBJECT (enc, "Buffer is older than previous "
+        "timestamp + duration (%" GST_TIME_FORMAT "< %" GST_TIME_FORMAT
+        "), cannot handle. Clipping buffer.",
+        GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)),
+        GST_TIME_ARGS (enc->next_ts));
+
+    diff_bytes =
+        GST_CLOCK_TIME_TO_FRAMES (diff, enc->sample_rate) * enc->n_channels * 2;
+    if (diff_bytes >= GST_BUFFER_SIZE (buf)) {
+      gst_buffer_unref (buf);
+      return GST_FLOW_OK;
+    }
+    buf = gst_buffer_make_metadata_writable (buf);
+    GST_BUFFER_DATA (buf) += diff_bytes;
+    GST_BUFFER_SIZE (buf) -= diff_bytes;
+
+    GST_BUFFER_TIMESTAMP (buf) += diff;
+    if (GST_BUFFER_DURATION_IS_VALID (buf))
+      GST_BUFFER_DURATION (buf) -= diff;
+  }
+
+  if (enc->next_ts != GST_CLOCK_TIME_NONE
+      && GST_BUFFER_TIMESTAMP_IS_VALID (buf)) {
+    guint64 max_diff =
+        gst_util_uint64_scale (enc->frame_size, GST_SECOND, enc->sample_rate);
+
+    if (GST_BUFFER_TIMESTAMP (buf) != enc->next_ts &&
+        GST_BUFFER_TIMESTAMP (buf) - enc->next_ts > max_diff) {
+      GST_WARNING_OBJECT (enc,
+          "Discontinuity detected: %" G_GUINT64_FORMAT " > %" G_GUINT64_FORMAT,
+          GST_BUFFER_TIMESTAMP (buf) - enc->next_ts, max_diff);
+
+      gst_opus_enc_encode (enc, TRUE);
+
+      enc->frameno_out = 0;
+      enc->start_ts = GST_BUFFER_TIMESTAMP (buf);
+    }
+  }
+
+  if (GST_BUFFER_TIMESTAMP_IS_VALID (buf)
+      && GST_BUFFER_DURATION_IS_VALID (buf))
+    enc->next_ts = GST_BUFFER_TIMESTAMP (buf) + GST_BUFFER_DURATION (buf);
+  else
+    enc->next_ts = GST_CLOCK_TIME_NONE;
+
+  /* push buffer to adapter */
+  gst_adapter_push (enc->adapter, buf);
+  buf = NULL;
+
+  ret = gst_opus_enc_encode (enc, FALSE);
+
+done:
+
+  if (buf)
+    gst_buffer_unref (buf);
+
+  return ret;
+
+  /* ERRORS */
+not_setup:
+  {
+    GST_ELEMENT_ERROR (enc, CORE, NEGOTIATION, (NULL),
+        ("encoder not initialized (input is not audio?)"));
+    ret = GST_FLOW_NOT_NEGOTIATED;
+    goto done;
+  }
+
+}
+
+
+static void
+gst_opus_enc_get_property (GObject * object, guint prop_id, GValue * value,
+    GParamSpec * pspec)
+{
+  GstOpusEnc *enc;
+
+  enc = GST_OPUS_ENC (object);
+
+  switch (prop_id) {
+    case PROP_AUDIO:
+      g_value_set_boolean (value, enc->audio_or_voip);
+      break;
+    case PROP_BITRATE:
+      g_value_set_int (value, enc->bitrate);
+      break;
+    case PROP_BANDWIDTH:
+      g_value_set_int (value, enc->bandwidth);
+      break;
+    case PROP_FRAME_SIZE:
+      g_value_set_int (value, enc->frame_size);
+      break;
+    case PROP_CBR:
+      g_value_set_boolean (value, enc->cbr);
+      break;
+    case PROP_CONSTRAINED_VBR:
+      g_value_set_boolean (value, enc->constrained_vbr);
+      break;
+    case PROP_COMPLEXITY:
+      g_value_set_int (value, enc->complexity);
+      break;
+    case PROP_INBAND_FEC:
+      g_value_set_boolean (value, enc->inband_fec);
+      break;
+    case PROP_DTX:
+      g_value_set_boolean (value, enc->dtx);
+      break;
+    case PROP_PACKET_LOSS_PERCENT:
+      g_value_set_int (value, enc->packet_loss_percentage);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_opus_enc_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstOpusEnc *enc;
+
+  enc = GST_OPUS_ENC (object);
+
+  switch (prop_id) {
+    case PROP_AUDIO:
+      enc->audio_or_voip = g_value_get_boolean (value);
+      break;
+    case PROP_BITRATE:
+      enc->bitrate = g_value_get_int (value);
+      break;
+    case PROP_BANDWIDTH:
+      enc->bandwidth = g_value_get_int (value);
+      break;
+    case PROP_FRAME_SIZE:
+      enc->frame_size = g_value_get_int (value);
+      break;
+    case PROP_CBR:
+      enc->cbr = g_value_get_boolean (value);
+      break;
+    case PROP_CONSTRAINED_VBR:
+      enc->constrained_vbr = g_value_get_boolean (value);
+      break;
+    case PROP_COMPLEXITY:
+      enc->complexity = g_value_get_int (value);
+      break;
+    case PROP_INBAND_FEC:
+      enc->inband_fec = g_value_get_boolean (value);
+      break;
+    case PROP_DTX:
+      enc->dtx = g_value_get_boolean (value);
+      break;
+    case PROP_PACKET_LOSS_PERCENT:
+      enc->packet_loss_percentage = g_value_get_int (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static GstStateChangeReturn
+gst_opus_enc_change_state (GstElement * element, GstStateChange transition)
+{
+  GstOpusEnc *enc = GST_OPUS_ENC (element);
+  GstStateChangeReturn res;
+
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
+      break;
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
+      enc->frameno = 0;
+      enc->samples_in = 0;
+      enc->frameno_out = 0;
+      enc->start_ts = GST_CLOCK_TIME_NONE;
+      enc->next_ts = GST_CLOCK_TIME_NONE;
+      break;
+    case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
+      /* fall through */
+    default:
+      break;
+  }
+
+  res = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
+  if (res == GST_STATE_CHANGE_FAILURE)
+    return res;
+
+  switch (transition) {
+    case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
+      break;
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
+      enc->setup = FALSE;
+      enc->header_sent = FALSE;
+      if (enc->state) {
+        opus_encoder_destroy (enc->state);
+        enc->state = NULL;
+      }
+      break;
+    case GST_STATE_CHANGE_READY_TO_NULL:
+      gst_tag_setter_reset_tags (GST_TAG_SETTER (enc));
+    default:
+      break;
+  }
+
+  return res;
+}
diff --git a/ext/opus/gstopusenc.h b/ext/opus/gstopusenc.h
new file mode 100644
index 0000000000..5cb54598af
--- /dev/null
+++ b/ext/opus/gstopusenc.h
@@ -0,0 +1,105 @@
+/* GStreamer Opus Encoder
+ * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
+ * Copyright (C) <2008> Sebastian Dröge <sebastian.droege@collabora.co.uk>
+ *
+ * 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_OPUS_ENC_H__
+#define __GST_OPUS_ENC_H__
+
+
+#include <gst/gst.h>
+#include <gst/base/gstadapter.h>
+
+#include <opus/opus.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_OPUS_ENC \
+  (gst_opus_enc_get_type())
+#define GST_OPUS_ENC(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_OPUS_ENC,GstOpusEnc))
+#define GST_OPUS_ENC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_OPUS_ENC,GstOpusEncClass))
+#define GST_IS_OPUS_ENC(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_OPUS_ENC))
+#define GST_IS_OPUS_ENC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_OPUS_ENC))
+
+#define MAX_FRAME_SIZE 2000*2
+#define MAX_FRAME_BYTES 2000
+
+typedef struct _GstOpusEnc GstOpusEnc;
+typedef struct _GstOpusEncClass GstOpusEncClass;
+
+struct _GstOpusEnc {
+  GstElement            element;
+
+  /* pads */
+  GstPad                *sinkpad;
+  GstPad                *srcpad;
+
+  //OpusHeader            header;
+  //OpusMode             *mode;
+  OpusEncoder          *state;
+  GstAdapter           *adapter;
+
+  /* properties */
+  gboolean              audio_or_voip;
+  gint                  bitrate;
+  gint                  bandwidth;
+  gint                  frame_size;
+  gboolean              cbr;
+  gboolean              constrained_vbr;
+  gint                  complexity;
+  gboolean              inband_fec;
+  gboolean              dtx;
+  gint                  packet_loss_percentage;
+
+  int frame_samples;
+
+  gint                  n_channels;
+  gint                  sample_rate;
+
+  gboolean              setup;
+  gboolean              header_sent;
+  gboolean              eos;
+
+  guint64               samples_in;
+  guint64               bytes_out;
+
+  guint64               frameno;
+  guint64               frameno_out;
+
+  GstClockTime     start_ts;
+  GstClockTime     next_ts;
+  guint64          granulepos_offset;
+};
+
+struct _GstOpusEncClass {
+  GstElementClass parent_class;
+
+  /* signals */
+  void (*frame_encoded) (GstElement *element);
+};
+
+GType gst_opus_enc_get_type (void);
+
+G_END_DECLS
+
+#endif /* __GST_OPUS_ENC_H__ */

From 266a57d77bae82b98d3f9cf50794be4be4381f1f Mon Sep 17 00:00:00 2001
From: Stefan Kost <ensonic@users.sf.net>
Date: Thu, 7 Jul 2011 10:52:50 -0700
Subject: [PATCH 043/158] scaletempo: improve the docs

Fix the syntax, add more explanation and xref the properties.
---
 gst/scaletempo/gstscaletempo.c | 38 ++++++++++++++++------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/gst/scaletempo/gstscaletempo.c b/gst/scaletempo/gstscaletempo.c
index ba82a85823..a057321f41 100644
--- a/gst/scaletempo/gstscaletempo.c
+++ b/gst/scaletempo/gstscaletempo.c
@@ -21,41 +21,39 @@
 /**
  * SECTION:element-scaletempo
  *
- * <refsect2>
- * <para>
  * Scale tempo while maintaining pitch
  * (WSOLA-like technique with cross correlation)
  * Inspired by SoundTouch library by Olli Parviainen
- * </para>
- * <para>
+ *
  * Use Sceletempo to apply playback rates without the chipmunk effect.
- * </para>
+ *
+ * <refsect2>
  * <title>Example pipelines</title>
  * <para>
- * <programlisting>
+ * |[
  * filesrc location=media.ext ! decodebin name=d \
  *     d. ! queue ! audioconvert ! audioresample ! scaletempo ! audioconvert ! audioresample ! autoaudiosink \
  *     d. ! queue ! ffmpegcolorspace ! autovideosink
- * </programlisting>
+ * ]|
  * OR
- * <programlisting>
+ * |[
  * playbin uri=... audio_sink="scaletempo ! audioconvert ! audioresample ! autoaudiosink"
- * </programlisting>
+ * ]|
  * When an application sends a seek event with rate != 1.0, Scaletempo applies
  * the rate change by scaling the tempo without scaling the pitch.
- * </para>
- * <para>
- * Scaletempo works by producing audio in constant sized chunks (a "stride") but
- * consuming chunks proportional to the playback rate.
- * </para>
- * <para>
+ *
+ * Scaletempo works by producing audio in constant sized chunks
+ * (#GstScaletempo:stride) but consuming chunks proportional to the playback
+ * rate.
+ *
  * Scaletempo then smooths the output by blending the end of one stride with
- * the next ("overlap").
- * </para>
- * <para>
+ * the next (#GstScaletempo:overlap).
+ *
  * Scaletempo smooths the overlap further by searching within the input buffer
- * for the best overlap position.  Scaletempo uses a statistical cross correlation
- * (roughly a dot-product).  Scaletempo consumes most of its CPU cycles here.
+ * for the best overlap position.  Scaletempo uses a statistical cross
+ * correlation (roughly a dot-product).  Scaletempo consumes most of its CPU
+ * cycles here. One can use the #GstScaletempo:search propery to tune how far
+ * the algoritm looks.
  * </para>
  * </refsect2>
  */

From 38a916afa5955336fad5f3d9015bdde628a07370 Mon Sep 17 00:00:00 2001
From: Stefan Kost <ensonic@users.sf.net>
Date: Thu, 7 Jul 2011 11:11:42 -0700
Subject: [PATCH 044/158] docs: keep section file sorted

---
 .../gst-plugins-bad-plugins-sections.txt      | 56 +++++++++----------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt
index 4a04d6a0cd..bc52908fb8 100644
--- a/docs/plugins/gst-plugins-bad-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-bad-plugins-sections.txt
@@ -27,34 +27,6 @@ GstAiffParseState
 gst_aiff_parse_get_type
 </SECTION>
 
-<SECTION>
-<FILE>element-voaacenc</FILE>
-<TITLE>voaacenc</TITLE>
-GstVoAacEnc
-<SUBSECTION Standard>
-GstVoAacEncClass
-GST_VOAACENC
-GST_VOAACENC_CLASS
-GST_IS_VOAACENC
-GST_IS_VOAACENC_CLASS
-GST_TYPE_VOAACENC
-gst_voaacenc_get_type
-</SECTION>
-
-<SECTION>
-<FILE>element-voamrwbenc</FILE>
-<TITLE>voamrwbenc</TITLE>
-GstVoAmrwbEnc
-<SUBSECTION Standard>
-GstVoAmrwbEncClass
-GST_VOAMRWBENC
-GST_VOAMRWBENC_CLASS
-GST_IS_VOAMRWBENC
-GST_IS_VOAMRWBENC_CLASS
-GST_TYPE_VOAMRWBENC
-gst_voamrwbenc_get_type
-</SECTION>
-
 <SECTION>
 <FILE>element-assrender</FILE>
 <TITLE>assrender</TITLE>
@@ -1667,6 +1639,34 @@ GST_IS_WILDMIDI_CLASS
 GST_TYPE_WILDMIDI
 </SECTION>
 
+<SECTION>
+<FILE>element-voaacenc</FILE>
+<TITLE>voaacenc</TITLE>
+GstVoAacEnc
+<SUBSECTION Standard>
+GstVoAacEncClass
+GST_VOAACENC
+GST_VOAACENC_CLASS
+GST_IS_VOAACENC
+GST_IS_VOAACENC_CLASS
+GST_TYPE_VOAACENC
+gst_voaacenc_get_type
+</SECTION>
+
+<SECTION>
+<FILE>element-voamrwbenc</FILE>
+<TITLE>voamrwbenc</TITLE>
+GstVoAmrwbEnc
+<SUBSECTION Standard>
+GstVoAmrwbEncClass
+GST_VOAMRWBENC
+GST_VOAMRWBENC_CLASS
+GST_IS_VOAMRWBENC
+GST_IS_VOAMRWBENC_CLASS
+GST_TYPE_VOAMRWBENC
+gst_voamrwbenc_get_type
+</SECTION>
+
 <SECTION>
 <FILE>element-vp8dec</FILE>
 <TITLE>vp8dec</TITLE>

From 1b103d259d4d8b7a5850c3b290f0ecc504648936 Mon Sep 17 00:00:00 2001
From: Stefan Kost <ensonic@users.sf.net>
Date: Thu, 7 Jul 2011 15:55:59 -0700
Subject: [PATCH 045/158] camerabin2: don't mess with camerabin (1) namespace

Use an extra '2' to stay out of the old namespace.
---
 gst/camerabin2/camerabingeneral.c |   6 +-
 gst/camerabin2/gstcamerabin2.c    | 115 ++++++++++++++++--------------
 gst/camerabin2/gstcamerabin2.h    |  32 ++++-----
 gst/camerabin2/gstplugin.c        |   2 +-
 4 files changed, 83 insertions(+), 72 deletions(-)

diff --git a/gst/camerabin2/camerabingeneral.c b/gst/camerabin2/camerabingeneral.c
index 8758935a45..35148f0278 100644
--- a/gst/camerabin2/camerabingeneral.c
+++ b/gst/camerabin2/camerabingeneral.c
@@ -20,10 +20,10 @@
 
 /**
  * SECTION:camerabingeneral
- * @short_description: helper functions for #GstCameraBin and it's modules
+ * @short_description: helper functions for #GstCameraBin2 and it's modules
  *
- * Common helper functions for #GstCameraBin, #GstCameraBinImage and
- * #GstCameraBinVideo.
+ * Common helper functions for #GstCameraBin2, #GstCameraBin2Image and
+ * #GstCameraBin2Video.
  *
  */
 #ifdef HAVE_CONFIG_H
diff --git a/gst/camerabin2/gstcamerabin2.c b/gst/camerabin2/gstcamerabin2.c
index b7fb766b06..b164ef962f 100644
--- a/gst/camerabin2/gstcamerabin2.c
+++ b/gst/camerabin2/gstcamerabin2.c
@@ -17,12 +17,23 @@
  * Boston, MA 02111-1307, USA.
  */
 /**
- * SECTION:element-gstcamerabin2
+ * SECTION:element-camerabin2
  *
- * The gstcamerabin2 element does FIXME stuff.
+ * GstCameraBin22 is a high-level camera object that encapsulates the gstreamer
+ * internals and provides a task based API for the application.
  *
+ * <note>
  * Note that camerabin2 is still UNSTABLE, EXPERIMENTAL and under heavy
  * development.
+ * </note>
+ *
+ * <refsect2>
+ * <title>Example launch line</title>
+ * |[
+ * gst-launch -v -m camerabin2
+ * ]|
+ * </refsect2>
+
  */
 
 /*
@@ -59,23 +70,23 @@
 #include <gst/gst-i18n-plugin.h>
 #include <gst/pbutils/pbutils.h>
 
-#define GST_CAMERA_BIN_PROCESSING_INC(c)                                \
+#define GST_CAMERA_BIN2_PROCESSING_INC(c)                                \
 {                                                                       \
   gint bef = g_atomic_int_exchange_and_add (&c->processing_counter, 1); \
   if (bef == 0)                                                         \
     g_object_notify (G_OBJECT (c), "idle");                             \
-  GST_DEBUG_OBJECT ((c), "Processing counter incremented to: %d",       \
+  GST_DEBUG_OBJECT ((c), "Processing counter increModemented to: %d",       \
       bef + 1);                                                         \
 }
 
-#define GST_CAMERA_BIN_PROCESSING_DEC(c)                                \
+#define GST_CAMERA_BIN2_PROCESSING_DEC(c)                                \
 {                                                                       \
   if (g_atomic_int_dec_and_test (&c->processing_counter))               \
     g_object_notify (G_OBJECT (c), "idle");                             \
   GST_DEBUG_OBJECT ((c), "Processing counter decremented");             \
 }
 
-#define GST_CAMERA_BIN_RESET_PROCESSING_COUNTER(c)                      \
+#define GST_CAMERA_BIN2_RESET_PROCESSING_COUNTER(c)                      \
 {                                                                       \
   g_atomic_int_set (&c->processing_counter, 0);                         \
   GST_DEBUG_OBJECT ((c), "Processing counter reset");                   \
@@ -140,9 +151,9 @@ static guint camerabin_signals[LAST_SIGNAL];
  ********************************/
 
 static GstPipelineClass *parent_class;
-static void gst_camera_bin_class_init (GstCameraBinClass * klass);
+static void gst_camera_bin_class_init (GstCameraBin2Class * klass);
 static void gst_camera_bin_base_init (gpointer klass);
-static void gst_camera_bin_init (GstCameraBin * camera);
+static void gst_camera_bin_init (GstCameraBin2 * camera);
 static void gst_camera_bin_dispose (GObject * object);
 static void gst_camera_bin_finalize (GObject * object);
 
@@ -151,7 +162,7 @@ static gboolean gst_camera_bin_send_event (GstElement * element,
     GstEvent * event);
 
 GType
-gst_camera_bin_get_type (void)
+gst_camera_bin2_get_type (void)
 {
   static GType gst_camera_bin_type = 0;
   static const GInterfaceInfo camerabin_tagsetter_info = {
@@ -162,13 +173,13 @@ gst_camera_bin_get_type (void)
 
   if (!gst_camera_bin_type) {
     static const GTypeInfo gst_camera_bin_info = {
-      sizeof (GstCameraBinClass),
+      sizeof (GstCameraBin2Class),
       (GBaseInitFunc) gst_camera_bin_base_init,
       NULL,
       (GClassInitFunc) gst_camera_bin_class_init,
       NULL,
       NULL,
-      sizeof (GstCameraBin),
+      sizeof (GstCameraBin2),
       0,
       (GInstanceInitFunc) gst_camera_bin_init,
       NULL
@@ -214,7 +225,7 @@ gst_camera_bin_new_event_file_location (const gchar * location)
 }
 
 static void
-gst_camera_bin_start_capture (GstCameraBin * camerabin)
+gst_camera_bin_start_capture (GstCameraBin2 * camerabin)
 {
   const GstTagList *taglist;
 
@@ -228,7 +239,7 @@ gst_camera_bin_start_capture (GstCameraBin * camerabin)
     return;
   }
 
-  GST_CAMERA_BIN_PROCESSING_INC (camerabin);
+  GST_CAMERA_BIN2_PROCESSING_INC (camerabin);
 
   if (camerabin->mode == MODE_VIDEO) {
     if (camerabin->audio_src) {
@@ -286,7 +297,7 @@ gst_camera_bin_start_capture (GstCameraBin * camerabin)
 }
 
 static void
-gst_camera_bin_stop_capture (GstCameraBin * camerabin)
+gst_camera_bin_stop_capture (GstCameraBin2 * camerabin)
 {
   GST_DEBUG_OBJECT (camerabin, "Received stop-capture");
   if (camerabin->src)
@@ -298,7 +309,7 @@ gst_camera_bin_stop_capture (GstCameraBin * camerabin)
 }
 
 static void
-gst_camera_bin_change_mode (GstCameraBin * camerabin, gint mode)
+gst_camera_bin_change_mode (GstCameraBin2 * camerabin, gint mode)
 {
   if (mode == camerabin->mode)
     return;
@@ -316,7 +327,7 @@ static void
 gst_camera_bin_src_notify_readyforcapture (GObject * obj, GParamSpec * pspec,
     gpointer user_data)
 {
-  GstCameraBin *camera = GST_CAMERA_BIN_CAST (user_data);
+  GstCameraBin2 *camera = GST_CAMERA_BIN2_CAST (user_data);
   gboolean ready;
 
   g_object_get (camera->src, "ready-for-capture", &ready, NULL);
@@ -346,7 +357,7 @@ gst_camera_bin_src_notify_readyforcapture (GObject * obj, GParamSpec * pspec,
 static void
 gst_camera_bin_dispose (GObject * object)
 {
-  GstCameraBin *camerabin = GST_CAMERA_BIN_CAST (object);
+  GstCameraBin2 *camerabin = GST_CAMERA_BIN2_CAST (object);
 
   g_free (camerabin->location);
 
@@ -450,7 +461,7 @@ gst_camera_bin_base_init (gpointer g_class)
 }
 
 static void
-gst_camera_bin_class_init (GstCameraBinClass * klass)
+gst_camera_bin_class_init (GstCameraBin2Class * klass)
 {
   GObjectClass *object_class;
   GstElementClass *element_class;
@@ -475,7 +486,7 @@ gst_camera_bin_class_init (GstCameraBinClass * klass)
   klass->stop_capture = gst_camera_bin_stop_capture;
 
   /**
-   * GstCameraBin:mode:
+   * GstCameraBin2:mode:
    *
    * Set the mode of operation: still image capturing or video recording.
    */
@@ -658,7 +669,7 @@ gst_camera_bin_class_init (GstCameraBinClass * klass)
           GST_TYPE_CAPS, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
   /**
-   * GstCameraBin::capture-start:
+   * GstCameraBin2::capture-start:
    * @camera: the camera bin element
    *
    * Starts image capture or video recording depending on the Mode.
@@ -667,23 +678,23 @@ gst_camera_bin_class_init (GstCameraBinClass * klass)
       g_signal_new ("start-capture",
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-      G_STRUCT_OFFSET (GstCameraBinClass, start_capture),
+      G_STRUCT_OFFSET (GstCameraBin2Class, start_capture),
       NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 
   /**
-   * GstCameraBin::capture-stop:
+   * GstCameraBin2::capture-stop:
    * @camera: the camera bin element
    */
   camerabin_signals[STOP_CAPTURE_SIGNAL] =
       g_signal_new ("stop-capture",
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-      G_STRUCT_OFFSET (GstCameraBinClass, stop_capture),
+      G_STRUCT_OFFSET (GstCameraBin2Class, stop_capture),
       NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 }
 
 static void
-gst_camera_bin_init (GstCameraBin * camera)
+gst_camera_bin_init (GstCameraBin2 * camera)
 {
   camera->post_previews = DEFAULT_POST_PREVIEWS;
   camera->mode = DEFAULT_MODE;
@@ -715,7 +726,7 @@ gst_camera_bin_init (GstCameraBin * camera)
 }
 
 static void
-gst_image_capture_bin_post_image_done (GstCameraBin * camera,
+gst_image_capture_bin_post_image_done (GstCameraBin2 * camera,
     const gchar * filename)
 {
   GstMessage *msg;
@@ -739,10 +750,10 @@ gst_camera_bin_handle_message (GstBin * bin, GstMessage * message)
       const gchar *filename;
 
       if (gst_structure_has_name (structure, "GstMultiFileSink")) {
-        GST_CAMERA_BIN_PROCESSING_DEC (GST_CAMERA_BIN_CAST (bin));
+        GST_CAMERA_BIN2_PROCESSING_DEC (GST_CAMERA_BIN2_CAST (bin));
         filename = gst_structure_get_string (structure, "filename");
         if (filename) {
-          gst_image_capture_bin_post_image_done (GST_CAMERA_BIN_CAST (bin),
+          gst_image_capture_bin_post_image_done (GST_CAMERA_BIN2_CAST (bin),
               filename);
         }
       }
@@ -755,15 +766,15 @@ gst_camera_bin_handle_message (GstBin * bin, GstMessage * message)
       gst_message_parse_warning (message, &err, &debug);
       if (err->domain == GST_RESOURCE_ERROR) {
         /* some capturing failed */
-        GST_CAMERA_BIN_PROCESSING_DEC (GST_CAMERA_BIN_CAST (bin));
+        GST_CAMERA_BIN2_PROCESSING_DEC (GST_CAMERA_BIN2_CAST (bin));
       }
     }
       break;
     case GST_MESSAGE_EOS:{
       GstElement *src = GST_ELEMENT (GST_MESSAGE_SRC (message));
-      if (src == GST_CAMERA_BIN_CAST (bin)->videosink) {
+      if (src == GST_CAMERA_BIN2_CAST (bin)->videosink) {
         GST_DEBUG_OBJECT (bin, "EOS from video branch");
-        GST_CAMERA_BIN_PROCESSING_DEC (GST_CAMERA_BIN_CAST (bin));
+        GST_CAMERA_BIN2_PROCESSING_DEC (GST_CAMERA_BIN2_CAST (bin));
       }
     }
       break;
@@ -784,7 +795,7 @@ gst_camera_bin_handle_message (GstBin * bin, GstMessage * message)
  * Where current_filter and new_filter might or might not be NULL
  */
 static void
-gst_camera_bin_check_and_replace_filter (GstCameraBin * camera,
+gst_camera_bin_check_and_replace_filter (GstCameraBin2 * camera,
     GstElement ** current_filter, GstElement * new_filter,
     GstElement * previous_element, GstElement * next_element)
 {
@@ -818,7 +829,7 @@ gst_camera_bin_check_and_replace_filter (GstCameraBin * camera,
 
 static void
 encodebin_element_added (GstElement * encodebin, GstElement * new_element,
-    GstCameraBin * camera)
+    GstCameraBin2 * camera)
 {
   GstElementFactory *factory = gst_element_get_factory (new_element);
 
@@ -839,7 +850,7 @@ encodebin_element_added (GstElement * encodebin, GstElement * new_element,
 #define VIDEO_PAD 1
 #define AUDIO_PAD 2
 static GstPad *
-encodebin_find_pad (GstCameraBin * camera, GstElement * encodebin,
+encodebin_find_pad (GstCameraBin2 * camera, GstElement * encodebin,
     gint pad_type)
 {
   GstPad *pad = NULL;
@@ -904,7 +915,7 @@ encodebin_find_pad (GstCameraBin * camera, GstElement * encodebin,
 }
 
 static gboolean
-gst_camera_bin_video_profile_has_audio (GstCameraBin * camera)
+gst_camera_bin_video_profile_has_audio (GstCameraBin2 * camera)
 {
   const GList *list;
 
@@ -926,7 +937,7 @@ gst_camera_bin_video_profile_has_audio (GstCameraBin * camera)
 }
 
 static GstPadLinkReturn
-gst_camera_bin_link_encodebin (GstCameraBin * camera, GstElement * encodebin,
+gst_camera_bin_link_encodebin (GstCameraBin2 * camera, GstElement * encodebin,
     GstElement * element, gint padtype)
 {
   GstPadLinkReturn ret;
@@ -956,7 +967,7 @@ static void
 gst_camera_bin_src_notify_max_zoom_cb (GObject * self, GParamSpec * pspec,
     gpointer user_data)
 {
-  GstCameraBin *camera = (GstCameraBin *) user_data;
+  GstCameraBin2 *camera = (GstCameraBin2 *) user_data;
 
   g_object_get (self, "max-zoom", &camera->max_zoom, NULL);
   GST_DEBUG_OBJECT (camera, "Max zoom updated to %f", camera->max_zoom);
@@ -967,7 +978,7 @@ static gboolean
 gst_camera_bin_image_src_buffer_probe (GstPad * pad, GstBuffer * buf,
     gpointer data)
 {
-  GstCameraBin *camerabin = data;
+  GstCameraBin2 *camerabin = data;
   GstEvent *evt;
   gchar *location = NULL;
   GstPad *peer;
@@ -998,7 +1009,7 @@ static gboolean
 gst_camera_bin_image_sink_event_probe (GstPad * pad, GstEvent * event,
     gpointer data)
 {
-  GstCameraBin *camerabin = data;
+  GstCameraBin2 *camerabin = data;
 
   switch (GST_EVENT_TYPE (event)) {
     case GST_EVENT_CUSTOM_DOWNSTREAM:{
@@ -1024,9 +1035,9 @@ gst_camera_bin_image_sink_event_probe (GstPad * pad, GstEvent * event,
 
 /**
  * gst_camera_bin_create_elements:
- * @param camera: the #GstCameraBin
+ * @param camera: the #GstCameraBin2
  *
- * Creates all elements inside #GstCameraBin
+ * Creates all elements inside #GstCameraBin2
  *
  * Each of the pads on the camera source is linked as follows:
  * .pad ! queue ! capsfilter ! correspondingbin
@@ -1035,7 +1046,7 @@ gst_camera_bin_image_sink_event_probe (GstPad * pad, GstEvent * event,
  * the camera source pad.
  */
 static gboolean
-gst_camera_bin_create_elements (GstCameraBin * camera)
+gst_camera_bin_create_elements (GstCameraBin2 * camera)
 {
   gboolean new_src = FALSE;
   gboolean new_audio_src = FALSE;
@@ -1363,7 +1374,7 @@ static GstStateChangeReturn
 gst_camera_bin_change_state (GstElement * element, GstStateChange trans)
 {
   GstStateChangeReturn ret = GST_STATE_CHANGE_SUCCESS;
-  GstCameraBin *camera = GST_CAMERA_BIN_CAST (element);
+  GstCameraBin2 *camera = GST_CAMERA_BIN2_CAST (element);
 
   switch (trans) {
     case GST_STATE_CHANGE_NULL_TO_READY:
@@ -1372,7 +1383,7 @@ gst_camera_bin_change_state (GstElement * element, GstStateChange trans)
       }
       break;
     case GST_STATE_CHANGE_READY_TO_PAUSED:
-      GST_CAMERA_BIN_RESET_PROCESSING_COUNTER (camera);
+      GST_CAMERA_BIN2_RESET_PROCESSING_COUNTER (camera);
       break;
     case GST_STATE_CHANGE_PAUSED_TO_READY:
       if (GST_STATE (camera->videosink) >= GST_STATE_PAUSED)
@@ -1396,7 +1407,7 @@ gst_camera_bin_change_state (GstElement * element, GstStateChange trans)
         gst_element_set_state (camera->audio_src, GST_STATE_READY);
 
       gst_tag_setter_reset_tags (GST_TAG_SETTER (camera));
-      GST_CAMERA_BIN_RESET_PROCESSING_COUNTER (camera);
+      GST_CAMERA_BIN2_RESET_PROCESSING_COUNTER (camera);
 
       g_slist_foreach (camera->image_location_list, (GFunc) g_free, NULL);
       g_slist_free (camera->image_location_list);
@@ -1429,7 +1440,7 @@ gst_camera_bin_change_state (GstElement * element, GstStateChange trans)
 static gboolean
 gst_camera_bin_send_event (GstElement * element, GstEvent * event)
 {
-  GstCameraBin *camera = GST_CAMERA_BIN_CAST (element);
+  GstCameraBin2 *camera = GST_CAMERA_BIN2_CAST (element);
   gboolean res;
 
   res = GST_ELEMENT_CLASS (parent_class)->send_event (element, event);
@@ -1461,7 +1472,7 @@ gst_camera_bin_send_event (GstElement * element, GstEvent * event)
 }
 
 static void
-gst_camera_bin_set_location (GstCameraBin * camera, const gchar * location)
+gst_camera_bin_set_location (GstCameraBin2 * camera, const gchar * location)
 {
   GST_DEBUG_OBJECT (camera, "Setting mode %d location to %s", camera->mode,
       location);
@@ -1470,7 +1481,7 @@ gst_camera_bin_set_location (GstCameraBin * camera, const gchar * location)
 }
 
 static void
-gst_camera_bin_set_audio_src (GstCameraBin * camera, GstElement * src)
+gst_camera_bin_set_audio_src (GstCameraBin2 * camera, GstElement * src)
 {
   GST_DEBUG_OBJECT (GST_OBJECT (camera),
       "Setting audio source %" GST_PTR_FORMAT, src);
@@ -1484,7 +1495,7 @@ gst_camera_bin_set_audio_src (GstCameraBin * camera, GstElement * src)
 }
 
 static void
-gst_camera_bin_set_camera_src (GstCameraBin * camera, GstElement * src)
+gst_camera_bin_set_camera_src (GstCameraBin2 * camera, GstElement * src)
 {
   GST_DEBUG_OBJECT (GST_OBJECT (camera),
       "Setting camera source %" GST_PTR_FORMAT, src);
@@ -1501,7 +1512,7 @@ static void
 gst_camera_bin_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec)
 {
-  GstCameraBin *camera = GST_CAMERA_BIN_CAST (object);
+  GstCameraBin2 *camera = GST_CAMERA_BIN2_CAST (object);
 
   switch (prop_id) {
     case PROP_MODE:
@@ -1682,7 +1693,7 @@ static void
 gst_camera_bin_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec)
 {
-  GstCameraBin *camera = GST_CAMERA_BIN_CAST (object);
+  GstCameraBin2 *camera = GST_CAMERA_BIN2_CAST (object);
 
   switch (prop_id) {
     case PROP_MODE:
@@ -1837,10 +1848,10 @@ gst_camera_bin_get_property (GObject * object, guint prop_id,
 }
 
 gboolean
-gst_camera_bin_plugin_init (GstPlugin * plugin)
+gst_camera_bin2_plugin_init (GstPlugin * plugin)
 {
   GST_DEBUG_CATEGORY_INIT (gst_camera_bin_debug, "camerabin2", 0, "CameraBin2");
 
   return gst_element_register (plugin, "camerabin2", GST_RANK_NONE,
-      gst_camera_bin_get_type ());
+      gst_camera_bin2_get_type ());
 }
diff --git a/gst/camerabin2/gstcamerabin2.h b/gst/camerabin2/gstcamerabin2.h
index b30e2ef3cd..8ab108ac2c 100644
--- a/gst/camerabin2/gstcamerabin2.h
+++ b/gst/camerabin2/gstcamerabin2.h
@@ -16,25 +16,25 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#ifndef _GST_CAMERA_BIN_H_
-#define _GST_CAMERA_BIN_H_
+#ifndef _GST_CAMERA_BIN2_H_
+#define _GST_CAMERA_BIN2_H_
 
 #include <gst/gst.h>
 #include <gst/pbutils/encoding-profile.h>
 
 G_BEGIN_DECLS
 
-#define GST_TYPE_CAMERA_BIN   (gst_camera_bin_get_type())
-#define GST_CAMERA_BIN(obj)   (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_CAMERA_BIN,GstCameraBin))
-#define GST_CAMERA_BIN_CAST(obj)   ((GstCameraBin *) obj)
-#define GST_CAMERA_BIN_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_CAMERA_BIN,GstCameraBinClass))
-#define GST_IS_CAMERA_BIN(obj)   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_CAMERA_BIN))
-#define GST_IS_CAMERA_BIN_CLASS(obj)   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_CAMERA_BIN))
+#define GST_TYPE_CAMERA_BIN2   (gst_camera_bin2_get_type())
+#define GST_CAMERA_BIN2(obj)   (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_CAMERA_BIN2,GstCameraBin2))
+#define GST_CAMERA_BIN2_CAST(obj)   ((GstCameraBin2 *) obj)
+#define GST_CAMERA_BIN2_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_CAMERA_BIN2,GstCameraBin2Class))
+#define GST_IS_CAMERA_BIN2(obj)   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_CAMERA_BIN2))
+#define GST_IS_CAMERA_BIN2_CLASS(obj)   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_CAMERA_BIN2))
 
-typedef struct _GstCameraBin GstCameraBin;
-typedef struct _GstCameraBinClass GstCameraBinClass;
+typedef struct _GstCameraBin2 GstCameraBin2;
+typedef struct _GstCameraBin2Class GstCameraBin2Class;
 
-struct _GstCameraBin
+struct _GstCameraBin2
 {
   GstPipeline pipeline;
 
@@ -99,17 +99,17 @@ struct _GstCameraBin
   gboolean elements_created;
 };
 
-struct _GstCameraBinClass
+struct _GstCameraBin2Class
 {
   GstPipelineClass pipeline_class;
 
   /* Action signals */
-  void (*start_capture) (GstCameraBin * camera);
-  void (*stop_capture) (GstCameraBin * camera);
+  void (*start_capture) (GstCameraBin2 * camera);
+  void (*stop_capture) (GstCameraBin2 * camera);
 };
 
-GType gst_camera_bin_get_type (void);
-gboolean gst_camera_bin_plugin_init (GstPlugin * plugin);
+GType gst_camera_bin2_get_type (void);
+gboolean gst_camera_bin2_plugin_init (GstPlugin * plugin);
 
 G_END_DECLS
 
diff --git a/gst/camerabin2/gstplugin.c b/gst/camerabin2/gstplugin.c
index 6053521468..c4eaf2fd44 100644
--- a/gst/camerabin2/gstplugin.c
+++ b/gst/camerabin2/gstplugin.c
@@ -34,7 +34,7 @@ plugin_init (GstPlugin * plugin)
     return FALSE;
   if (!gst_wrapper_camera_bin_src_plugin_init (plugin))
     return FALSE;
-  if (!gst_camera_bin_plugin_init (plugin))
+  if (!gst_camera_bin2_plugin_init (plugin))
     return FALSE;
 
   return TRUE;

From 5160f8ec23c3b7ae0958deaaca9851196f93bb2e Mon Sep 17 00:00:00 2001
From: Stefan Kost <ensonic@users.sf.net>
Date: Thu, 7 Jul 2011 15:59:05 -0700
Subject: [PATCH 046/158] docs: add camerabin2 to the docs and update the doc
 files

---
 docs/plugins/Makefile.am                      |  1 +
 .../plugins/gst-plugins-bad-plugins-docs.sgml |  2 +
 .../gst-plugins-bad-plugins-sections.txt      | 14 ++++
 docs/plugins/gst-plugins-bad-plugins.args     | 54 +++++++++++---
 .../plugins/gst-plugins-bad-plugins.hierarchy | 40 +++-------
 docs/plugins/inspect/plugin-debugutilsbad.xml | 27 +++++++
 docs/plugins/inspect/plugin-decklink.xml      |  4 +-
 docs/plugins/inspect/plugin-dtsdec.xml        |  2 +-
 docs/plugins/inspect/plugin-flite.xml         | 28 +++++++
 docs/plugins/inspect/plugin-inter.xml         | 73 +++++++++++++++++++
 docs/plugins/inspect/plugin-modplug.xml       |  8 +-
 .../inspect/plugin-videoparsersbad.xml        |  2 +-
 12 files changed, 204 insertions(+), 51 deletions(-)
 create mode 100644 docs/plugins/inspect/plugin-flite.xml
 create mode 100644 docs/plugins/inspect/plugin-inter.xml

diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index e6bbb5c5fa..4f8f0cfcd9 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -139,6 +139,7 @@ EXTRA_HFILES = \
 	$(top_srcdir)/gst/audiovisualizers/gstsynaescope.h \
 	$(top_srcdir)/gst/audiovisualizers/gstwavescope.h \
 	$(top_srcdir)/gst/camerabin/gstcamerabin.h \
+	$(top_srcdir)/gst/camerabin2/gstcamerabin2.h \
 	$(top_srcdir)/gst/coloreffects/gstcoloreffects.h \
 	$(top_srcdir)/gst/dataurisrc/gstdataurisrc.h \
 	$(top_srcdir)/gst/dccp/gstdccpclientsink.h \
diff --git a/docs/plugins/gst-plugins-bad-plugins-docs.sgml b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
index db13207c38..07fcdaa261 100644
--- a/docs/plugins/gst-plugins-bad-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
@@ -24,6 +24,7 @@
     <xi:include href="xml/element-bulge.xml" />
     <xi:include href="xml/element-burn.xml" />
     <xi:include href="xml/element-camerabin.xml" />
+    <xi:include href="xml/element-camerabin2.xml" />
     <xi:include href="xml/element-celtdec.xml" />
     <xi:include href="xml/element-celtenc.xml" />
     <xi:include href="xml/element-chromium.xml" />
@@ -142,6 +143,7 @@
     <xi:include href="xml/plugin-bayer.xml" />
     <xi:include href="xml/plugin-bz2.xml" />
     <xi:include href="xml/plugin-camerabin.xml" />
+    <xi:include href="xml/plugin-camerabin2.xml" />
     <xi:include href="xml/plugin-cdaudio.xml" />
     <xi:include href="xml/plugin-cdxaparse.xml" />
     <xi:include href="xml/plugin-celt.xml" />
diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt
index bc52908fb8..29315d4af2 100644
--- a/docs/plugins/gst-plugins-bad-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-bad-plugins-sections.txt
@@ -115,6 +115,20 @@ GST_IS_CAMERABIN_CLASS
 gst_camerabin_get_type
 </SECTION>
 
+<SECTION>
+<FILE>element-camerabin2</FILE>
+<TITLE>camerabin2</TITLE>
+GstCameraBin2
+<SUBSECTION Standard>
+GstCameraBin2Class
+GST_CAMERABIN2
+GST_IS_CAMERABIN2
+GST_TYPE_CAMERABIN2
+GST_CAMERABIN2_CLASS
+GST_IS_CAMERABIN2_CLASS
+gst_camerabin2_get_type
+</SECTION>
+
 <SECTION>
 <FILE>element-celtdec</FILE>
 <TITLE>celtdec</TITLE>
diff --git a/docs/plugins/gst-plugins-bad-plugins.args b/docs/plugins/gst-plugins-bad-plugins.args
index 73ea435301..2640dd488c 100644
--- a/docs/plugins/gst-plugins-bad-plugins.args
+++ b/docs/plugins/gst-plugins-bad-plugins.args
@@ -27930,7 +27930,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>bitrate</NICK>
 <BLURB>bitrate.</BLURB>
-<DEFAULT>0</DEFAULT>
+<DEFAULT>13824000</DEFAULT>
 </ARG>
 
 <ARG>
@@ -28030,7 +28030,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>enable_multiquant</NICK>
 <BLURB>enable_multiquant.</BLURB>
-<DEFAULT>FALSE</DEFAULT>
+<DEFAULT>TRUE</DEFAULT>
 </ARG>
 
 <ARG>
@@ -28116,11 +28116,11 @@
 <ARG>
 <NAME>GstSchroEnc::horiz-slices</NAME>
 <TYPE>gint</TYPE>
-<RANGE>>= 0</RANGE>
+<RANGE>>= 1</RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>horiz_slices</NICK>
 <BLURB>horiz_slices.</BLURB>
-<DEFAULT>0</DEFAULT>
+<DEFAULT>8</DEFAULT>
 </ARG>
 
 <ARG>
@@ -28130,7 +28130,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>inter_wavelet</NICK>
 <BLURB>inter_wavelet.</BLURB>
-<DEFAULT>desl_dubuc_9_7</DEFAULT>
+<DEFAULT>le_gall_5_3</DEFAULT>
 </ARG>
 
 <ARG>
@@ -28220,7 +28220,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>magic_chroma_lambda_scale</NICK>
 <BLURB>magic_chroma_lambda_scale.</BLURB>
-<DEFAULT>0.1</DEFAULT>
+<DEFAULT>0.01</DEFAULT>
 </ARG>
 
 <ARG>
@@ -28320,7 +28320,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>magic_scene_change_threshold</NICK>
 <BLURB>magic_scene_change_threshold.</BLURB>
-<DEFAULT>3</DEFAULT>
+<DEFAULT>0.2</DEFAULT>
 </ARG>
 
 <ARG>
@@ -28490,17 +28490,17 @@
 <FLAGS>rw</FLAGS>
 <NICK>transform_depth</NICK>
 <BLURB>transform_depth.</BLURB>
-<DEFAULT>3</DEFAULT>
+<DEFAULT>4</DEFAULT>
 </ARG>
 
 <ARG>
 <NAME>GstSchroEnc::vert-slices</NAME>
 <TYPE>gint</TYPE>
-<RANGE>>= 0</RANGE>
+<RANGE>>= 1</RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>vert_slices</NICK>
 <BLURB>vert_slices.</BLURB>
-<DEFAULT>0</DEFAULT>
+<DEFAULT>6</DEFAULT>
 </ARG>
 
 <ARG>
@@ -47779,8 +47779,8 @@
 <RANGE></RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>Location</NICK>
-<BLURB>Location to save the captured files. A %d might be used on thefilename as a placeholder for a numeric index of the capture.Default for images is img_%d and vid_%d for videos.</BLURB>
-<DEFAULT>"img_%d"</DEFAULT>
+<BLURB>Location to save the captured files. A %d might be used on thefilename as a placeholder for a numeric index of the capture.Default is cap_%d.</BLURB>
+<DEFAULT>"cap_%d"</DEFAULT>
 </ARG>
 
 <ARG>
@@ -57623,3 +57623,33 @@
 <DEFAULT>NULL</DEFAULT>
 </ARG>
 
+<ARG>
+<NAME>GstDecklinkSrc::connection</NAME>
+<TYPE>GstDecklinkConnection</TYPE>
+<RANGE></RANGE>
+<FLAGS>rwx</FLAGS>
+<NICK>Connection</NICK>
+<BLURB>Connection.</BLURB>
+<DEFAULT>sdi</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>GstDecklinkSrc::mode</NAME>
+<TYPE>GstDecklinkModes</TYPE>
+<RANGE></RANGE>
+<FLAGS>rwx</FLAGS>
+<NICK>Mode</NICK>
+<BLURB>Mode.</BLURB>
+<DEFAULT>ntsc</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>GstDecklinkSink::mode</NAME>
+<TYPE>GstDecklinkModes</TYPE>
+<RANGE></RANGE>
+<FLAGS>rwx</FLAGS>
+<NICK>Mode</NICK>
+<BLURB>Mode.</BLURB>
+<DEFAULT>ntsc</DEFAULT>
+</ARG>
+
diff --git a/docs/plugins/gst-plugins-bad-plugins.hierarchy b/docs/plugins/gst-plugins-bad-plugins.hierarchy
index 51340bea5a..ef9c6f37b6 100644
--- a/docs/plugins/gst-plugins-bad-plugins.hierarchy
+++ b/docs/plugins/gst-plugins-bad-plugins.hierarchy
@@ -1,7 +1,6 @@
 GObject
+  GstAdapter
   GstColorBalanceChannel
-  GstMixerTrack
-    GstMixerOptions
   GstObject
     GstBus
     GstClock
@@ -37,37 +36,32 @@ GObject
           GstAudioSink
             GstApExSink
             GstNasSink
-            GstOpenALSink
             GstSDLAudioSink
         GstChecksumSink
-        GstCurlSink
         GstDCCPClientSink
         GstDCCPServerSink
         GstFBDEVSink
+        GstInterAudioSink
+        GstInterVideoSink
         GstLinsysSdiSink
-        GstRTMPSink
         GstSFSink
         GstShmSink
         GstVideoSink
           GstDfbVideoSink
           GstSDLVideoSink
-          VdpSink
       GstBaseSrc
         GstDTMFSrc
         GstDataURISrc
         GstFliteTestSrc
+        GstInterAudioSrc
+        GstInterVideoSrc
         GstLinsysSdiSrc
         GstPushSrc
-          GstBaseAudioSrc
-            GstAudioSrc
-              GstOpenalSrc
           GstDCCPClientSrc
           GstDCCPServerSrc
           GstDc1394
           GstDvbSrc
           GstMMS
-          GstNeonhttpSrc
-          GstRTMPSrc
           GstRfbSrc
           GstShmSrc
           GstVCDSrc
@@ -124,7 +118,6 @@ GObject
           GstVideoAnalyse
           GstVideoDetect
           GstVideoMark
-          GstZBar
         GstVideoFilter2
           GstSceneChange
           GstZebraStripe
@@ -132,26 +125,22 @@ GObject
       GstBaseVideoCodec
         GstBaseVideoDecoder
           GstSchroDec
-          GstVP8Dec
         GstBaseVideoEncoder
           GstDiracEnc
           GstSchroEnc
-          GstVP8Enc
       GstBin
         DvbBaseBin
         GstAutoConvert
         GstAutoVideoConvert
+        GstBaseCameraSrc
+          GstWrapperCameraBinSrc
         GstFPSDisplaySink
         GstFaceOverlay
-        GstGSettingsSwitchSink
-          GstGSettingsAudioSink
-          GstGSettingsVideoSink
-        GstGSettingsSwitchSrc
-          GstGSettingsAudioSrc
-          GstGSettingsVideoSrc
         GstPipeline
           GstCameraBin
+          GstCameraBin2
         GstSDPDemux
+        GstViewfinderBin
         RsnDvdBin
       GstBz2dec
       GstBz2enc
@@ -177,7 +166,6 @@ GObject
       GstId3BaseMux
         GstId3Mux
       GstInterlace
-      GstInvtelecine
       GstIvfParse
       GstJP2kDecimator
       GstJifMux
@@ -239,7 +227,6 @@ GObject
       GstTtaParse
       GstVMncDec
       GstVcdParse
-      GstVdpVideoPostProcess
       GstWildmidi
       GstY4mDec
       MpegPsMux
@@ -249,14 +236,7 @@ GObject
       MpegTSParse
       MpegTsMux
       MpegVideoParse
-      SatBaseVideoDecoder
-        GstVdpDecoder
-          GstVdpH264Dec
-          GstVdpMpeg4Dec
-          GstVdpMpegDec
     GstPad
-      GstVdpOutputSrcPad
-      GstVdpVideoSrcPad
     GstPadTemplate
       GstSignalProcessorPadTemplate
     GstPlugin
@@ -267,11 +247,9 @@ GObject
     GstRegistry
     GstRingBuffer
       GstAudioSinkRingBuffer
-      GstAudioSrcRingBuffer
     GstTask
     GstTaskPool
   GstSignalObject
-  GstVdpDevice
   MpegTsPatInfo
   MpegTsPmtInfo
 GInterface
diff --git a/docs/plugins/inspect/plugin-debugutilsbad.xml b/docs/plugins/inspect/plugin-debugutilsbad.xml
index 1a28a1460d..a9e8270aa5 100644
--- a/docs/plugins/inspect/plugin-debugutilsbad.xml
+++ b/docs/plugins/inspect/plugin-debugutilsbad.xml
@@ -51,6 +51,33 @@
         </caps>
       </pads>
     </element>
+    <element>
+      <name>compare</name>
+      <longname>Compare buffers</longname>
+      <class>Filter/Debug</class>
+      <description>Compares incoming buffers</description>
+      <author>Mark Nauwelaerts &lt;mark.nauwelaerts@collabora.co.uk&gt;</author>
+      <pads>
+        <caps>
+          <name>check</name>
+          <direction>sink</direction>
+          <presence>always</presence>
+          <details>ANY</details>
+        </caps>
+        <caps>
+          <name>sink</name>
+          <direction>sink</direction>
+          <presence>always</presence>
+          <details>ANY</details>
+        </caps>
+        <caps>
+          <name>src</name>
+          <direction>source</direction>
+          <presence>always</presence>
+          <details>ANY</details>
+        </caps>
+      </pads>
+    </element>
     <element>
       <name>debugspy</name>
       <longname>DebugSpy</longname>
diff --git a/docs/plugins/inspect/plugin-decklink.xml b/docs/plugins/inspect/plugin-decklink.xml
index 8d6937d75f..a72e850795 100644
--- a/docs/plugins/inspect/plugin-decklink.xml
+++ b/docs/plugins/inspect/plugin-decklink.xml
@@ -26,7 +26,7 @@
           <name>videosink</name>
           <direction>sink</direction>
           <presence>always</presence>
-          <details>video/x-raw-yuv, format=(fourcc)UYVY, width=(int)720, height=(int)486, framerate=(fraction)30000/1001, interlaced=(boolean)true</details>
+          <details>video/x-raw-yuv, format=(fourcc)UYVY, width=(int)720, height=(int)486, framerate=(fraction)30000/1001, interlaced=(boolean)true; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)720, height=(int)486, framerate=(fraction)24000/1001, interlaced=(boolean)true; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)720, height=(int)576, framerate=(fraction)25/1, interlaced=(boolean)true; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)720, height=(int)486, framerate=(fraction)30000/1001, interlaced=(boolean)false; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)720, height=(int)576, framerate=(fraction)25/1, interlaced=(boolean)false; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1920, height=(int)1080, framerate=(fraction)24000/1001, interlaced=(boolean)false; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1920, height=(int)1080, framerate=(fraction)24/1, interlaced=(boolean)false; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1920, height=(int)1080, framerate=(fraction)25/1, interlaced=(boolean)false; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1920, height=(int)1080, framerate=(fraction)30000/1001, interlaced=(boolean)false; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1920, height=(int)1080, framerate=(fraction)30/1, interlaced=(boolean)false; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1920, height=(int)1080, framerate=(fraction)25/1, interlaced=(boolean)true; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1920, height=(int)1080, framerate=(fraction)30000/1001, interlaced=(boolean)true; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1920, height=(int)1080, framerate=(fraction)30/1, interlaced=(boolean)true; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1920, height=(int)1080, framerate=(fraction)50/1, interlaced=(boolean)false; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1920, height=(int)1080, framerate=(fraction)60000/1001, interlaced=(boolean)false; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1920, height=(int)1080, framerate=(fraction)60/1, interlaced=(boolean)false; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1280, height=(int)720, framerate=(fraction)50/1, interlaced=(boolean)false; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1280, height=(int)720, framerate=(fraction)60000/1001, interlaced=(boolean)false; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1280, height=(int)720, framerate=(fraction)60/1, interlaced=(boolean)false</details>
         </caps>
       </pads>
     </element>
@@ -47,7 +47,7 @@
           <name>videosrc</name>
           <direction>source</direction>
           <presence>always</presence>
-          <details>video/x-raw-yuv, format=(fourcc)UYVY, width=(int)720, height=(int)486, framerate=(fraction)30000/1001, interlaced=(boolean)true; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)720, height=(int)486, framerate=(fraction)24000/1001, interlaced=(boolean)true; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)720, height=(int)576, framerate=(fraction)25/1, interlaced=(boolean)true; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1920, height=(int)1080, framerate=(fraction)24000/1001, interlaced=(boolean)false; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1920, height=(int)1080, framerate=(fraction)24/1, interlaced=(boolean)false; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1920, height=(int)1080, framerate=(fraction)25/1, interlaced=(boolean)false; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1920, height=(int)1080, framerate=(fraction)30000/1001, interlaced=(boolean)false; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1920, height=(int)1080, framerate=(fraction)30/1, interlaced=(boolean)false; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1920, height=(int)1080, framerate=(fraction)25/1, interlaced=(boolean)true; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1920, height=(int)1080, framerate=(fraction)30000/1001, interlaced=(boolean)true; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1920, height=(int)1080, framerate=(fraction)30/1, interlaced=(boolean)true; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1280, height=(int)720, framerate=(fraction)50/1, interlaced=(boolean)true; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1280, height=(int)720, framerate=(fraction)60000/1001, interlaced=(boolean)true; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1280, height=(int)720, framerate=(fraction)60/1, interlaced=(boolean)true</details>
+          <details>video/x-raw-yuv, format=(fourcc)UYVY, width=(int)720, height=(int)486, framerate=(fraction)30000/1001, interlaced=(boolean)true, pixel-aspect-ratio=(fraction)10/11, color-matrix=(string)sdtv, chroma-site=(string)mpeg2; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)720, height=(int)486, framerate=(fraction)24000/1001, interlaced=(boolean)true, pixel-aspect-ratio=(fraction)10/11, color-matrix=(string)sdtv, chroma-site=(string)mpeg2; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)720, height=(int)576, framerate=(fraction)25/1, interlaced=(boolean)true, pixel-aspect-ratio=(fraction)12/11, color-matrix=(string)sdtv, chroma-site=(string)mpeg2; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)720, height=(int)486, framerate=(fraction)30000/1001, interlaced=(boolean)false, pixel-aspect-ratio=(fraction)10/11, color-matrix=(string)sdtv, chroma-site=(string)mpeg2; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)720, height=(int)576, framerate=(fraction)25/1, interlaced=(boolean)false, pixel-aspect-ratio=(fraction)12/11, color-matrix=(string)sdtv, chroma-site=(string)mpeg2; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1920, height=(int)1080, framerate=(fraction)24000/1001, interlaced=(boolean)false, pixel-aspect-ratio=(fraction)12/11, color-matrix=(string)hdtv, chroma-site=(string)mpeg2; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1920, height=(int)1080, framerate=(fraction)24/1, interlaced=(boolean)false, pixel-aspect-ratio=(fraction)12/11, color-matrix=(string)hdtv, chroma-site=(string)mpeg2; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1920, height=(int)1080, framerate=(fraction)25/1, interlaced=(boolean)false, pixel-aspect-ratio=(fraction)12/11, color-matrix=(string)hdtv, chroma-site=(string)mpeg2; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1920, height=(int)1080, framerate=(fraction)30000/1001, interlaced=(boolean)false, pixel-aspect-ratio=(fraction)12/11, color-matrix=(string)hdtv, chroma-site=(string)mpeg2; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1920, height=(int)1080, framerate=(fraction)30/1, interlaced=(boolean)false, pixel-aspect-ratio=(fraction)12/11, color-matrix=(string)hdtv, chroma-site=(string)mpeg2; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1920, height=(int)1080, framerate=(fraction)25/1, interlaced=(boolean)true, pixel-aspect-ratio=(fraction)12/11, color-matrix=(string)hdtv, chroma-site=(string)mpeg2; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1920, height=(int)1080, framerate=(fraction)30000/1001, interlaced=(boolean)true, pixel-aspect-ratio=(fraction)12/11, color-matrix=(string)hdtv, chroma-site=(string)mpeg2; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1920, height=(int)1080, framerate=(fraction)30/1, interlaced=(boolean)true, pixel-aspect-ratio=(fraction)12/11, color-matrix=(string)hdtv, chroma-site=(string)mpeg2; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1920, height=(int)1080, framerate=(fraction)50/1, interlaced=(boolean)false, pixel-aspect-ratio=(fraction)12/11, color-matrix=(string)hdtv, chroma-site=(string)mpeg2; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1920, height=(int)1080, framerate=(fraction)30000/1001, interlaced=(boolean)false, pixel-aspect-ratio=(fraction)12/11, color-matrix=(string)hdtv, chroma-site=(string)mpeg2; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1920, height=(int)1080, framerate=(fraction)60/1, interlaced=(boolean)false, pixel-aspect-ratio=(fraction)12/11, color-matrix=(string)hdtv, chroma-site=(string)mpeg2; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1280, height=(int)720, framerate=(fraction)50/1, interlaced=(boolean)false, pixel-aspect-ratio=(fraction)12/11, color-matrix=(string)hdtv, chroma-site=(string)mpeg2; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1280, height=(int)720, framerate=(fraction)60000/1001, interlaced=(boolean)false, pixel-aspect-ratio=(fraction)12/11, color-matrix=(string)hdtv, chroma-site=(string)mpeg2; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)1280, height=(int)720, framerate=(fraction)60/1, interlaced=(boolean)false, pixel-aspect-ratio=(fraction)12/11, color-matrix=(string)hdtv, chroma-site=(string)mpeg2</details>
         </caps>
       </pads>
     </element>
diff --git a/docs/plugins/inspect/plugin-dtsdec.xml b/docs/plugins/inspect/plugin-dtsdec.xml
index f0043c7881..c79cccb3e3 100644
--- a/docs/plugins/inspect/plugin-dtsdec.xml
+++ b/docs/plugins/inspect/plugin-dtsdec.xml
@@ -3,7 +3,7 @@
   <description>Decodes DTS audio streams</description>
   <filename>../../ext/dts/.libs/libgstdtsdec.so</filename>
   <basename>libgstdtsdec.so</basename>
-  <version>0.10.19.1</version>
+  <version>0.10.22.1</version>
   <license>GPL</license>
   <source>gst-plugins-bad</source>
   <package>GStreamer Bad Plug-ins git</package>
diff --git a/docs/plugins/inspect/plugin-flite.xml b/docs/plugins/inspect/plugin-flite.xml
new file mode 100644
index 0000000000..bf1c4d830b
--- /dev/null
+++ b/docs/plugins/inspect/plugin-flite.xml
@@ -0,0 +1,28 @@
+<plugin>
+  <name>flite</name>
+  <description>Flite speech synthesizer plugin</description>
+  <filename>../../ext/flite/.libs/libgstflite.so</filename>
+  <basename>libgstflite.so</basename>
+  <version>0.10.22.1</version>
+  <license>LGPL</license>
+  <source>gst-plugins-bad</source>
+  <package>GStreamer Bad Plug-ins git</package>
+  <origin>Unknown package origin</origin>
+  <elements>
+    <element>
+      <name>flitetestsrc</name>
+      <longname>Flite speech test source</longname>
+      <class>Source/Audio</class>
+      <description>Creates audio test signals identifying channels</description>
+      <author>David Schleef &lt;ds@schleef.org&gt;</author>
+      <pads>
+        <caps>
+          <name>src</name>
+          <direction>source</direction>
+          <presence>always</presence>
+          <details>audio/x-raw-int, endianness=(int)1234, signed=(boolean)true, width=(int)16, depth=(int)16, rate=(int)48000, channels=(int)[ 1, 8 ]</details>
+        </caps>
+      </pads>
+    </element>
+  </elements>
+</plugin>
\ No newline at end of file
diff --git a/docs/plugins/inspect/plugin-inter.xml b/docs/plugins/inspect/plugin-inter.xml
new file mode 100644
index 0000000000..ce764a22ba
--- /dev/null
+++ b/docs/plugins/inspect/plugin-inter.xml
@@ -0,0 +1,73 @@
+<plugin>
+  <name>inter</name>
+  <description>plugin for inter-pipeline communication</description>
+  <filename>../../gst/inter/.libs/libgstinter.so</filename>
+  <basename>libgstinter.so</basename>
+  <version>0.10.22.1</version>
+  <license>LGPL</license>
+  <source>gst-plugins-bad</source>
+  <package>GStreamer Bad Plug-ins</package>
+  <origin>Unknown package origin</origin>
+  <elements>
+    <element>
+      <name>interaudiosink</name>
+      <longname>FIXME Long name</longname>
+      <class>Generic</class>
+      <description>FIXME Description</description>
+      <author>FIXME &lt;fixme@example.com&gt;</author>
+      <pads>
+        <caps>
+          <name>sink</name>
+          <direction>sink</direction>
+          <presence>always</presence>
+          <details>audio/x-raw-int, endianness=(int)1234, signed=(boolean)true, width=(int)16, depth=(int)16, rate=(int)[ 1, 2147483647 ], channels=(int)[ 1, 2 ]</details>
+        </caps>
+      </pads>
+    </element>
+    <element>
+      <name>interaudiosrc</name>
+      <longname>FIXME Long name</longname>
+      <class>Generic</class>
+      <description>FIXME Description</description>
+      <author>FIXME &lt;fixme@example.com&gt;</author>
+      <pads>
+        <caps>
+          <name>src</name>
+          <direction>source</direction>
+          <presence>always</presence>
+          <details>audio/x-raw-int, endianness=(int)1234, signed=(boolean)true, width=(int)16, depth=(int)16, rate=(int)[ 1, 2147483647 ], channels=(int)[ 1, 2 ]</details>
+        </caps>
+      </pads>
+    </element>
+    <element>
+      <name>intervideosink</name>
+      <longname>FIXME Long name</longname>
+      <class>Generic</class>
+      <description>FIXME Description</description>
+      <author>FIXME &lt;fixme@example.com&gt;</author>
+      <pads>
+        <caps>
+          <name>sink</name>
+          <direction>sink</direction>
+          <presence>always</presence>
+          <details>video/x-raw-yuv, format=(fourcc)I420, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]</details>
+        </caps>
+      </pads>
+    </element>
+    <element>
+      <name>intervideosrc</name>
+      <longname>FIXME Long name</longname>
+      <class>Generic</class>
+      <description>FIXME Description</description>
+      <author>FIXME &lt;fixme@example.com&gt;</author>
+      <pads>
+        <caps>
+          <name>src</name>
+          <direction>source</direction>
+          <presence>always</presence>
+          <details>video/x-raw-yuv, format=(fourcc)I420, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]</details>
+        </caps>
+      </pads>
+    </element>
+  </elements>
+</plugin>
\ No newline at end of file
diff --git a/docs/plugins/inspect/plugin-modplug.xml b/docs/plugins/inspect/plugin-modplug.xml
index f9cac1f48f..637390beca 100644
--- a/docs/plugins/inspect/plugin-modplug.xml
+++ b/docs/plugins/inspect/plugin-modplug.xml
@@ -1,12 +1,12 @@
 <plugin>
   <name>modplug</name>
   <description>.MOD audio decoding</description>
-  <filename>../../gst/modplug/.libs/libgstmodplug.so</filename>
+  <filename>../../ext/modplug/.libs/libgstmodplug.so</filename>
   <basename>libgstmodplug.so</basename>
-  <version>0.10.10.1</version>
+  <version>0.10.22.1</version>
   <license>LGPL</license>
   <source>gst-plugins-bad</source>
-  <package>GStreamer Bad Plug-ins CVS/prerelease</package>
+  <package>GStreamer Bad Plug-ins git</package>
   <origin>Unknown package origin</origin>
   <elements>
     <element>
@@ -26,7 +26,7 @@
           <name>src</name>
           <direction>source</direction>
           <presence>always</presence>
-          <details>audio/x-raw-int, endianness=(int)1234, signed=(boolean)true, width=(int)16, depth=(int)16, rate=(int){ 8000, 11025, 22050, 44100 }, channels=(int)2; audio/x-raw-int, endianness=(int)1234, signed=(boolean)false, width=(int)8, depth=(int)8, rate=(int){ 8000, 11025, 22050, 44100 }, channels=(int)[ 1, 2 ]</details>
+          <details>audio/x-raw-int, endianness=(int)1234, signed=(boolean)true, width=(int)32, depth=(int)32, rate=(int){ 8000, 11025, 22050, 44100 }, channels=(int)[ 1, 2 ]; audio/x-raw-int, endianness=(int)1234, signed=(boolean)true, width=(int)16, depth=(int)16, rate=(int){ 8000, 11025, 22050, 44100 }, channels=(int)[ 1, 2 ]; audio/x-raw-int, endianness=(int)1234, signed=(boolean)false, width=(int)8, depth=(int)8, rate=(int){ 8000, 11025, 22050, 44100 }, channels=(int)[ 1, 2 ]</details>
         </caps>
       </pads>
     </element>
diff --git a/docs/plugins/inspect/plugin-videoparsersbad.xml b/docs/plugins/inspect/plugin-videoparsersbad.xml
index 58d93db214..930c55df78 100644
--- a/docs/plugins/inspect/plugin-videoparsersbad.xml
+++ b/docs/plugins/inspect/plugin-videoparsersbad.xml
@@ -83,7 +83,7 @@
           <name>sink</name>
           <direction>sink</direction>
           <presence>always</presence>
-          <details>video/mpeg, mpegversion=(int)4, parsed=(boolean)false, systemstream=(boolean)false</details>
+          <details>video/mpeg, mpegversion=(int)[ 1, 2 ], parsed=(boolean)false, systemstream=(boolean)false</details>
         </caps>
         <caps>
           <name>src</name>

From 0a7e6e4002b76c99308a9aa99d3810e998b2bd27 Mon Sep 17 00:00:00 2001
From: Stefan Kost <ensonic@users.sf.net>
Date: Thu, 7 Jul 2011 16:00:44 -0700
Subject: [PATCH 047/158] inter: add ignore file for intermediate files

---
 gst/inter/.gitignore | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 gst/inter/.gitignore

diff --git a/gst/inter/.gitignore b/gst/inter/.gitignore
new file mode 100644
index 0000000000..0644f4986f
--- /dev/null
+++ b/gst/inter/.gitignore
@@ -0,0 +1,2 @@
+gstintertest
+

From 6f2c2609acdfca8a86b7d21c6019ecf125040c1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Fri, 8 Jul 2011 11:52:17 +0200
Subject: [PATCH 048/158] mxfdemux: Properly return seeking errors if the
 requested position can't be found

---
 gst/mxf/mxfdemux.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gst/mxf/mxfdemux.c b/gst/mxf/mxfdemux.c
index 3db4413713..a4fde1f802 100644
--- a/gst/mxf/mxfdemux.c
+++ b/gst/mxf/mxfdemux.c
@@ -3358,7 +3358,7 @@ gst_mxf_demux_seek_pull (GstMXFDemux * demux, GstEvent * event)
 
   GST_PAD_STREAM_UNLOCK (demux->sinkpad);
 
-  return TRUE;
+  return ret;
 
   /* ERRORS */
 wrong_format:

From fc93c66d3be4dc02af2e9f1215ae43e540bc67e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Sat, 9 Jul 2011 10:57:52 +0200
Subject: [PATCH 049/158] basevideo: Add destroy notify for the coder_hook to
 prevent memory leaks

Fixes bug #654293.
---
 gst-libs/gst/video/gstbasevideocodec.c   | 3 +++
 gst-libs/gst/video/gstbasevideocodec.h   | 2 ++
 gst-libs/gst/video/gstbasevideodecoder.c | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/gst-libs/gst/video/gstbasevideocodec.c b/gst-libs/gst/video/gstbasevideocodec.c
index 07085f7304..f2d4ee6ca6 100644
--- a/gst-libs/gst/video/gstbasevideocodec.c
+++ b/gst-libs/gst/video/gstbasevideocodec.c
@@ -182,5 +182,8 @@ gst_base_video_codec_free_frame (GstVideoFrame * frame)
     gst_buffer_unref (frame->src_buffer);
   }
 
+  if (frame->coder_hook_destroy_notify && frame->coder_hook)
+    frame->coder_hook_destroy_notify (frame->coder_hook);
+
   g_free (frame);
 }
diff --git a/gst-libs/gst/video/gstbasevideocodec.h b/gst-libs/gst/video/gstbasevideocodec.h
index 9bada934b3..e9431e20ab 100644
--- a/gst-libs/gst/video/gstbasevideocodec.h
+++ b/gst-libs/gst/video/gstbasevideocodec.h
@@ -125,6 +125,8 @@ struct _GstVideoFrame
   int n_fields;
 
   void *coder_hook;
+  GDestroyNotify coder_hook_destroy_notify;
+
   GstClockTime deadline;
 
   gboolean force_keyframe;
diff --git a/gst-libs/gst/video/gstbasevideodecoder.c b/gst-libs/gst/video/gstbasevideodecoder.c
index aca8d5cdfa..81c84beb99 100644
--- a/gst-libs/gst/video/gstbasevideodecoder.c
+++ b/gst-libs/gst/video/gstbasevideodecoder.c
@@ -1288,6 +1288,9 @@ gst_base_video_decoder_free_frame (GstVideoFrame * frame)
     gst_buffer_unref (frame->src_buffer);
   }
 
+  if (frame->coder_hook_destroy_notify && frame->coder_hook)
+    frame->coder_hook_destroy_notify (frame->coder_hook);
+
   g_free (frame);
 }
 

From 525875727aa91998c238fc13fe4477b60527741b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Mon, 27 Jun 2011 09:41:40 +0200
Subject: [PATCH 050/158] basevideo: Add the caps to the GstVideoState and
 clean up caps/codec_data properly

Having access to the caps in ::set_format can be useful if
non-standard caps fields like the h264 alignment must be accessed.
---
 gst-libs/gst/video/gstbasevideocodec.c   | 3 +++
 gst-libs/gst/video/gstbasevideocodec.h   | 1 +
 gst-libs/gst/video/gstbasevideodecoder.c | 4 ++++
 3 files changed, 8 insertions(+)

diff --git a/gst-libs/gst/video/gstbasevideocodec.c b/gst-libs/gst/video/gstbasevideocodec.c
index f2d4ee6ca6..c605b39bf0 100644
--- a/gst-libs/gst/video/gstbasevideocodec.c
+++ b/gst-libs/gst/video/gstbasevideocodec.c
@@ -114,6 +114,9 @@ gst_base_video_codec_reset (GstBaseVideoCodec * base_video_codec)
 
   base_video_codec->bytes = 0;
   base_video_codec->time = 0;
+
+  gst_buffer_replace (&base_video_codec->state.codec_data, NULL);
+  gst_caps_replace (&base_video_codec->state.caps, NULL);
 }
 
 static void
diff --git a/gst-libs/gst/video/gstbasevideocodec.h b/gst-libs/gst/video/gstbasevideocodec.h
index e9431e20ab..2fa6015d97 100644
--- a/gst-libs/gst/video/gstbasevideocodec.h
+++ b/gst-libs/gst/video/gstbasevideocodec.h
@@ -86,6 +86,7 @@ typedef struct _GstBaseVideoCodecClass GstBaseVideoCodecClass;
 
 struct _GstVideoState
 {
+  GstCaps *caps;
   GstVideoFormat format;
   int width, height;
   int fps_n, fps_d;
diff --git a/gst-libs/gst/video/gstbasevideodecoder.c b/gst-libs/gst/video/gstbasevideodecoder.c
index 81c84beb99..4f1e8e1555 100644
--- a/gst-libs/gst/video/gstbasevideodecoder.c
+++ b/gst-libs/gst/video/gstbasevideodecoder.c
@@ -255,8 +255,12 @@ gst_base_video_decoder_sink_setcaps (GstPad * pad, GstCaps * caps)
 
   state = &GST_BASE_VIDEO_CODEC (base_video_decoder)->state;
 
+  gst_buffer_replace (&state->codec_data, NULL);
+  gst_caps_replace (&state->caps, NULL);
   memset (state, 0, sizeof (GstVideoState));
 
+  state->caps = gst_caps_ref (caps);
+
   structure = gst_caps_get_structure (caps, 0);
 
   gst_video_format_parse_caps (caps, NULL, &state->width, &state->height);

From f341386b64c5fd8f7f90cc47259b1a2ce2816ea9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Tue, 28 Jun 2011 11:47:25 +0200
Subject: [PATCH 051/158] basevideodecoder: Don't reorder serialized src events

And allow to drop EOS by the subclass if ::finish returns
DROPPED. This requires that the subclass sends EOS manually later.

Fixes bug #653544.
---
 gst-libs/gst/video/gstbasevideocodec.c   |  3 +
 gst-libs/gst/video/gstbasevideocodec.h   |  4 ++
 gst-libs/gst/video/gstbasevideodecoder.c | 85 +++++++++++++++++++-----
 gst-libs/gst/video/gstbasevideodecoder.h |  9 +++
 4 files changed, 86 insertions(+), 15 deletions(-)

diff --git a/gst-libs/gst/video/gstbasevideocodec.c b/gst-libs/gst/video/gstbasevideocodec.c
index c605b39bf0..db5112b047 100644
--- a/gst-libs/gst/video/gstbasevideocodec.c
+++ b/gst-libs/gst/video/gstbasevideocodec.c
@@ -185,6 +185,9 @@ gst_base_video_codec_free_frame (GstVideoFrame * frame)
     gst_buffer_unref (frame->src_buffer);
   }
 
+  g_list_foreach (frame->events, (GFunc) gst_event_unref, NULL);
+  g_list_free (frame->events);
+
   if (frame->coder_hook_destroy_notify && frame->coder_hook)
     frame->coder_hook_destroy_notify (frame->coder_hook);
 
diff --git a/gst-libs/gst/video/gstbasevideocodec.h b/gst-libs/gst/video/gstbasevideocodec.h
index 2fa6015d97..cffc39610d 100644
--- a/gst-libs/gst/video/gstbasevideocodec.h
+++ b/gst-libs/gst/video/gstbasevideocodec.h
@@ -131,6 +131,10 @@ struct _GstVideoFrame
   GstClockTime deadline;
 
   gboolean force_keyframe;
+
+  /* Events that should be pushed downstream *before*
+   * the next src_buffer */
+  GList *events;
 };
 
 struct _GstBaseVideoCodec
diff --git a/gst-libs/gst/video/gstbasevideodecoder.c b/gst-libs/gst/video/gstbasevideodecoder.c
index 4f1e8e1555..037a92a697 100644
--- a/gst-libs/gst/video/gstbasevideodecoder.c
+++ b/gst-libs/gst/video/gstbasevideodecoder.c
@@ -237,6 +237,32 @@ gst_base_video_decoder_init (GstBaseVideoDecoder * base_video_decoder,
   base_video_decoder->sink_clipping = TRUE;
 }
 
+static gboolean
+gst_base_video_decoder_push_src_event (GstBaseVideoDecoder * decoder,
+    GstEvent * event)
+{
+  /* Forward non-serialized events and EOS/FLUSH_STOP immediately.
+   * For EOS this is required because no buffer or serialized event
+   * will come after EOS and nothing could trigger another
+   * _finish_frame() call.   *
+   * If the subclass handles sending of EOS manually it can return
+   * _DROPPED from ::finish() and all other subclasses should have
+   * decoded/flushed all remaining data before this
+   *
+   * For FLUSH_STOP this is required because it is expected
+   * to be forwarded immediately and no buffers are queued anyway.
+   */
+  if (!GST_EVENT_IS_SERIALIZED (event)
+      || GST_EVENT_TYPE (event) == GST_EVENT_EOS
+      || GST_EVENT_TYPE (event) == GST_EVENT_FLUSH_STOP)
+    return gst_pad_push_event (decoder->base_video_codec.srcpad, event);
+
+  decoder->current_frame_events =
+      g_list_prepend (decoder->current_frame_events, event);
+
+  return TRUE;
+}
+
 static gboolean
 gst_base_video_decoder_sink_setcaps (GstPad * pad, GstCaps * caps)
 {
@@ -338,6 +364,9 @@ gst_base_video_decoder_flush (GstBaseVideoDecoder * dec, gboolean hard)
         GST_FORMAT_UNDEFINED);
     gst_base_video_decoder_clear_queues (dec);
     dec->error_count = 0;
+    g_list_foreach (dec->current_frame_events, (GFunc) gst_event_unref, NULL);
+    g_list_free (dec->current_frame_events);
+    dec->current_frame_events = NULL;
   }
   /* and get (re)set for the sequel */
   gst_base_video_decoder_reset (dec, FALSE);
@@ -368,9 +397,9 @@ gst_base_video_decoder_sink_event (GstPad * pad, GstEvent * event)
   switch (GST_EVENT_TYPE (event)) {
     case GST_EVENT_EOS:
     {
+      GstFlowReturn flow_ret;
+      ;
       if (!base_video_decoder->packetized) {
-        GstFlowReturn flow_ret;
-
         do {
           flow_ret =
               base_video_decoder_class->parse_data (base_video_decoder, TRUE);
@@ -378,12 +407,13 @@ gst_base_video_decoder_sink_event (GstPad * pad, GstEvent * event)
       }
 
       if (base_video_decoder_class->finish) {
-        base_video_decoder_class->finish (base_video_decoder);
+        flow_ret = base_video_decoder_class->finish (base_video_decoder);
+      } else {
+        flow_ret = GST_FLOW_OK;
       }
 
-      ret =
-          gst_pad_push_event (GST_BASE_VIDEO_CODEC_SRC_PAD (base_video_decoder),
-          event);
+      if (flow_ret == GST_FLOW_OK)
+        ret = gst_base_video_decoder_push_src_event (base_video_decoder, event);
     }
       break;
     case GST_EVENT_NEWSEGMENT:
@@ -445,9 +475,7 @@ gst_base_video_decoder_sink_event (GstPad * pad, GstEvent * event)
       gst_segment_set_newsegment_full (segment,
           update, rate, arate, format, start, stop, pos);
 
-      ret =
-          gst_pad_push_event (GST_BASE_VIDEO_CODEC_SRC_PAD (base_video_decoder),
-          event);
+      ret = gst_base_video_decoder_push_src_event (base_video_decoder, event);
       break;
     }
     case GST_EVENT_FLUSH_STOP:
@@ -457,9 +485,7 @@ gst_base_video_decoder_sink_event (GstPad * pad, GstEvent * event)
     }
     default:
       /* FIXME this changes the order of events */
-      ret =
-          gst_pad_push_event (GST_BASE_VIDEO_CODEC_SRC_PAD (base_video_decoder),
-          event);
+      ret = gst_base_video_decoder_push_src_event (base_video_decoder, event);
       break;
   }
 
@@ -1207,9 +1233,7 @@ gst_base_video_decoder_chain (GstPad * pad, GstBuffer * buf)
     event = gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_TIME, 0,
         GST_CLOCK_TIME_NONE, 0);
 
-    ret =
-        gst_pad_push_event (GST_BASE_VIDEO_CODEC_SRC_PAD (base_video_decoder),
-        event);
+    ret = gst_base_video_decoder_push_src_event (base_video_decoder, event);
     if (!ret) {
       GST_ERROR_OBJECT (base_video_decoder, "new segment event ret=%d", ret);
       return GST_FLOW_ERROR;
@@ -1272,6 +1296,10 @@ gst_base_video_decoder_change_state (GstElement * element,
         base_video_decoder_class->stop (base_video_decoder);
       }
       gst_base_video_decoder_reset (base_video_decoder, TRUE);
+      g_list_foreach (base_video_decoder->current_frame_events,
+          (GFunc) gst_event_unref, NULL);
+      g_list_free (base_video_decoder->current_frame_events);
+      base_video_decoder->current_frame_events = NULL;
       break;
     default:
       break;
@@ -1292,6 +1320,9 @@ gst_base_video_decoder_free_frame (GstVideoFrame * frame)
     gst_buffer_unref (frame->src_buffer);
   }
 
+  g_list_foreach (frame->events, (GFunc) gst_event_unref, NULL);
+  g_list_free (frame->events);
+
   if (frame->coder_hook_destroy_notify && frame->coder_hook)
     frame->coder_hook_destroy_notify (frame->coder_hook);
 
@@ -1317,6 +1348,9 @@ gst_base_video_decoder_new_frame (GstBaseVideoDecoder * base_video_decoder)
   frame->presentation_duration = GST_CLOCK_TIME_NONE;
   frame->n_fields = 2;
 
+  frame->events = base_video_decoder->current_frame_events;
+  base_video_decoder->current_frame_events = NULL;
+
   return frame;
 }
 
@@ -1339,6 +1373,7 @@ gst_base_video_decoder_finish_frame (GstBaseVideoDecoder * base_video_decoder,
   GstVideoState *state = &GST_BASE_VIDEO_CODEC (base_video_decoder)->state;
   GstBuffer *src_buffer;
   GstFlowReturn ret = GST_FLOW_OK;
+  GList *l;
 
   GST_LOG_OBJECT (base_video_decoder, "finish frame");
   GST_LOG_OBJECT (base_video_decoder, "n %d in %d out %d",
@@ -1350,6 +1385,26 @@ gst_base_video_decoder_finish_frame (GstBaseVideoDecoder * base_video_decoder,
       "finish frame sync=%d pts=%" GST_TIME_FORMAT, frame->is_sync_point,
       GST_TIME_ARGS (frame->presentation_timestamp));
 
+  /* Push all pending events that arrived before this frame */
+  for (l = base_video_decoder->base_video_codec.frames; l; l = l->next) {
+    GstVideoFrame *tmp = l->data;
+
+    if (tmp->events) {
+      GList *k, *events;
+
+      events = tmp->events;
+      tmp->events = NULL;
+
+      for (k = g_list_last (events); k; k = k->prev)
+        gst_pad_push_event (base_video_decoder->base_video_codec.srcpad,
+            k->data);
+      g_list_free (events);
+    }
+
+    if (tmp == frame)
+      break;
+  }
+
   if (GST_CLOCK_TIME_IS_VALID (frame->presentation_timestamp)) {
     if (frame->presentation_timestamp != base_video_decoder->timestamp_offset) {
       GST_DEBUG_OBJECT (base_video_decoder,
diff --git a/gst-libs/gst/video/gstbasevideodecoder.h b/gst-libs/gst/video/gstbasevideodecoder.h
index 235dcb11e1..98c29e5ebd 100644
--- a/gst-libs/gst/video/gstbasevideodecoder.h
+++ b/gst-libs/gst/video/gstbasevideodecoder.h
@@ -65,6 +65,13 @@ G_BEGIN_DECLS
  **/
 #define GST_BASE_VIDEO_DECODER_FLOW_NEED_DATA GST_FLOW_CUSTOM_SUCCESS
 
+/**
+ * GST_BASE_VIDEO_DECODER_FLOW_DROPPED:
+ *
+ * Returned when the event/buffer should be dropped.
+ */
+#define GST_BASE_VIDEO_DECODER_FLOW_DROPPED GST_FLOW_CUSTOM_SUCCESS_1
+
 typedef struct _GstBaseVideoDecoder GstBaseVideoDecoder;
 typedef struct _GstBaseVideoDecoderClass GstBaseVideoDecoderClass;
 
@@ -136,6 +143,8 @@ struct _GstBaseVideoDecoder
    * only available during parsing */
   /* FIXME remove and add parameter to method */
   GstVideoFrame    *current_frame;
+  /* events that should apply to the current frame */
+  GList            *current_frame_events;
   /* relative offset of input data */
   guint64           input_offset;
   /* relative offset of frame */

From 5f55a745714bb4e42c4b37fa33b4e7291ae1a92f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Sat, 9 Jul 2011 11:09:12 +0200
Subject: [PATCH 052/158] basevideo: Use GSlice for allocating GstVideoFrame
 and don't duplicate code in the decoder base class

---
 gst-libs/gst/video/gstbasevideocodec.c   |  6 ++--
 gst-libs/gst/video/gstbasevideodecoder.c | 40 +++++-------------------
 2 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/gst-libs/gst/video/gstbasevideocodec.c b/gst-libs/gst/video/gstbasevideocodec.c
index db5112b047..ea35b0174a 100644
--- a/gst-libs/gst/video/gstbasevideocodec.c
+++ b/gst-libs/gst/video/gstbasevideocodec.c
@@ -166,7 +166,7 @@ gst_base_video_codec_new_frame (GstBaseVideoCodec * base_video_codec)
 {
   GstVideoFrame *frame;
 
-  frame = g_malloc0 (sizeof (GstVideoFrame));
+  frame = g_slice_new0 (GstVideoFrame);
 
   frame->system_frame_number = base_video_codec->system_frame_number;
   base_video_codec->system_frame_number++;
@@ -177,6 +177,8 @@ gst_base_video_codec_new_frame (GstBaseVideoCodec * base_video_codec)
 void
 gst_base_video_codec_free_frame (GstVideoFrame * frame)
 {
+  g_return_if_fail (frame != NULL);
+
   if (frame->sink_buffer) {
     gst_buffer_unref (frame->sink_buffer);
   }
@@ -191,5 +193,5 @@ gst_base_video_codec_free_frame (GstVideoFrame * frame)
   if (frame->coder_hook_destroy_notify && frame->coder_hook)
     frame->coder_hook_destroy_notify (frame->coder_hook);
 
-  g_free (frame);
+  g_slice_free (GstVideoFrame, frame);
 }
diff --git a/gst-libs/gst/video/gstbasevideodecoder.c b/gst-libs/gst/video/gstbasevideodecoder.c
index 037a92a697..3862a50ad5 100644
--- a/gst-libs/gst/video/gstbasevideodecoder.c
+++ b/gst-libs/gst/video/gstbasevideodecoder.c
@@ -168,7 +168,6 @@ static guint64 gst_base_video_decoder_get_field_duration (GstBaseVideoDecoder *
     base_video_decoder, int n_fields);
 static GstVideoFrame *gst_base_video_decoder_new_frame (GstBaseVideoDecoder *
     base_video_decoder);
-static void gst_base_video_decoder_free_frame (GstVideoFrame * frame);
 
 static void gst_base_video_decoder_clear_queues (GstBaseVideoDecoder * dec);
 
@@ -906,13 +905,13 @@ gst_base_video_decoder_clear_queues (GstBaseVideoDecoder * dec)
   g_list_foreach (dec->gather, (GFunc) gst_mini_object_unref, NULL);
   g_list_free (dec->gather);
   dec->gather = NULL;
-  g_list_foreach (dec->decode, (GFunc) gst_base_video_decoder_free_frame, NULL);
+  g_list_foreach (dec->decode, (GFunc) gst_base_video_codec_free_frame, NULL);
   g_list_free (dec->decode);
   dec->decode = NULL;
   g_list_foreach (dec->parse, (GFunc) gst_mini_object_unref, NULL);
   g_list_free (dec->parse);
   dec->decode = NULL;
-  g_list_foreach (dec->parse_gather, (GFunc) gst_base_video_decoder_free_frame,
+  g_list_foreach (dec->parse_gather, (GFunc) gst_base_video_codec_free_frame,
       NULL);
   g_list_free (dec->parse_gather);
   dec->decode = NULL;
@@ -947,7 +946,7 @@ gst_base_video_decoder_reset (GstBaseVideoDecoder * base_video_decoder,
   base_video_decoder->timestamps = NULL;
 
   if (base_video_decoder->current_frame) {
-    gst_base_video_decoder_free_frame (base_video_decoder->current_frame);
+    gst_base_video_codec_free_frame (base_video_decoder->current_frame);
     base_video_decoder->current_frame = NULL;
   }
 
@@ -1072,7 +1071,7 @@ gst_base_video_decoder_flush_decode (GstBaseVideoDecoder * dec)
 
     next = g_list_next (walk);
     if (dec->current_frame)
-      gst_base_video_decoder_free_frame (dec->current_frame);
+      gst_base_video_codec_free_frame (dec->current_frame);
     dec->current_frame = frame;
     /* decode buffer, resulting data prepended to queue */
     res = gst_base_video_decoder_have_frame_2 (dec);
@@ -1308,37 +1307,14 @@ gst_base_video_decoder_change_state (GstElement * element,
   return ret;
 }
 
-static void
-gst_base_video_decoder_free_frame (GstVideoFrame * frame)
-{
-  g_return_if_fail (frame != NULL);
-
-  if (frame->sink_buffer) {
-    gst_buffer_unref (frame->sink_buffer);
-  }
-  if (frame->src_buffer) {
-    gst_buffer_unref (frame->src_buffer);
-  }
-
-  g_list_foreach (frame->events, (GFunc) gst_event_unref, NULL);
-  g_list_free (frame->events);
-
-  if (frame->coder_hook_destroy_notify && frame->coder_hook)
-    frame->coder_hook_destroy_notify (frame->coder_hook);
-
-  g_free (frame);
-}
-
 static GstVideoFrame *
 gst_base_video_decoder_new_frame (GstBaseVideoDecoder * base_video_decoder)
 {
   GstVideoFrame *frame;
 
-  frame = g_malloc0 (sizeof (GstVideoFrame));
-
-  frame->system_frame_number =
-      GST_BASE_VIDEO_CODEC (base_video_decoder)->system_frame_number;
-  GST_BASE_VIDEO_CODEC (base_video_decoder)->system_frame_number++;
+  frame =
+      gst_base_video_codec_new_frame (GST_BASE_VIDEO_CODEC
+      (base_video_decoder));
 
   frame->decode_frame_number = frame->system_frame_number -
       base_video_decoder->reorder_depth;
@@ -1572,7 +1548,7 @@ gst_base_video_decoder_finish_frame (GstBaseVideoDecoder * base_video_decoder,
 done:
   GST_BASE_VIDEO_CODEC (base_video_decoder)->frames =
       g_list_remove (GST_BASE_VIDEO_CODEC (base_video_decoder)->frames, frame);
-  gst_base_video_decoder_free_frame (frame);
+  gst_base_video_codec_free_frame (frame);
 
   return ret;
 }

From b0d619855c6515e427377cce9e20e86c2a4ac5f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Sat, 9 Jul 2011 11:31:02 +0200
Subject: [PATCH 053/158] vp8enc: Use destroy notify to free the coder hook

---
 ext/vp8/gstvp8enc.c | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/ext/vp8/gstvp8enc.c b/ext/vp8/gstvp8enc.c
index 29f07f73b8..c9deb5bf3d 100644
--- a/ext/vp8/gstvp8enc.c
+++ b/ext/vp8/gstvp8enc.c
@@ -65,6 +65,24 @@ typedef struct
   GList *invisible;
 } GstVP8EncCoderHook;
 
+static void
+_gst_mini_object_unref0 (GstMiniObject * obj)
+{
+  if (obj)
+    gst_mini_object_unref (obj);
+}
+
+static void
+gst_vp8_enc_coder_hook_free (GstVP8EncCoderHook * hook)
+{
+  if (hook->image)
+    g_slice_free (vpx_image_t, hook->image);
+
+  g_list_foreach (hook->invisible, (GFunc) _gst_mini_object_unref0, NULL);
+  g_list_free (hook->invisible);
+  g_slice_free (GstVP8EncCoderHook, hook);
+}
+
 #define DEFAULT_BITRATE 0
 #define DEFAULT_MODE VPX_VBR
 #define DEFAULT_MIN_QUANTIZER 0
@@ -866,6 +884,8 @@ gst_vp8_enc_handle_frame (GstBaseVideoEncoder * base_video_encoder,
   hook = g_slice_new0 (GstVP8EncCoderHook);
   hook->image = image;
   frame->coder_hook = hook;
+  frame->coder_hook_destroy_notify =
+      (GDestroyNotify) gst_vp8_enc_coder_hook_free;
 
   if (frame->force_keyframe) {
     flags |= VPX_EFLAG_FORCE_KF;
@@ -899,13 +919,6 @@ _to_granulepos (guint64 frame_end_number, guint inv_count, guint keyframe_dist)
   return granulepos;
 }
 
-static void
-_gst_mini_object_unref0 (GstMiniObject * obj)
-{
-  if (obj)
-    gst_mini_object_unref (obj);
-}
-
 static GstFlowReturn
 gst_vp8_enc_shape_output (GstBaseVideoEncoder * base_video_encoder,
     GstVideoFrame * frame)
@@ -981,13 +994,6 @@ gst_vp8_enc_shape_output (GstBaseVideoEncoder * base_video_encoder,
   }
 
 done:
-  if (hook) {
-    g_list_foreach (hook->invisible, (GFunc) _gst_mini_object_unref0, NULL);
-    g_list_free (hook->invisible);
-    g_slice_free (GstVP8EncCoderHook, hook);
-    frame->coder_hook = NULL;
-  }
-
   return ret;
 }
 

From e61d3d1a0c676b860e2e516e2d2cb171be0d4638 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Sat, 9 Jul 2011 11:40:17 +0200
Subject: [PATCH 054/158] basevideo: Move the utils from the codec header to
 its own header

---
 gst-libs/gst/video/Makefile.am           |  3 +-
 gst-libs/gst/video/gstbasevideocodec.h   | 11 ------
 gst-libs/gst/video/gstbasevideodecoder.c |  1 +
 gst-libs/gst/video/gstbasevideoencoder.c |  1 +
 gst-libs/gst/video/gstbasevideoutils.c   |  2 +-
 gst-libs/gst/video/gstbasevideoutils.h   | 46 ++++++++++++++++++++++++
 6 files changed, 51 insertions(+), 13 deletions(-)
 create mode 100644 gst-libs/gst/video/gstbasevideoutils.h

diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
index a31276b1bd..cca3fefcf9 100644
--- a/gst-libs/gst/video/Makefile.am
+++ b/gst-libs/gst/video/Makefile.am
@@ -4,14 +4,15 @@ lib_LTLIBRARIES = libgstbasevideo-@GST_MAJORMINOR@.la
 CLEANFILES = $(BUILT_SOURCES)
 
 libgstbasevideo_@GST_MAJORMINOR@_la_SOURCES = \
-	gstbasevideoutils.c \
 	gstbasevideocodec.c \
+	gstbasevideoutils.c \
 	gstbasevideodecoder.c \
 	gstbasevideoencoder.c
 
 libgstbasevideo_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/video
 libgstbasevideo_@GST_MAJORMINOR@include_HEADERS = \
 	gstbasevideocodec.h \
+	gstbasevideoutils.h \
 	gstbasevideodecoder.h \
 	gstbasevideoencoder.h
 
diff --git a/gst-libs/gst/video/gstbasevideocodec.h b/gst-libs/gst/video/gstbasevideocodec.h
index cffc39610d..9fc2cb27d9 100644
--- a/gst-libs/gst/video/gstbasevideocodec.h
+++ b/gst-libs/gst/video/gstbasevideocodec.h
@@ -175,17 +175,6 @@ GType gst_base_video_codec_get_type (void);
 GstVideoFrame * gst_base_video_codec_new_frame (GstBaseVideoCodec *base_video_codec);
 void gst_base_video_codec_free_frame (GstVideoFrame *frame);
 
-
-gboolean gst_base_video_rawvideo_convert (GstVideoState *state,
-    GstFormat src_format, gint64 src_value,
-    GstFormat * dest_format, gint64 *dest_value);
-gboolean gst_base_video_encoded_video_convert (GstVideoState * state,
-    gint64 bytes, gint64 time, GstFormat src_format,
-    gint64 src_value, GstFormat * dest_format, gint64 * dest_value);
-
-GstClockTime gst_video_state_get_timestamp (const GstVideoState *state,
-    GstSegment *segment, int frame_number);
-
 G_END_DECLS
 
 #endif
diff --git a/gst-libs/gst/video/gstbasevideodecoder.c b/gst-libs/gst/video/gstbasevideodecoder.c
index 3862a50ad5..48df6ea0af 100644
--- a/gst-libs/gst/video/gstbasevideodecoder.c
+++ b/gst-libs/gst/video/gstbasevideodecoder.c
@@ -128,6 +128,7 @@
 #endif
 
 #include "gstbasevideodecoder.h"
+#include "gstbasevideoutils.h"
 
 #include <string.h>
 
diff --git a/gst-libs/gst/video/gstbasevideoencoder.c b/gst-libs/gst/video/gstbasevideoencoder.c
index 1c27a72ef1..c69424d9c8 100644
--- a/gst-libs/gst/video/gstbasevideoencoder.c
+++ b/gst-libs/gst/video/gstbasevideoencoder.c
@@ -106,6 +106,7 @@
 #endif
 
 #include "gstbasevideoencoder.h"
+#include "gstbasevideoutils.h"
 
 GST_DEBUG_CATEGORY (basevideoencoder_debug);
 #define GST_CAT_DEFAULT basevideoencoder_debug
diff --git a/gst-libs/gst/video/gstbasevideoutils.c b/gst-libs/gst/video/gstbasevideoutils.c
index 2d83213478..507ad07dae 100644
--- a/gst-libs/gst/video/gstbasevideoutils.c
+++ b/gst-libs/gst/video/gstbasevideoutils.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-#include "gstbasevideocodec.h"
+#include "gstbasevideoutils.h"
 
 #include <string.h>
 
diff --git a/gst-libs/gst/video/gstbasevideoutils.h b/gst-libs/gst/video/gstbasevideoutils.h
new file mode 100644
index 0000000000..aeca2d1b7e
--- /dev/null
+++ b/gst-libs/gst/video/gstbasevideoutils.h
@@ -0,0 +1,46 @@
+/* GStreamer
+ * Copyright (C) 2008 David Schleef <ds@schleef.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.
+ */
+
+#ifndef _GST_BASE_VIDEO_UTILS_H_
+#define _GST_BASE_VIDEO_UTILS_H_
+
+#ifndef GST_USE_UNSTABLE_API
+#warning "GstBaseVideoCodec is unstable API and may change in future."
+#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
+#endif
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include "gstbasevideocodec.h"
+
+G_BEGIN_DECLS
+
+gboolean gst_base_video_rawvideo_convert (GstVideoState *state,
+    GstFormat src_format, gint64 src_value,
+    GstFormat * dest_format, gint64 *dest_value);
+gboolean gst_base_video_encoded_video_convert (GstVideoState * state,
+    gint64 bytes, gint64 time, GstFormat src_format,
+    gint64 src_value, GstFormat * dest_format, gint64 * dest_value);
+
+GstClockTime gst_video_state_get_timestamp (const GstVideoState *state,
+    GstSegment *segment, int frame_number);
+
+G_END_DECLS
+
+#endif

From 584859488bb7aea5b24643ee2be3736ee90fa7ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Mon, 11 Jul 2011 08:54:53 +0200
Subject: [PATCH 055/158] basevideodecoder: Work with a copy of the
 GstVideoState in setcaps until the caps are accepted

Also fix a refcount problem with the codec_data.
---
 gst-libs/gst/video/gstbasevideodecoder.c | 44 ++++++++++++++----------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/gst-libs/gst/video/gstbasevideodecoder.c b/gst-libs/gst/video/gstbasevideodecoder.c
index 48df6ea0af..487b6cd49f 100644
--- a/gst-libs/gst/video/gstbasevideodecoder.c
+++ b/gst-libs/gst/video/gstbasevideodecoder.c
@@ -270,7 +270,7 @@ gst_base_video_decoder_sink_setcaps (GstPad * pad, GstCaps * caps)
   GstBaseVideoDecoderClass *base_video_decoder_class;
   GstStructure *structure;
   const GValue *codec_data;
-  GstVideoState *state;
+  GstVideoState state;
   gboolean ret = TRUE;
 
   base_video_decoder = GST_BASE_VIDEO_DECODER (gst_pad_get_parent (pad));
@@ -279,41 +279,47 @@ gst_base_video_decoder_sink_setcaps (GstPad * pad, GstCaps * caps)
 
   GST_DEBUG_OBJECT (base_video_decoder, "setcaps %" GST_PTR_FORMAT, caps);
 
-  state = &GST_BASE_VIDEO_CODEC (base_video_decoder)->state;
+  memset (&state, 0, sizeof (state));
 
-  gst_buffer_replace (&state->codec_data, NULL);
-  gst_caps_replace (&state->caps, NULL);
-  memset (state, 0, sizeof (GstVideoState));
-
-  state->caps = gst_caps_ref (caps);
+  state.caps = gst_caps_ref (caps);
 
   structure = gst_caps_get_structure (caps, 0);
 
-  gst_video_format_parse_caps (caps, NULL, &state->width, &state->height);
+  gst_video_format_parse_caps (caps, NULL, &state.width, &state.height);
   /* this one fails if no framerate in caps */
-  if (!gst_video_parse_caps_framerate (caps, &state->fps_n, &state->fps_d)) {
-    state->fps_n = 0;
-    state->fps_d = 1;
+  if (!gst_video_parse_caps_framerate (caps, &state.fps_n, &state.fps_d)) {
+    state.fps_n = 0;
+    state.fps_d = 1;
   }
   /* but the p-a-r sets 1/1 instead, which is not quite informative ... */
   if (!gst_structure_has_field (structure, "pixel-aspect-ratio") ||
       !gst_video_parse_caps_pixel_aspect_ratio (caps,
-          &state->par_n, &state->par_d)) {
-    state->par_n = 0;
-    state->par_d = 1;
+          &state.par_n, &state.par_d)) {
+    state.par_n = 0;
+    state.par_d = 1;
   }
 
-  state->have_interlaced =
-      gst_video_format_parse_caps_interlaced (caps, &state->interlaced);
+  state.have_interlaced =
+      gst_video_format_parse_caps_interlaced (caps, &state.interlaced);
 
   codec_data = gst_structure_get_value (structure, "codec_data");
   if (codec_data && G_VALUE_TYPE (codec_data) == GST_TYPE_BUFFER) {
-    state->codec_data = gst_value_get_buffer (codec_data);
+    state.codec_data = GST_BUFFER (gst_value_dup_mini_object (codec_data));
   }
 
   if (base_video_decoder_class->set_format) {
-    ret = base_video_decoder_class->set_format (base_video_decoder,
-        &GST_BASE_VIDEO_CODEC (base_video_decoder)->state);
+    ret = base_video_decoder_class->set_format (base_video_decoder, &state);
+  }
+
+  if (ret) {
+    gst_buffer_replace (&GST_BASE_VIDEO_CODEC (base_video_decoder)->
+        state.codec_data, NULL);
+    gst_caps_replace (&GST_BASE_VIDEO_CODEC (base_video_decoder)->state.caps,
+        NULL);
+    GST_BASE_VIDEO_CODEC (base_video_decoder)->state = state;
+  } else {
+    gst_buffer_replace (&state.codec_data, NULL);
+    gst_caps_replace (&state.caps, NULL);
   }
 
   g_object_unref (base_video_decoder);

From caed64c7200f40568050f9ae262a91078ee08966 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Mon, 11 Jul 2011 09:35:25 +0200
Subject: [PATCH 056/158] basevideodecoder: Set the correct lists to NULL after
 freeing

---
 gst-libs/gst/video/gstbasevideodecoder.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gst-libs/gst/video/gstbasevideodecoder.c b/gst-libs/gst/video/gstbasevideodecoder.c
index 487b6cd49f..8b6c34472f 100644
--- a/gst-libs/gst/video/gstbasevideodecoder.c
+++ b/gst-libs/gst/video/gstbasevideodecoder.c
@@ -917,11 +917,11 @@ gst_base_video_decoder_clear_queues (GstBaseVideoDecoder * dec)
   dec->decode = NULL;
   g_list_foreach (dec->parse, (GFunc) gst_mini_object_unref, NULL);
   g_list_free (dec->parse);
-  dec->decode = NULL;
+  dec->parse = NULL;
   g_list_foreach (dec->parse_gather, (GFunc) gst_base_video_codec_free_frame,
       NULL);
   g_list_free (dec->parse_gather);
-  dec->decode = NULL;
+  dec->parse_gather = NULL;
 }
 
 static void

From 81f4c9e8bf9eb28c121c53c965c8aee6003acf0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Mon, 11 Jul 2011 11:28:40 +0200
Subject: [PATCH 057/158] basevideocodec: Protect access to the list of pending
 frames with the object lock

This is required if ::finish_frame() and all buffer output happens
on a different thread than the sinkpad streaming thread.
---
 gst-libs/gst/video/gstbasevideocodec.c   |  2 ++
 gst-libs/gst/video/gstbasevideocodec.h   |  2 +-
 gst-libs/gst/video/gstbasevideodecoder.c | 20 +++++++++++++++++---
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/gst-libs/gst/video/gstbasevideocodec.c b/gst-libs/gst/video/gstbasevideocodec.c
index ea35b0174a..31fa5e5df6 100644
--- a/gst-libs/gst/video/gstbasevideocodec.c
+++ b/gst-libs/gst/video/gstbasevideocodec.c
@@ -106,11 +106,13 @@ gst_base_video_codec_reset (GstBaseVideoCodec * base_video_codec)
 
   GST_DEBUG_OBJECT (base_video_codec, "reset");
 
+  GST_OBJECT_LOCK (base_video_codec);
   for (g = base_video_codec->frames; g; g = g_list_next (g)) {
     gst_base_video_codec_free_frame ((GstVideoFrame *) g->data);
   }
   g_list_free (base_video_codec->frames);
   base_video_codec->frames = NULL;
+  GST_OBJECT_UNLOCK (base_video_codec);
 
   base_video_codec->bytes = 0;
   base_video_codec->time = 0;
diff --git a/gst-libs/gst/video/gstbasevideocodec.h b/gst-libs/gst/video/gstbasevideocodec.h
index 9fc2cb27d9..c1e37120d9 100644
--- a/gst-libs/gst/video/gstbasevideocodec.h
+++ b/gst-libs/gst/video/gstbasevideocodec.h
@@ -147,7 +147,7 @@ struct _GstBaseVideoCodec
 
   guint64 system_frame_number;
 
-  GList *frames;
+  GList *frames;  /* Protected with OBJECT_LOCK */
   GstVideoState state;
   GstSegment segment;
 
diff --git a/gst-libs/gst/video/gstbasevideodecoder.c b/gst-libs/gst/video/gstbasevideodecoder.c
index 8b6c34472f..95cf991509 100644
--- a/gst-libs/gst/video/gstbasevideodecoder.c
+++ b/gst-libs/gst/video/gstbasevideodecoder.c
@@ -1359,10 +1359,14 @@ gst_base_video_decoder_finish_frame (GstBaseVideoDecoder * base_video_decoder,
   GList *l;
 
   GST_LOG_OBJECT (base_video_decoder, "finish frame");
+#ifndef GST_DISABLE_GST_DEBUG
+  GST_OBJECT_LOCK (base_video_decoder);
   GST_LOG_OBJECT (base_video_decoder, "n %d in %d out %d",
       g_list_length (GST_BASE_VIDEO_CODEC (base_video_decoder)->frames),
       gst_adapter_available (base_video_decoder->input_adapter),
       gst_adapter_available (base_video_decoder->output_adapter));
+  GST_OBJECT_UNLOCK (base_video_decoder);
+#endif
 
   GST_LOG_OBJECT (base_video_decoder,
       "finish frame sync=%d pts=%" GST_TIME_FORMAT, frame->is_sync_point,
@@ -1553,8 +1557,10 @@ gst_base_video_decoder_finish_frame (GstBaseVideoDecoder * base_video_decoder,
   }
 
 done:
+  GST_OBJECT_LOCK (base_video_decoder);
   GST_BASE_VIDEO_CODEC (base_video_decoder)->frames =
       g_list_remove (GST_BASE_VIDEO_CODEC (base_video_decoder)->frames, frame);
+  GST_OBJECT_UNLOCK (base_video_decoder);
   gst_base_video_codec_free_frame (frame);
 
   return ret;
@@ -1718,8 +1724,10 @@ gst_base_video_decoder_have_frame_2 (GstBaseVideoDecoder * base_video_decoder)
       GST_TIME_ARGS (frame->decode_timestamp));
   GST_LOG_OBJECT (base_video_decoder, "dist %d", frame->distance_from_sync);
 
+  GST_OBJECT_LOCK (base_video_decoder);
   GST_BASE_VIDEO_CODEC (base_video_decoder)->frames =
       g_list_append (GST_BASE_VIDEO_CODEC (base_video_decoder)->frames, frame);
+  GST_OBJECT_UNLOCK (base_video_decoder);
 
   frame->deadline =
       gst_segment_to_running_time (&GST_BASE_VIDEO_CODEC
@@ -1801,7 +1809,9 @@ gst_base_video_decoder_get_oldest_frame (GstBaseVideoDecoder *
 {
   GList *g;
 
+  GST_OBJECT_LOCK (base_video_decoder);
   g = g_list_first (GST_BASE_VIDEO_CODEC (base_video_decoder)->frames);
+  GST_OBJECT_UNLOCK (base_video_decoder);
 
   if (g == NULL)
     return NULL;
@@ -1820,17 +1830,21 @@ gst_base_video_decoder_get_frame (GstBaseVideoDecoder * base_video_decoder,
     int frame_number)
 {
   GList *g;
+  GstVideoFrame *frame = NULL;
 
+  GST_OBJECT_LOCK (base_video_decoder);
   for (g = g_list_first (GST_BASE_VIDEO_CODEC (base_video_decoder)->frames);
       g; g = g_list_next (g)) {
-    GstVideoFrame *frame = g->data;
+    GstVideoFrame *tmp = g->data;
 
     if (frame->system_frame_number == frame_number) {
-      return frame;
+      frame = tmp;
+      break;
     }
   }
+  GST_OBJECT_UNLOCK (base_video_decoder);
 
-  return NULL;
+  return frame;
 }
 
 /**

From 08823f80d672b17046d05a3920a0e7aba3fc44e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Mon, 11 Jul 2011 11:52:33 +0200
Subject: [PATCH 058/158] basevideodecoder: Also protect the list of pending
 frames from concurrent access when pushing all pendings events

---
 gst-libs/gst/video/gstbasevideodecoder.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/gst-libs/gst/video/gstbasevideodecoder.c b/gst-libs/gst/video/gstbasevideodecoder.c
index 95cf991509..3fd67a145a 100644
--- a/gst-libs/gst/video/gstbasevideodecoder.c
+++ b/gst-libs/gst/video/gstbasevideodecoder.c
@@ -1356,7 +1356,7 @@ gst_base_video_decoder_finish_frame (GstBaseVideoDecoder * base_video_decoder,
   GstVideoState *state = &GST_BASE_VIDEO_CODEC (base_video_decoder)->state;
   GstBuffer *src_buffer;
   GstFlowReturn ret = GST_FLOW_OK;
-  GList *l;
+  GList *l, *events = NULL;
 
   GST_LOG_OBJECT (base_video_decoder, "finish frame");
 #ifndef GST_DISABLE_GST_DEBUG
@@ -1373,24 +1373,28 @@ gst_base_video_decoder_finish_frame (GstBaseVideoDecoder * base_video_decoder,
       GST_TIME_ARGS (frame->presentation_timestamp));
 
   /* Push all pending events that arrived before this frame */
+  GST_OBJECT_LOCK (base_video_decoder);
   for (l = base_video_decoder->base_video_codec.frames; l; l = l->next) {
     GstVideoFrame *tmp = l->data;
 
     if (tmp->events) {
-      GList *k, *events;
+      GList *k;
 
-      events = tmp->events;
+      for (k = g_list_last (tmp->events); k; k = k->prev)
+        events = g_list_prepend (events, k->data);
+      g_list_free (tmp->events);
       tmp->events = NULL;
-
-      for (k = g_list_last (events); k; k = k->prev)
-        gst_pad_push_event (base_video_decoder->base_video_codec.srcpad,
-            k->data);
-      g_list_free (events);
     }
 
     if (tmp == frame)
       break;
   }
+  GST_OBJECT_UNLOCK (base_video_decoder);
+
+  for (l = g_list_last (events); l; l = l->next)
+    gst_pad_push_event (GST_BASE_VIDEO_CODEC_SRC_PAD (base_video_decoder),
+        l->data);
+  g_list_free (events);
 
   if (GST_CLOCK_TIME_IS_VALID (frame->presentation_timestamp)) {
     if (frame->presentation_timestamp != base_video_decoder->timestamp_offset) {

From a59246c1d198fc378bef477fd4f39477b93b520d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Mon, 11 Jul 2011 12:36:42 +0200
Subject: [PATCH 059/158] basevideodecoder: Track present position on discont
 before resetting it

---
 gst-libs/gst/video/gstbasevideodecoder.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gst-libs/gst/video/gstbasevideodecoder.c b/gst-libs/gst/video/gstbasevideodecoder.c
index 3fd67a145a..f2b2a68ee5 100644
--- a/gst-libs/gst/video/gstbasevideodecoder.c
+++ b/gst-libs/gst/video/gstbasevideodecoder.c
@@ -1250,12 +1250,13 @@ gst_base_video_decoder_chain (GstPad * pad, GstBuffer * buf)
     gint64 ts, index;
 
     GST_DEBUG_OBJECT (base_video_decoder, "received DISCONT buffer");
-    gst_base_video_decoder_flush (base_video_decoder, FALSE);
 
     /* track present position */
     ts = base_video_decoder->timestamp_offset;
     index = base_video_decoder->field_index;
 
+    gst_base_video_decoder_flush (base_video_decoder, FALSE);
+
     /* buffer may claim DISCONT loudly, if it can't tell us where we are now,
      * we'll stick to where we were ...
      * Particularly useful/needed for upstream BYTE based */

From 83c4e8814e77b780fee20aa65b673623ac5a3e66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Mon, 11 Jul 2011 12:59:07 +0200
Subject: [PATCH 060/158] basevideodecoder: First inform subclass about
 resetting before resetting/freeing all internal state

The subclass might want to access the old state.
---
 gst-libs/gst/video/gstbasevideodecoder.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gst-libs/gst/video/gstbasevideodecoder.c b/gst-libs/gst/video/gstbasevideodecoder.c
index f2b2a68ee5..0278abc83e 100644
--- a/gst-libs/gst/video/gstbasevideodecoder.c
+++ b/gst-libs/gst/video/gstbasevideodecoder.c
@@ -359,6 +359,11 @@ gst_base_video_decoder_flush (GstBaseVideoDecoder * dec, gboolean hard)
 
   GST_LOG_OBJECT (dec, "flush hard %d", hard);
 
+  /* Inform subclass */
+  /* FIXME ? only if hard, or tell it if hard ? */
+  if (klass->reset)
+    klass->reset (dec);
+
   /* FIXME make some more distinction between hard and soft,
    * but subclass may not be prepared for that */
   /* FIXME perhaps also clear pending frames ?,
@@ -377,11 +382,6 @@ gst_base_video_decoder_flush (GstBaseVideoDecoder * dec, gboolean hard)
   /* and get (re)set for the sequel */
   gst_base_video_decoder_reset (dec, FALSE);
 
-  /* also inform subclass */
-  /* FIXME ? only if hard, or tell it if hard ? */
-  if (klass->reset)
-    klass->reset (dec);
-
   return ret;
 }
 

From 666807ed695be260befcba15638ef53789d9650d Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer.subscriptions@damagehead.com>
Date: Tue, 12 Jul 2011 01:18:16 +0530
Subject: [PATCH 061/158] mpegtsmux: fix segfault if gst_collect_pads_pop ()
 returns no buffer

In mpegtsmux_choose_best_stream () call if the gst_collect_pads_pop () call
returns no buffer (NULL), the plugin SegFaults in the gst_buffer_unref call.
To fix this we check if a valid buffer is returned before calling
gst_buffer_unref ().

Fixes bug #654416.
---
 gst/mpegtsmux/mpegtsmux.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gst/mpegtsmux/mpegtsmux.c b/gst/mpegtsmux/mpegtsmux.c
index 6ba24ec987..606e1d7f3a 100644
--- a/gst/mpegtsmux/mpegtsmux.c
+++ b/gst/mpegtsmux/mpegtsmux.c
@@ -642,7 +642,9 @@ mpegtsmux_choose_best_stream (MpegTsMux * mux)
     }
   }
   if (c_best) {
-    gst_buffer_unref (gst_collect_pads_pop (mux->collect, c_best));
+    GstBuffer *buffer;
+    if ((buffer = gst_collect_pads_pop (mux->collect, c_best)))
+      gst_buffer_unref (buffer);
   }
 
   return best;

From dcd54fced185c3ba12362137c62ad3c0293a5592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
Date: Tue, 12 Jul 2011 17:50:27 -0400
Subject: [PATCH 062/158] mpegtsdemux: Fix unused-but-set warnings

---
 gst/mpegdemux/mpegtspacketizer.c | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/gst/mpegdemux/mpegtspacketizer.c b/gst/mpegdemux/mpegtspacketizer.c
index 94ffd9472d..83e89ac93d 100644
--- a/gst/mpegdemux/mpegtspacketizer.c
+++ b/gst/mpegdemux/mpegtspacketizer.c
@@ -336,7 +336,7 @@ static gboolean
 mpegts_packetizer_parse_descriptors (MpegTSPacketizer * packetizer,
     guint8 ** buffer, guint8 * buffer_end, GValueArray * descriptors)
 {
-  guint8 tag, length;
+  guint8 length;
   guint8 *data;
   GValue value = { 0 };
   GString *desc;
@@ -344,7 +344,6 @@ mpegts_packetizer_parse_descriptors (MpegTSPacketizer * packetizer,
   data = *buffer;
 
   while (data < buffer_end) {
-    tag = *data++;
     length = *data++;
 
     if (data + length > buffer_end) {
@@ -353,7 +352,7 @@ mpegts_packetizer_parse_descriptors (MpegTSPacketizer * packetizer,
       goto error;
     }
 
-    /* include tag and length */
+    /* include length */
     desc = g_string_new_len ((gchar *) data - 2, length + 2);
     data += length;
     /* G_TYPE_GSTRING is a GBoxed type and is used so properly marshalled from
@@ -1285,7 +1284,6 @@ mpegts_packetizer_parse_sdt (MpegTSPacketizer * packetizer,
   guint16 transport_stream_id, original_network_id, service_id;
   guint tmp;
   guint sdt_info_length;
-  gboolean EIT_schedule, EIT_present_following;
   guint8 running_status;
   gboolean scrambled;
   guint descriptors_loop_length;
@@ -1356,9 +1354,6 @@ mpegts_packetizer_parse_sdt (MpegTSPacketizer * packetizer,
     service_id = GST_READ_UINT16_BE (data);
     data += 2;
 
-    EIT_schedule = ((*data & 0x02) == 2);
-    EIT_present_following = (*data & 0x01) == 1;
-
     data += 1;
     tmp = GST_READ_UINT16_BE (data);
 
@@ -1489,7 +1484,6 @@ mpegts_packetizer_parse_eit (MpegTSPacketizer * packetizer,
   guint transport_stream_id, original_network_id;
   gboolean free_ca_mode;
   guint event_id, running_status;
-  guint64 start_and_duration;
   guint16 mjd;
   guint year, month, day, hour, minute, second;
   guint duration;
@@ -1566,7 +1560,6 @@ mpegts_packetizer_parse_eit (MpegTSPacketizer * packetizer,
 
     event_id = GST_READ_UINT16_BE (data);
     data += 2;
-    start_and_duration = GST_READ_UINT64_BE (data);
     duration_ptr = data + 5;
     utc_ptr = data + 2;
     mjd = GST_READ_UINT16_BE (data);
@@ -1710,7 +1703,7 @@ mpegts_packetizer_parse_eit (MpegTSPacketizer * packetizer,
           GValue component_value = { 0 };
           gint widescreen = 0;  /* 0 for 4:3, 1 for 16:9, 2 for > 16:9 */
           gint freq = 25;       /* 25 or 30 measured in Hertz */
-          gboolean highdef = FALSE;
+          //gboolean highdef = FALSE;
           gboolean panvectors = FALSE;
           const gchar *comptype = "";
 
@@ -1757,46 +1750,46 @@ mpegts_packetizer_parse_eit (MpegTSPacketizer * packetizer,
                   break;
                 case 0x09:
                   widescreen = 0;
-                  highdef = TRUE;
+                  //highdef = TRUE;
                   freq = 25;
                   break;
                 case 0x0A:
                   widescreen = 1;
-                  highdef = TRUE;
+                  //highdef = TRUE;
                   panvectors = TRUE;
                   freq = 25;
                   break;
                 case 0x0B:
                   widescreen = 1;
-                  highdef = TRUE;
+                  //highdef = TRUE;
                   panvectors = FALSE;
                   freq = 25;
                   break;
                 case 0x0C:
                   widescreen = 2;
-                  highdef = TRUE;
+                  //highdef = TRUE;
                   freq = 25;
                   break;
                 case 0x0D:
                   widescreen = 0;
-                  highdef = TRUE;
+                  //highdef = TRUE;
                   freq = 30;
                   break;
                 case 0x0E:
                   widescreen = 1;
-                  highdef = TRUE;
+                  //highdef = TRUE;
                   panvectors = TRUE;
                   freq = 30;
                   break;
                 case 0x0F:
                   widescreen = 1;
-                  highdef = TRUE;
+                  //highdef = TRUE;
                   panvectors = FALSE;
                   freq = 30;
                   break;
                 case 0x10:
                   widescreen = 2;
-                  highdef = TRUE;
+                  //highdef = TRUE;
                   freq = 30;
                   break;
               }

From d7a774cc44792198f058e7ca26926558ba0ee4d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
Date: Tue, 12 Jul 2011 17:53:33 -0400
Subject: [PATCH 063/158] mpegdemux: Fix unused-but-set warnings

---
 gst/mpegtsdemux/mpegtspacketizer.c | 29 +++++++++++------------------
 gst/mpegtsdemux/tsdemux.c          |  4 ----
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/gst/mpegtsdemux/mpegtspacketizer.c b/gst/mpegtsdemux/mpegtspacketizer.c
index 87a57c6a56..2c026e6b43 100644
--- a/gst/mpegtsdemux/mpegtspacketizer.c
+++ b/gst/mpegtsdemux/mpegtspacketizer.c
@@ -376,7 +376,7 @@ static gboolean
 mpegts_packetizer_parse_descriptors (MpegTSPacketizer2 * packetizer,
     guint8 ** buffer, guint8 * buffer_end, GValueArray * descriptors)
 {
-  guint8 tag, length;
+  guint8 length;
   guint8 *data;
   GValue value = { 0 };
   GString *desc;
@@ -384,7 +384,6 @@ mpegts_packetizer_parse_descriptors (MpegTSPacketizer2 * packetizer,
   data = *buffer;
 
   while (data < buffer_end) {
-    tag = *data++;
     length = *data++;
 
     if (data + length > buffer_end) {
@@ -393,7 +392,7 @@ mpegts_packetizer_parse_descriptors (MpegTSPacketizer2 * packetizer,
       goto error;
     }
 
-    /* include tag and length */
+    /* include length */
     desc = g_string_new_len ((gchar *) data - 2, length + 2);
     data += length;
     /* G_TYPE_GSTING is a GBoxed type and is used so properly marshalled from python */
@@ -1335,7 +1334,6 @@ mpegts_packetizer_parse_sdt (MpegTSPacketizer2 * packetizer,
   guint16 transport_stream_id, original_network_id, service_id;
   guint tmp;
   guint sdt_info_length;
-  gboolean EIT_schedule, EIT_present_following;
   guint8 running_status;
   gboolean scrambled;
   guint descriptors_loop_length;
@@ -1406,9 +1404,6 @@ mpegts_packetizer_parse_sdt (MpegTSPacketizer2 * packetizer,
     service_id = GST_READ_UINT16_BE (data);
     data += 2;
 
-    EIT_schedule = ((*data & 0x02) == 2);
-    EIT_present_following = (*data & 0x01) == 1;
-
     data += 1;
     tmp = GST_READ_UINT16_BE (data);
 
@@ -1539,7 +1534,6 @@ mpegts_packetizer_parse_eit (MpegTSPacketizer2 * packetizer,
   guint transport_stream_id, original_network_id;
   gboolean free_ca_mode;
   guint event_id, running_status;
-  guint64 start_and_duration;
   guint16 mjd;
   guint year, month, day, hour, minute, second;
   guint duration;
@@ -1616,7 +1610,6 @@ mpegts_packetizer_parse_eit (MpegTSPacketizer2 * packetizer,
 
     event_id = GST_READ_UINT16_BE (data);
     data += 2;
-    start_and_duration = GST_READ_UINT64_BE (data);
     duration_ptr = data + 5;
     utc_ptr = data + 2;
     mjd = GST_READ_UINT16_BE (data);
@@ -1760,7 +1753,7 @@ mpegts_packetizer_parse_eit (MpegTSPacketizer2 * packetizer,
           GValue component_value = { 0 };
           gint widescreen = 0;  /* 0 for 4:3, 1 for 16:9, 2 for > 16:9 */
           gint freq = 25;       /* 25 or 30 measured in Hertz */
-          gboolean highdef = FALSE;
+          /* gboolean highdef = FALSE; */
           gboolean panvectors = FALSE;
           const gchar *comptype = "";
 
@@ -1807,46 +1800,46 @@ mpegts_packetizer_parse_eit (MpegTSPacketizer2 * packetizer,
                   break;
                 case 0x09:
                   widescreen = 0;
-                  highdef = TRUE;
+                  /* highdef = TRUE; */
                   freq = 25;
                   break;
                 case 0x0A:
                   widescreen = 1;
-                  highdef = TRUE;
+                  /* highdef = TRUE; */
                   panvectors = TRUE;
                   freq = 25;
                   break;
                 case 0x0B:
                   widescreen = 1;
-                  highdef = TRUE;
+                  /* highdef = TRUE; */
                   panvectors = FALSE;
                   freq = 25;
                   break;
                 case 0x0C:
                   widescreen = 2;
-                  highdef = TRUE;
+                  /* highdef = TRUE; */
                   freq = 25;
                   break;
                 case 0x0D:
                   widescreen = 0;
-                  highdef = TRUE;
+                  /* highdef = TRUE; */
                   freq = 30;
                   break;
                 case 0x0E:
                   widescreen = 1;
-                  highdef = TRUE;
+                  /* highdef = TRUE; */
                   panvectors = TRUE;
                   freq = 30;
                   break;
                 case 0x0F:
                   widescreen = 1;
-                  highdef = TRUE;
+                  /* highdef = TRUE; */
                   panvectors = FALSE;
                   freq = 30;
                   break;
                 case 0x10:
                   widescreen = 2;
-                  highdef = TRUE;
+                  /* highdef = TRUE; */
                   freq = 30;
                   break;
               }
diff --git a/gst/mpegtsdemux/tsdemux.c b/gst/mpegtsdemux/tsdemux.c
index 9894d8df8a..05a88e1db3 100644
--- a/gst/mpegtsdemux/tsdemux.c
+++ b/gst/mpegtsdemux/tsdemux.c
@@ -865,7 +865,6 @@ gst_ts_demux_do_seek (MpegTSBase * base, GstEvent * event, guint16 pid)
   GstTSDemux *demux = (GstTSDemux *) base;
   GstFlowReturn res = GST_FLOW_ERROR;
   gdouble rate;
-  gboolean accurate, flush;
   GstFormat format;
   GstSeekFlags flags;
   GstSeekType start_type, stop_type;
@@ -884,9 +883,6 @@ gst_ts_demux_do_seek (MpegTSBase * base, GstEvent * event, guint16 pid)
       " stop: %" GST_TIME_FORMAT, rate, GST_TIME_ARGS (start),
       GST_TIME_ARGS (stop));
 
-  accurate = flags & GST_SEEK_FLAG_ACCURATE;
-  flush = flags & GST_SEEK_FLAG_FLUSH;
-
   if (flags & (GST_SEEK_FLAG_SEGMENT | GST_SEEK_FLAG_SKIP)) {
     GST_WARNING ("seek flags 0x%x are not supported", (int) flags);
     goto done;

From 35f85f978e17cf4711c257735b7440e144a8f2ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
Date: Tue, 12 Jul 2011 17:56:25 -0400
Subject: [PATCH 064/158] mpegvideoparse: Fix set-but-unused warnings

---
 gst/mpegvideoparse/mpegpacketiser.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/gst/mpegvideoparse/mpegpacketiser.c b/gst/mpegvideoparse/mpegpacketiser.c
index 694c4761d1..2a95fa688c 100644
--- a/gst/mpegvideoparse/mpegpacketiser.c
+++ b/gst/mpegvideoparse/mpegpacketiser.c
@@ -511,8 +511,6 @@ mpeg_util_parse_extension_packet (MPEGSeqHdr * hdr, guint8 * data, guint8 * end)
     case MPEG_PACKET_EXT_SEQUENCE:
     {
       /* Parse a Sequence Extension */
-      gboolean low_delay;
-      guint8 chroma_format;
       guint8 horiz_size_ext, vert_size_ext;
       guint8 fps_n_ext, fps_d_ext;
 
@@ -523,10 +521,8 @@ mpeg_util_parse_extension_packet (MPEGSeqHdr * hdr, guint8 * data, guint8 * end)
       hdr->profile = data[0] & 0x0f;    /* profile (0:2) + escape bit (3) */
       hdr->level = (data[1] >> 4) & 0x0f;
       hdr->progressive = data[1] & 0x08;
-      chroma_format = (data[1] >> 2) & 0x03;
       horiz_size_ext = ((data[1] << 1) & 0x02) | ((data[2] >> 7) & 0x01);
       vert_size_ext = (data[2] >> 5) & 0x03;
-      low_delay = data[5] >> 7;
       fps_n_ext = (data[5] >> 5) & 0x03;
       fps_d_ext = data[5] & 0x1f;
 
@@ -549,7 +545,6 @@ mpeg_util_parse_sequence_hdr (MPEGSeqHdr * hdr, guint8 * data, guint8 * end)
   guint32 code;
   guint8 dar_idx, fps_idx;
   guint32 sync_word = 0xffffffff;
-  gboolean constrained_flag;
   gboolean load_intra_flag;
   gboolean load_non_intra_flag;
 
@@ -584,7 +579,6 @@ mpeg_util_parse_sequence_hdr (MPEGSeqHdr * hdr, guint8 * data, guint8 * end)
     hdr->bitrate *= 400;
   }
 
-  constrained_flag = (data[7] >> 2) & 0x01;
   load_intra_flag = (data[7] >> 1) & 0x01;
   if (load_intra_flag) {
     if (G_UNLIKELY ((end - data) < 64))

From c1f432ee1800eefe8e8eed4a9ae9207063b3f378 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
Date: Tue, 12 Jul 2011 17:57:45 -0400
Subject: [PATCH 065/158] pcapparse: Fix set-but-unused warnings

---
 gst/pcapparse/gstpcapparse.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gst/pcapparse/gstpcapparse.c b/gst/pcapparse/gstpcapparse.c
index 2d3436cc60..47bf0ace23 100644
--- a/gst/pcapparse/gstpcapparse.c
+++ b/gst/pcapparse/gstpcapparse.c
@@ -466,7 +466,6 @@ gst_pcap_parse_chain (GstPad * pad, GstBuffer * buffer)
         guint32 ts_sec;
         guint32 ts_usec;
         guint32 incl_len;
-        guint32 orig_len;
 
         if (avail < 16)
           break;
@@ -476,7 +475,7 @@ gst_pcap_parse_chain (GstPad * pad, GstBuffer * buffer)
         ts_sec = gst_pcap_parse_read_uint32 (self, data + 0);
         ts_usec = gst_pcap_parse_read_uint32 (self, data + 4);
         incl_len = gst_pcap_parse_read_uint32 (self, data + 8);
-        orig_len = gst_pcap_parse_read_uint32 (self, data + 12);
+        /* orig_len = gst_pcap_parse_read_uint32 (self, data + 12); */
 
         gst_adapter_flush (self->adapter, 16);
 

From 9eba99542f66fabb78a5d34517870ebaef1cb9b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
Date: Tue, 12 Jul 2011 17:59:56 -0400
Subject: [PATCH 066/158] videoparsers: Fix set-but-unused warnings

---
 gst/videoparsers/h263parse.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gst/videoparsers/h263parse.c b/gst/videoparsers/h263parse.c
index 09cbbd4f36..14911e79f0 100644
--- a/gst/videoparsers/h263parse.c
+++ b/gst/videoparsers/h263parse.c
@@ -21,7 +21,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#  include "config.h"
+#include "config.h"
 #endif
 
 #include <gst/base/gstbitreader.h>
@@ -455,7 +455,7 @@ beach:
 gint
 gst_h263_parse_get_profile (const H263Params * params)
 {
-  gboolean c, d, d1, d21, d22, e, f, f2, g, h, i, j, k, k0, k1, k2, l, m, n, o,
+  gboolean c, d, d1, d21, e, f, f2, g, h, i, j, k, k0, k1, l, m, n, o,
       p, q, r, s, t, u, v, w;
 
   /* FIXME: some parts of Annex C can be discovered, others can not */
@@ -464,7 +464,7 @@ gst_h263_parse_get_profile (const H263Params * params)
   /* d1: Annex D.1; d21: Annex D.2 with UUI=1; d22: Annex D.2 with UUI=01 */
   d1 = (d && params->uui == UUI_ABSENT);
   d21 = (d && params->uui == UUI_IS_1);
-  d22 = (d && params->uui == UUI_IS_01);
+  /* d22 = (d && params->uui == UUI_IS_01); */
   e = (params->features & H263_OPTION_SAC_MODE) != 0;
   /* f:Annex  F.2 or F.3 may be used; f2: only Annex F.2 is used (we have no
    * way of detecting this right now */
@@ -478,7 +478,7 @@ gst_h263_parse_get_profile (const H263Params * params)
   /* k0: Annex K without submodes; k1: Annex K with ASO; k2: Annex K with RS */
   k0 = (k && params->sss == 0x0);
   k1 = (k && params->sss == 0x2);
-  k2 = (k && params->sss == 0x1);
+  /* k2 = (k && params->sss == 0x1); */
   l = FALSE;
   m = (params->type == PICTURE_IMPROVED_PB);
   n = (params->features & H263_OPTION_RPS_MODE) != 0;

From 0b6cc7eb96dda3ceb79fc7c143e7426877586c98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
Date: Tue, 12 Jul 2011 18:03:53 -0400
Subject: [PATCH 067/158] rtpvp8: Reject unknown bitstream versions

---
 gst/rtpvp8/gstrtpvp8pay.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gst/rtpvp8/gstrtpvp8pay.c b/gst/rtpvp8/gstrtpvp8pay.c
index b54ec28985..c6c773dcaf 100644
--- a/gst/rtpvp8/gstrtpvp8pay.c
+++ b/gst/rtpvp8/gstrtpvp8pay.c
@@ -141,6 +141,11 @@ gst_rtp_vp8_pay_parse_frame (GstRtpVP8Pay * self, GstBuffer * buffer)
   self->is_keyframe = keyframe = ((data[0] & 0x1) == 0);
   version = (data[0] >> 1) & 0x7;
 
+  if (G_UNLIKELY (version > 3)) {
+    GST_ERROR_OBJECT (self, "Unknown VP8 version %u", version);
+    goto error;
+  }
+
   /* keyframe, version and show_frame use 5 bits */
   header_size = data[2] << 11 | data[1] << 3 | (data[0] >> 5);
 

From eba9cf06d4bfcb4e486fc4709f24fa74dee38fed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
Date: Tue, 12 Jul 2011 18:05:25 -0400
Subject: [PATCH 068/158] vp8: Fix set-but-unused warnings

---
 ext/vp8/gstvp8enc.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ext/vp8/gstvp8enc.c b/ext/vp8/gstvp8enc.c
index c9deb5bf3d..ef278d586c 100644
--- a/ext/vp8/gstvp8enc.c
+++ b/ext/vp8/gstvp8enc.c
@@ -843,9 +843,6 @@ gst_vp8_enc_buffer_to_image (GstVP8Enc * enc, GstBuffer * buffer)
 {
   vpx_image_t *image = g_slice_new (vpx_image_t);
   guint8 *data = GST_BUFFER_DATA (buffer);
-  const GstVideoState *state;
-
-  state = gst_base_video_encoder_get_state (GST_BASE_VIDEO_ENCODER (enc));
 
   memcpy (image, &enc->image, sizeof (*image));
 

From b44cb0a048a37d3db231db2bbf1038bc902fa4df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
Date: Tue, 12 Jul 2011 18:08:21 -0400
Subject: [PATCH 069/158] sdi: Fix set-but-unused warnings

---
 gst/sdi/gstsdidemux.c | 9 +++------
 gst/sdi/gstsdimux.c   | 4 ++--
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/gst/sdi/gstsdidemux.c b/gst/sdi/gstsdidemux.c
index 1636b5a94f..7af936bdd4 100644
--- a/gst/sdi/gstsdidemux.c
+++ b/gst/sdi/gstsdidemux.c
@@ -296,7 +296,6 @@ copy_line (GstSdiDemux * sdidemux, guint8 * line)
   if (sdidemux->line == format->lines) {
     ret = gst_pad_push (sdidemux->srcpad, sdidemux->output_buffer);
     gst_sdi_demux_get_output_buffer (sdidemux);
-    output_data = GST_BUFFER_DATA (sdidemux->output_buffer);
     sdidemux->line = 0;
   }
 
@@ -318,7 +317,6 @@ gst_sdi_demux_chain (GstPad * pad, GstBuffer * buffer)
   int offset = 0;
   guint8 *data = GST_BUFFER_DATA (buffer);
   int size = GST_BUFFER_SIZE (buffer);
-  guint8 *output_data;
   GstFlowReturn ret = GST_FLOW_OK;
   GstSdiFormat *format;
 
@@ -366,7 +364,6 @@ gst_sdi_demux_chain (GstPad * pad, GstBuffer * buffer)
   if (sdidemux->output_buffer == NULL) {
     gst_sdi_demux_get_output_buffer (sdidemux);
   }
-  output_data = GST_BUFFER_DATA (sdidemux->output_buffer);
 
 #if 0
   if (sdidemux->offset) {
@@ -488,7 +485,7 @@ out:
 static gboolean
 gst_sdi_demux_sink_event (GstPad * pad, GstEvent * event)
 {
-  gboolean res;
+  gboolean res = TRUE;
   GstSdiDemux *sdidemux;
 
   sdidemux = GST_SDI_DEMUX (gst_pad_get_parent (pad));
@@ -514,7 +511,7 @@ gst_sdi_demux_sink_event (GstPad * pad, GstEvent * event)
   }
 
   gst_object_unref (sdidemux);
-  return TRUE;
+  return res;
 }
 
 static gboolean
@@ -537,5 +534,5 @@ gst_sdi_demux_src_event (GstPad * pad, GstEvent * event)
   }
 
   gst_object_unref (sdidemux);
-  return TRUE;
+  return res;
 }
diff --git a/gst/sdi/gstsdimux.c b/gst/sdi/gstsdimux.c
index 779add42a1..d7d490bd3a 100644
--- a/gst/sdi/gstsdimux.c
+++ b/gst/sdi/gstsdimux.c
@@ -285,7 +285,7 @@ gst_sdi_mux_sink_event (GstPad * pad, GstEvent * event)
   }
 
   gst_object_unref (sdimux);
-  return TRUE;
+  return res;
 }
 
 static gboolean
@@ -308,5 +308,5 @@ gst_sdi_mux_src_event (GstPad * pad, GstEvent * event)
   }
 
   gst_object_unref (sdimux);
-  return TRUE;
+  return res;
 }

From 8f6b55f92014f2f5221931f6672709d46d480f1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
Date: Tue, 12 Jul 2011 18:09:26 -0400
Subject: [PATCH 070/158] tta: Fix set-but-unused warnings

---
 gst/tta/gstttadec.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/gst/tta/gstttadec.c b/gst/tta/gstttadec.c
index 4565272797..da7693f048 100644
--- a/gst/tta/gstttadec.c
+++ b/gst/tta/gstttadec.c
@@ -106,7 +106,6 @@ gst_tta_dec_setcaps (GstPad * pad, GstCaps * caps)
   GstTtaDec *ttadec = GST_TTA_DEC (gst_pad_get_parent (pad));
   GstStructure *structure = gst_caps_get_structure (caps, 0);
   GstCaps *srccaps;
-  guint64 outsize;
   gint bits, channels;
   gint32 samplerate;
 
@@ -136,8 +135,6 @@ gst_tta_dec_setcaps (GstPad * pad, GstCaps * caps)
   ttadec->tta = g_malloc (ttadec->channels * sizeof (decoder));
   ttadec->cache = g_malloc (ttadec->channels * sizeof (long));
 
-  outsize = ttadec->channels * ttadec->frame_length * ttadec->bytes;
-
   ttadec->decdata =
       (guchar *) g_malloc (ttadec->channels * ttadec->frame_length *
       ttadec->bytes * sizeof (guchar));

From f4caf95a158eb5c19b282a79b62affb1ae198a8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
Date: Tue, 12 Jul 2011 18:10:42 -0400
Subject: [PATCH 071/158] videomeasure: Fix set-but-unused warnings

---
 gst/videomeasure/gstvideomeasure_ssim.c | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/gst/videomeasure/gstvideomeasure_ssim.c b/gst/videomeasure/gstvideomeasure_ssim.c
index 19d03d4ded..499fcf2ac0 100644
--- a/gst/videomeasure/gstvideomeasure_ssim.c
+++ b/gst/videomeasure/gstvideomeasure_ssim.c
@@ -215,8 +215,6 @@ calculate_mu (GstSSim * ssim, gfloat * outmu, guint8 * buf)
       gint winstart_x;
       gint wghstart_x;
       gint winend_x;
-      gint winlen_x;
-      gint winstride_x;
       gfloat weight;
       gint source_offset;
 
@@ -228,8 +226,6 @@ calculate_mu (GstSSim * ssim, gfloat * outmu, guint8 * buf)
       winstart_y = ssim->windows[source_offset].y_window_start;
       wghstart_y = ssim->windows[source_offset].y_weight_start;
       winend_y = ssim->windows[source_offset].y_window_end;
-      winlen_x = winend_x - winstart_x + 1;
-      winstride_x = sizeof (gfloat) * winlen_x;
       elsumm = ssim->windows[source_offset].element_summ;
 
       switch (ssim->windowtype) {
@@ -389,8 +385,6 @@ calcssim_canonical (GstSSim * ssim, guint8 * org, gfloat * orgmu, guint8 * mod,
       gint winstart_x;
       gint wghstart_x;
       gint winend_x;
-      gint winlen_x;
-      gint winstride_x;
       gfloat weight;
       gint source_offset;
 
@@ -402,8 +396,6 @@ calcssim_canonical (GstSSim * ssim, guint8 * org, gfloat * orgmu, guint8 * mod,
       winstart_y = ssim->windows[source_offset].y_window_start;
       wghstart_y = ssim->windows[source_offset].y_weight_start;
       winend_y = ssim->windows[source_offset].y_window_end;
-      winlen_x = winend_x - winstart_x + 1;
-      winstride_x = sizeof (gfloat) * winlen_x;
       elsumm = ssim->windows[source_offset].element_summ;
 
       switch (ssim->windowtype) {
@@ -1191,7 +1183,7 @@ gst_ssim_request_new_pad (GstElement * element, GstPadTemplate * templ,
 
   if (num >= 0) {
     GstSSimOutputContext *c;
-    GObject *asobject;
+
     template = gst_static_pad_template_get (&gst_ssim_src_template);
     name = g_strdup_printf ("src%d", num);
     newsrc = gst_pad_new_from_template (template, name);
@@ -1209,7 +1201,6 @@ gst_ssim_request_new_pad (GstElement * element, GstPadTemplate * templ,
 
     c = g_new (GstSSimOutputContext, 1);
     c->pad = newsrc;
-    asobject = G_OBJECT (newsrc);
     g_object_set_data (G_OBJECT (newpad), "ssim-match-output-context", c);
     g_ptr_array_add (ssim->src, (gpointer) c);
   }
@@ -1427,7 +1418,6 @@ gst_ssim_collected (GstCollectPads * pads, gpointer user_data)
   gpointer outdata = NULL;
   guint outsize = 0;
   gfloat mssim = 0, lowest = 1, highest = -1;
-  gboolean empty = TRUE;
   gboolean ready = TRUE;
   gint padnumber = 0;
 
@@ -1504,7 +1494,6 @@ gst_ssim_collected (GstCollectPads * pads, gpointer user_data)
     GstCollectData *collect_data;
     GstBuffer *inbuf;
     guint8 *indata;
-    guint insize;
 
     collect_data = (GstCollectData *) collected->data;
 
@@ -1512,7 +1501,6 @@ gst_ssim_collected (GstCollectPads * pads, gpointer user_data)
       inbuf = gst_collect_pads_pop (pads, collect_data);
 
       indata = GST_BUFFER_DATA (inbuf);
-      insize = GST_BUFFER_SIZE (inbuf);
 
       GST_DEBUG_OBJECT (ssim, "Modified stream - flags(0x%x), timestamp(%"
           GST_TIME_FORMAT "), duration(%" GST_TIME_FORMAT ")",
@@ -1609,8 +1597,6 @@ gst_ssim_collected (GstCollectPads * pads, gpointer user_data)
             GST_BUFFER_TIMESTAMP (inbuf), "SSIM", &vmean, &vlowest, &vhighest);
         gst_pad_push_event (c->pad, measured);
 
-        empty = FALSE;
-
         /* send it out */
         GST_DEBUG_OBJECT (ssim, "pushing outbuf, timestamp %" GST_TIME_FORMAT
             ", size %d", GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)),

From d369f620de9b0bf828314df3dfbf44650a93d755 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
Date: Tue, 12 Jul 2011 18:13:56 -0400
Subject: [PATCH 072/158] dvb: Fix set-but-unused warnings

---
 sys/dvb/camresourcemanager.c | 8 ++++----
 sys/dvb/camsession.c         | 6 ++----
 sys/dvb/camtransport.c       | 3 +--
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/sys/dvb/camresourcemanager.c b/sys/dvb/camresourcemanager.c
index 2b6169fde1..f7b473a0e6 100644
--- a/sys/dvb/camresourcemanager.c
+++ b/sys/dvb/camresourcemanager.c
@@ -171,22 +171,22 @@ static CamReturn
 data_impl (CamALApplication * application, CamSLSession * session,
     guint tag, guint8 * buffer, guint length)
 {
-  CamReturn ret;
   CamResourceManager *mgr = CAM_RESOURCE_MANAGER (application);
 
   switch (tag) {
     case TAG_PROFILE_ENQUIRY:
-      ret = send_profile_reply (mgr, session);
+      send_profile_reply (mgr, session);
       break;
     case TAG_PROFILE_REPLY:
-      ret = handle_profile_reply (mgr, session, buffer, length);
+      handle_profile_reply (mgr, session, buffer, length);
       break;
     case TAG_PROFILE_CHANGE:
-      ret = send_profile_enquiry (mgr, session);
+      send_profile_enquiry (mgr, session);
       break;
     default:
       g_return_val_if_reached (CAM_RETURN_APPLICATION_ERROR);
   }
 
+  /* FIXME: Shouldn't this return the retval from the functions above ? */
   return CAM_RETURN_OK;
 }
diff --git a/sys/dvb/camsession.c b/sys/dvb/camsession.c
index 4fe728e363..4e4e391d7a 100644
--- a/sys/dvb/camsession.c
+++ b/sys/dvb/camsession.c
@@ -379,8 +379,6 @@ static CamReturn
 handle_create_session_response (CamSL * sl, CamTLConnection * connection,
     guint8 * spdu, guint spdu_length)
 {
-  guint8 status;
-  guint resource_id;
   guint16 session_nb;
   CamSLSession *session;
 
@@ -398,8 +396,8 @@ handle_create_session_response (CamSL * sl, CamTLConnection * connection,
   }
 
   /* skip tag and length */
-  status = spdu[2];
-  resource_id = GST_READ_UINT32_BE (&spdu[3]);
+  /* status = spdu[2]; */
+  /* resource_id = GST_READ_UINT32_BE (&spdu[3]); */
   session_nb = GST_READ_UINT16_BE (&spdu[7]);
 
   session = g_hash_table_lookup (sl->sessions,
diff --git a/sys/dvb/camtransport.c b/sys/dvb/camtransport.c
index 98467f0643..30780db720 100644
--- a/sys/dvb/camtransport.c
+++ b/sys/dvb/camtransport.c
@@ -224,7 +224,6 @@ cam_tl_read_tpdu_next (CamTL * tl, CamTLConnection ** out_connection)
 {
   CamReturn ret;
   CamTLConnection *connection;
-  guint8 slot;
   guint8 connection_id;
   guint8 *tpdu;
   guint8 length_field_len;
@@ -244,7 +243,7 @@ cam_tl_read_tpdu_next (CamTL * tl, CamTLConnection ** out_connection)
   }
 
   /* LPDU slot */
-  slot = tpdu[0];
+  /* slot = tpdu[0]; */
   /* LPDU connection id */
   connection_id = tpdu[1];
 

From 27b8c96391f9658abea979c11d4467eefc739e6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
Date: Tue, 12 Jul 2011 18:16:54 -0400
Subject: [PATCH 073/158] cog: Fix set-but-unused warnings

---
 ext/cog/cogvirtframe.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/ext/cog/cogvirtframe.c b/ext/cog/cogvirtframe.c
index 0fc0ad1298..e6d08e551b 100644
--- a/ext/cog/cogvirtframe.c
+++ b/ext/cog/cogvirtframe.c
@@ -520,12 +520,11 @@ cog_virt_frame_render_resample_vert_1tap (CogFrame * frame, void *_dest,
   int n_src;
   int scale = frame->param1;
   int acc;
-  int x;
   int src_i;
 
   acc = scale * i;
   src_i = acc >> 8;
-  x = acc & 0xff;
+  /* x = acc & 0xff; */
 
   n_src = frame->virt_frame1->components[component].height;
   src1 = cog_virt_frame_get_line (frame->virt_frame1, component,
@@ -634,10 +633,9 @@ cog_virt_frame_render_resample_horiz_1tap (CogFrame * frame, void *_dest,
 {
   uint8_t *dest = _dest;
   uint8_t *src;
-  int n_src;
   int scale = frame->param1;
 
-  n_src = frame->virt_frame1->components[component].width;
+  /* n_src = frame->virt_frame1->components[component].width; */
   src = cog_virt_frame_get_line (frame->virt_frame1, component, i);
 
   cogorc_resample_horiz_1tap (dest, src, 0, scale,
@@ -650,10 +648,9 @@ cog_virt_frame_render_resample_horiz_2tap (CogFrame * frame, void *_dest,
 {
   uint8_t *dest = _dest;
   uint8_t *src;
-  int n_src;
   int scale = frame->param1;
 
-  n_src = frame->virt_frame1->components[component].width;
+  /* n_src = frame->virt_frame1->components[component].width; */
   src = cog_virt_frame_get_line (frame->virt_frame1, component, i);
 
   cogorc_resample_horiz_2tap (dest, src, 0, scale,

From c4d00d06a70ed4a46c7fd3923dec34fc95a39451 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
Date: Tue, 12 Jul 2011 18:18:30 -0400
Subject: [PATCH 074/158] resindvd: Fix set-but-unused warnings

---
 ext/resindvd/gstpesfilter.c      |  3 +--
 ext/resindvd/rsnstreamselector.c | 15 ---------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/ext/resindvd/gstpesfilter.c b/ext/resindvd/gstpesfilter.c
index f0a8cb5492..f2ccc7849d 100644
--- a/ext/resindvd/gstpesfilter.c
+++ b/ext/resindvd/gstpesfilter.c
@@ -101,7 +101,6 @@ gst_pes_filter_parse (GstPESFilter * filter)
   GstFlowReturn ret;
   guint32 start_code;
 
-  gboolean STD_buffer_bound_scale;
   guint16 STD_buffer_size_bound;
   const guint8 *data;
   gint avail, datalen;
@@ -213,7 +212,7 @@ gst_pes_filter_parse (GstPESFilter * filter)
     if (datalen < 3)
       goto need_more_data;
 
-    STD_buffer_bound_scale = *data & 0x20;
+    /* STD_buffer_bound_scale = *data & 0x20; */
     STD_buffer_size_bound = ((guint16) (*data++ & 0x1F)) << 8;
     STD_buffer_size_bound |= *data++;
 
diff --git a/ext/resindvd/rsnstreamselector.c b/ext/resindvd/rsnstreamselector.c
index 3bb6071577..eaae4f61c4 100644
--- a/ext/resindvd/rsnstreamselector.c
+++ b/ext/resindvd/rsnstreamselector.c
@@ -424,7 +424,6 @@ ignore:
 }
 
 static void rsn_stream_selector_dispose (GObject * object);
-static void rsn_stream_selector_finalize (GObject * object);
 
 static void rsn_stream_selector_init (RsnStreamSelector * sel);
 static void rsn_stream_selector_base_init (RsnStreamSelectorClass * klass);
@@ -497,7 +496,6 @@ rsn_stream_selector_class_init (RsnStreamSelectorClass * klass)
   parent_class = g_type_class_peek_parent (klass);
 
   gobject_class->dispose = rsn_stream_selector_dispose;
-  gobject_class->finalize = rsn_stream_selector_finalize;
 
   gobject_class->set_property =
       GST_DEBUG_FUNCPTR (rsn_stream_selector_set_property);
@@ -545,16 +543,6 @@ rsn_stream_selector_dispose (GObject * object)
   G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
-static void
-rsn_stream_selector_finalize (GObject * object)
-{
-  RsnStreamSelector *sel;
-
-  sel = RSN_STREAM_SELECTOR (object);
-
-  G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
 static void
 rsn_stream_selector_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec)
@@ -653,11 +641,8 @@ rsn_stream_selector_getcaps (GstPad * pad)
 static gboolean
 rsn_stream_selector_is_active_sinkpad (RsnStreamSelector * sel, GstPad * pad)
 {
-  RsnSelectorPad *selpad;
   gboolean res;
 
-  selpad = GST_SELECTOR_PAD_CAST (pad);
-
   GST_OBJECT_LOCK (sel);
   res = (pad == sel->active_sinkpad);
   GST_OBJECT_UNLOCK (sel);

From 98f19a36742ab01aa208ed4f28a2580a5b20bc88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
Date: Tue, 12 Jul 2011 18:20:23 -0400
Subject: [PATCH 075/158] jp2k: Fix set-but-unused warnings

---
 ext/jp2k/gstjasperdec.c | 40 ----------------------------------------
 ext/jp2k/gstjasperenc.c | 40 ----------------------------------------
 2 files changed, 80 deletions(-)

diff --git a/ext/jp2k/gstjasperdec.c b/ext/jp2k/gstjasperdec.c
index 159eb95c8f..e896142bdb 100644
--- a/ext/jp2k/gstjasperdec.c
+++ b/ext/jp2k/gstjasperdec.c
@@ -68,11 +68,6 @@ static GstStaticPadTemplate gst_jasper_dec_src_template =
         GST_VIDEO_CAPS_YUV ("{ I420, YV12, YUY2, UYVY, Y41B, Y42B, v308 }"))
     );
 
-static void gst_jasper_dec_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec);
-static void gst_jasper_dec_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec);
-
 static void gst_jasper_dec_reset (GstJasperDec * dec);
 static GstStateChangeReturn gst_jasper_dec_change_state (GstElement * element,
     GstStateChange transition);
@@ -114,18 +109,13 @@ gst_jasper_dec_base_init (gpointer g_class)
 static void
 gst_jasper_dec_class_init (GstJasperDecClass * klass)
 {
-  GObjectClass *gobject_class;
   GstElementClass *gstelement_class;
 
-  gobject_class = (GObjectClass *) klass;
   gstelement_class = (GstElementClass *) klass;
 
   GST_DEBUG_CATEGORY_INIT (gst_jasper_dec_debug, "jp2kdec", 0,
       "Jasper JPEG2000 decoder");
 
-  gobject_class->set_property = gst_jasper_dec_set_property;
-  gobject_class->get_property = gst_jasper_dec_get_property;
-
   gstelement_class->change_state =
       GST_DEBUG_FUNCPTR (gst_jasper_dec_change_state);
 }
@@ -819,36 +809,6 @@ invalid_bytes_segment:
   }
 }
 
-static void
-gst_jasper_dec_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec)
-{
-  GstJasperDec *filter;
-
-  filter = GST_JASPER_DEC (object);
-
-  switch (prop_id) {
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
-
-static void
-gst_jasper_dec_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec)
-{
-  GstJasperDec *filter;
-
-  filter = GST_JASPER_DEC (object);
-
-  switch (prop_id) {
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
-
 static GstStateChangeReturn
 gst_jasper_dec_change_state (GstElement * element, GstStateChange transition)
 {
diff --git a/ext/jp2k/gstjasperenc.c b/ext/jp2k/gstjasperenc.c
index 90fca51598..ae7b92567c 100644
--- a/ext/jp2k/gstjasperenc.c
+++ b/ext/jp2k/gstjasperenc.c
@@ -65,11 +65,6 @@ static GstStaticPadTemplate gst_jasper_enc_src_template =
         "image/jp2")
     );
 
-static void gst_jasper_enc_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec);
-static void gst_jasper_enc_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec);
-
 static void gst_jasper_enc_reset (GstJasperEnc * enc);
 static GstStateChangeReturn gst_jasper_enc_change_state (GstElement * element,
     GstStateChange transition);
@@ -118,18 +113,13 @@ gst_jasper_enc_base_init (gpointer g_class)
 static void
 gst_jasper_enc_class_init (GstJasperEncClass * klass)
 {
-  GObjectClass *gobject_class;
   GstElementClass *gstelement_class;
 
-  gobject_class = (GObjectClass *) klass;
   gstelement_class = (GstElementClass *) klass;
 
   GST_DEBUG_CATEGORY_INIT (gst_jasper_enc_debug, "jp2kenc", 0,
       "Jasper JPEG2000 encoder");
 
-  gobject_class->set_property = gst_jasper_enc_set_property;
-  gobject_class->get_property = gst_jasper_enc_get_property;
-
   /* FIXME add some encoder properties */
 
   gstelement_class->change_state =
@@ -535,36 +525,6 @@ not_negotiated:
   }
 }
 
-static void
-gst_jasper_enc_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec)
-{
-  GstJasperEnc *filter;
-
-  filter = GST_JASPER_ENC (object);
-
-  switch (prop_id) {
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
-
-static void
-gst_jasper_enc_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec)
-{
-  GstJasperEnc *filter;
-
-  filter = GST_JASPER_ENC (object);
-
-  switch (prop_id) {
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
-
 static GstStateChangeReturn
 gst_jasper_enc_change_state (GstElement * element, GstStateChange transition)
 {

From d22d5468a8f7efed134c6a82f3c9a146913cbea4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
Date: Tue, 12 Jul 2011 18:22:35 -0400
Subject: [PATCH 076/158] examples/camerabin: Fix set-but-unused warnings

---
 docs/plugins/gst-plugins-bad-plugins.args     | 1916 ++++++++++++++++-
 .../plugins/gst-plugins-bad-plugins.hierarchy |  163 +-
 tests/examples/camerabin/gst-camera-perf.c    |    6 +-
 3 files changed, 2014 insertions(+), 71 deletions(-)

diff --git a/docs/plugins/gst-plugins-bad-plugins.args b/docs/plugins/gst-plugins-bad-plugins.args
index 2640dd488c..51392aab10 100644
--- a/docs/plugins/gst-plugins-bad-plugins.args
+++ b/docs/plugins/gst-plugins-bad-plugins.args
@@ -26710,7 +26710,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ratiox</NICK>
 <BLURB>x-ratio.</BLURB>
-<DEFAULT>1.21136e-314</DEFAULT>
+<DEFAULT>3.06544e-115</DEFAULT>
 </ARG>
 
 <ARG>
@@ -26720,7 +26720,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ratioy</NICK>
 <BLURB>y-ratio.</BLURB>
-<DEFAULT>2.33156e-310</DEFAULT>
+<DEFAULT>1.53064e-18</DEFAULT>
 </ARG>
 
 <ARG>
@@ -26730,7 +26730,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>DelayTime</NICK>
 <BLURB>the delay time.</BLURB>
-<DEFAULT>1.37974e-309</DEFAULT>
+<DEFAULT>0</DEFAULT>
 </ARG>
 
 <ARG>
@@ -26760,7 +26760,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>Color</NICK>
 <BLURB>the color of the image.</BLURB>
-<DEFAULT>0</DEFAULT>
+<DEFAULT>0.011489</DEFAULT>
 </ARG>
 
 <ARG>
@@ -26770,7 +26770,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>Color</NICK>
 <BLURB>the color of the image.</BLURB>
-<DEFAULT>0</DEFAULT>
+<DEFAULT>9.33458e-15</DEFAULT>
 </ARG>
 
 <ARG>
@@ -26780,7 +26780,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>Color-R</NICK>
 <BLURB>the color of the image.</BLURB>
-<DEFAULT>0</DEFAULT>
+<DEFAULT>8.37068e-21</DEFAULT>
 </ARG>
 
 <ARG>
@@ -27120,7 +27120,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>lthresh</NICK>
 <BLURB>threshold for edge lightening.</BLURB>
-<DEFAULT>6.9235e+228</DEFAULT>
+<DEFAULT>0</DEFAULT>
 </ARG>
 
 <ARG>
@@ -27130,7 +27130,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>lupscale</NICK>
 <BLURB>multiplier for upscaling edge brightness.</BLURB>
-<DEFAULT>8.20074e-304</DEFAULT>
+<DEFAULT>0</DEFAULT>
 </ARG>
 
 <ARG>
@@ -27300,7 +27300,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>blend</NICK>
 <BLURB>blend factor.</BLURB>
-<DEFAULT>7.75037e-304</DEFAULT>
+<DEFAULT>4.62958e-299</DEFAULT>
 </ARG>
 
 <ARG>
@@ -27310,7 +27310,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>fader</NICK>
 <BLURB>the fader position.</BLURB>
-<DEFAULT>3.84008e-315</DEFAULT>
+<DEFAULT>7.06238e-304</DEFAULT>
 </ARG>
 
 <ARG>
@@ -27490,7 +27490,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>HSync</NICK>
 <BLURB>the hsync offset.</BLURB>
-<DEFAULT>1</DEFAULT>
+<DEFAULT>0</DEFAULT>
 </ARG>
 
 <ARG>
@@ -33819,8 +33819,8 @@
 <RANGE></RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>Channel</NICK>
-<BLURB>Channel to adjust levels (1 = RED; 2 = GREEN; 3 = BLUE; 4 = LUMA).</BLURB>
-<DEFAULT>0</DEFAULT>
+<BLURB>Channel to adjust (0 = red, 0.1 = green, 0.2 = blue, 0.3 = alpha, 0.4 = luma, 0.5 = rgb, 0.6 = hue, 0.7 = saturation).</BLURB>
+<DEFAULT>0.5</DEFAULT>
 </ARG>
 
 <ARG>
@@ -33829,7 +33829,7 @@
 <RANGE></RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>Curve point number</NICK>
-<BLURB>Number of point to use to build curve.</BLURB>
+<BLURB>Number of points to use to build curve.</BLURB>
 <DEFAULT>2</DEFAULT>
 </ARG>
 
@@ -33850,7 +33850,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>Point 1 input value</NICK>
 <BLURB>Point 1 input value.</BLURB>
-<DEFAULT>1</DEFAULT>
+<DEFAULT>0</DEFAULT>
 </ARG>
 
 <ARG>
@@ -33860,7 +33860,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>Point 1 output value</NICK>
 <BLURB>Point 1 output value.</BLURB>
-<DEFAULT>1</DEFAULT>
+<DEFAULT>0</DEFAULT>
 </ARG>
 
 <ARG>
@@ -33890,7 +33890,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>Point 3 input value</NICK>
 <BLURB>Point 3 input value.</BLURB>
-<DEFAULT>1</DEFAULT>
+<DEFAULT>0</DEFAULT>
 </ARG>
 
 <ARG>
@@ -33900,7 +33900,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>Point 3 output value</NICK>
 <BLURB>Point 3 output value.</BLURB>
-<DEFAULT>1</DEFAULT>
+<DEFAULT>0</DEFAULT>
 </ARG>
 
 <ARG>
@@ -33910,7 +33910,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>Point 4 input value</NICK>
 <BLURB>Point 4 input value.</BLURB>
-<DEFAULT>1</DEFAULT>
+<DEFAULT>0</DEFAULT>
 </ARG>
 
 <ARG>
@@ -33920,7 +33920,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>Point 4 output value</NICK>
 <BLURB>Point 4 output value.</BLURB>
-<DEFAULT>1</DEFAULT>
+<DEFAULT>0</DEFAULT>
 </ARG>
 
 <ARG>
@@ -33930,7 +33930,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>Point 5 input value</NICK>
 <BLURB>Point 5 input value.</BLURB>
-<DEFAULT>1</DEFAULT>
+<DEFAULT>0</DEFAULT>
 </ARG>
 
 <ARG>
@@ -33940,7 +33940,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>Point 5 output value</NICK>
 <BLURB>Point 5 output value.</BLURB>
-<DEFAULT>1</DEFAULT>
+<DEFAULT>0</DEFAULT>
 </ARG>
 
 <ARG>
@@ -33953,6 +33953,26 @@
 <DEFAULT>TRUE</DEFAULT>
 </ARG>
 
+<ARG>
+<NAME>frei0r-filter-curves::b--zier-spline</NAME>
+<TYPE>gchar*</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Bézier spline</NICK>
+<BLURB>Use cubic Bézier spline. Has to be a sorted list of points in the format "handle1x;handle1y#pointx;pointy#handle2x;handle2y"(pointx = in, pointy = out). Points are separated by a "|".The values can have "double" precision. x, y for points should be in the range 0-1. x,y for handles might also be out of this range.</BLURB>
+<DEFAULT>""</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-curves::luma-formula</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Luma formula</NICK>
+<BLURB>Use Rec. 601 (false) or Rec. 709 (true).</BLURB>
+<DEFAULT>TRUE</DEFAULT>
+</ARG>
+
 <ARG>
 <NAME>VdpSink::display</NAME>
 <TYPE>gchar*</TYPE>
@@ -45686,7 +45706,7 @@
 <ARG>
 <NAME>GstVP8Enc::speed</NAME>
 <TYPE>gint</TYPE>
-<RANGE>[0,2]</RANGE>
+<RANGE>[0,7]</RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>Speed</NICK>
 <BLURB>Speed.</BLURB>
@@ -46093,6 +46113,266 @@
 <DEFAULT>0</DEFAULT>
 </ARG>
 
+<ARG>
+<NAME>frei0r-filter-opencvfacedetect::alpha</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Alpha</NICK>
+<BLURB>The alpha channel value for the shapes.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-opencvfacedetect::antialias</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Antialias</NICK>
+<BLURB>Draw with antialiasing.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-opencvfacedetect::classifier</NAME>
+<TYPE>gchar*</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Classifier</NICK>
+<BLURB>Full path to the XML pattern model for recognition; look in /usr/share/opencv/haarcascades.</BLURB>
+<DEFAULT>"/usr/share/opencv/haarcascades/haarcascade_frontalface_default.xml"</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-opencvfacedetect::color-1-b</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Color 1</NICK>
+<BLURB>The color of the first object.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-opencvfacedetect::color-1-g</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Color 1</NICK>
+<BLURB>The color of the first object.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-opencvfacedetect::color-1-r</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Color 1-R</NICK>
+<BLURB>The color of the first object.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-opencvfacedetect::color-2-b</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Color 2</NICK>
+<BLURB>The color of the second object.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-opencvfacedetect::color-2-g</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Color 2</NICK>
+<BLURB>The color of the second object.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-opencvfacedetect::color-2-r</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Color 2-R</NICK>
+<BLURB>The color of the second object.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-opencvfacedetect::color-3-b</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Color 3</NICK>
+<BLURB>The color of the third object.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-opencvfacedetect::color-3-g</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Color 3</NICK>
+<BLURB>The color of the third object.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-opencvfacedetect::color-3-r</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Color 3-R</NICK>
+<BLURB>The color of the third object.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-opencvfacedetect::color-4-b</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Color 4</NICK>
+<BLURB>The color of the fourth object.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-opencvfacedetect::color-4-g</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Color 4</NICK>
+<BLURB>The color of the fourth object.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-opencvfacedetect::color-4-r</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Color 4-R</NICK>
+<BLURB>The color of the fourth object.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-opencvfacedetect::color-5-b</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Color 5</NICK>
+<BLURB>The color of the fifth object.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-opencvfacedetect::color-5-g</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Color 5</NICK>
+<BLURB>The color of the fifth object.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-opencvfacedetect::color-5-r</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Color 5-R</NICK>
+<BLURB>The color of the fifth object.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-opencvfacedetect::neighbors</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Neighbors</NICK>
+<BLURB>Minimum number of rectangles that makes up an object, divided by 100.</BLURB>
+<DEFAULT>0.02</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-opencvfacedetect::recheck</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Recheck</NICK>
+<BLURB>How often to detect an object in number of frames, divided by 1000.</BLURB>
+<DEFAULT>0.025</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-opencvfacedetect::scale</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Scale</NICK>
+<BLURB>Down scale the image prior detection.</BLURB>
+<DEFAULT>0.666667</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-opencvfacedetect::search-scale</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Search scale</NICK>
+<BLURB>The search window scale factor, divided by 10.</BLURB>
+<DEFAULT>0.12</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-opencvfacedetect::shape</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Shape</NICK>
+<BLURB>The shape to draw: 0=circle, 0.1=ellipse, 0.2=rectangle, 1=random.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-opencvfacedetect::smallest</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Smallest</NICK>
+<BLURB>Minimum window size in pixels, divided by 1000.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-opencvfacedetect::stroke</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Stroke</NICK>
+<BLURB>Line width, divided by 100, or fill if 0.</BLURB>
+<DEFAULT>-1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-opencvfacedetect::threads</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Threads</NICK>
+<BLURB>How many threads to use divided by 100; 0 uses CPU count.</BLURB>
+<DEFAULT>0.01</DEFAULT>
+</ARG>
+
 <ARG>
 <NAME>GstVideoMaxRate::average-period</NAME>
 <TYPE>guint64</TYPE>
@@ -57653,3 +57933,1593 @@
 <DEFAULT>ntsc</DEFAULT>
 </ARG>
 
+<ARG>
+<NAME>frei0r-src-test-pat-r::amplitude</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Amplitude</NICK>
+<BLURB>Amplitude (contrast) of the pattern.</BLURB>
+<DEFAULT>0.8</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-src-test-pat-r::aspect-type</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Aspect type</NICK>
+<BLURB>Pixel aspect ratio presets.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-src-test-pat-r::channel</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Channel</NICK>
+<BLURB>Into which color channel to draw.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-src-test-pat-r::freq-1</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Freq 1</NICK>
+<BLURB>Pattern 7 H frequency.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-src-test-pat-r::freq-2</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Freq 2</NICK>
+<BLURB>Pattern 7 V frequency.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-src-test-pat-r::lin-p-swp</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Lin P swp</NICK>
+<BLURB>Use linear period sweep.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-src-test-pat-r::manual-aspect</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Manual aspect</NICK>
+<BLURB>Manual pixel aspect ratio.</BLURB>
+<DEFAULT>0.5</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-src-test-pat-r::type</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Type</NICK>
+<BLURB>Type of test pattern.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-src-test-pat-l::channel</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Channel</NICK>
+<BLURB>Into which color channel to draw.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-src-test-pat-l::type</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Type</NICK>
+<BLURB>Type of test pattern.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-src-test-pat-i::amplitude</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Amplitude</NICK>
+<BLURB>Amplitude (contrast) of the pattern.</BLURB>
+<DEFAULT>0.8</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-src-test-pat-i::channel</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Channel</NICK>
+<BLURB>Into which color channel to draw.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-src-test-pat-i::tilt</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Tilt</NICK>
+<BLURB>Angle of step function.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-src-test-pat-i::type</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Type</NICK>
+<BLURB>Type of test pattern.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-src-test-pat-i::width</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Width</NICK>
+<BLURB>Width of impulse.</BLURB>
+<DEFAULT>0.040404</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-src-test-pat-g::aspect-type</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Aspect type</NICK>
+<BLURB>Pixel aspect ratio presets.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-src-test-pat-g::manual-aspect</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Manual Aspect</NICK>
+<BLURB>Manual pixel aspect ratio.</BLURB>
+<DEFAULT>0.5</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-src-test-pat-g::size-1</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Size 1</NICK>
+<BLURB>Size of major features.</BLURB>
+<DEFAULT>0.28125</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-src-test-pat-g::size-2</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Size 2</NICK>
+<BLURB>Size of minor features.</BLURB>
+<DEFAULT>0.0625</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-src-test-pat-g::type</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Type</NICK>
+<BLURB>Type of test pattern.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-src-test-pat-c::color-space</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Color space</NICK>
+<BLURB></BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-src-test-pat-c::cross-section</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Cross section</NICK>
+<BLURB></BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-src-test-pat-c::third-axis-value</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Third axis value</NICK>
+<BLURB></BLURB>
+<DEFAULT>0.5</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-src-test-pat-b::aspect-type</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Aspect type</NICK>
+<BLURB>7 choices, pixel aspect ratio.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-src-test-pat-b::manual-aspect</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Manual Aspect</NICK>
+<BLURB>Manual pixel aspect ratio (Aspect type 6).</BLURB>
+<DEFAULT>0.5</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-src-test-pat-b::type</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Type</NICK>
+<BLURB>8 choices, select test pattern.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-sop-sat::aoffset</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>aOffset</NICK>
+<BLURB>Offset of the alpha component.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-sop-sat::apower</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>aPower</NICK>
+<BLURB>Power (Gamma) of the alpha component.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-sop-sat::aslope</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>aSlope</NICK>
+<BLURB>Slope of the alpha component.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-sop-sat::boffset</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>bOffset</NICK>
+<BLURB>Offset of the blue color component.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-sop-sat::bpower</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>bPower</NICK>
+<BLURB>Power (Gamma) of the blue color component.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-sop-sat::bslope</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>bSlope</NICK>
+<BLURB>Slope of the blue color component.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-sop-sat::goffset</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>gOffset</NICK>
+<BLURB>Offset of the green color component.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-sop-sat::gpower</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>gPower</NICK>
+<BLURB>Power (Gamma) of the green color component.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-sop-sat::gslope</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>gSlope</NICK>
+<BLURB>Slope of the green color component.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-sop-sat::roffset</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>rOffset</NICK>
+<BLURB>Offset of the red color component.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-sop-sat::rpower</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>rPower</NICK>
+<BLURB>Power (Gamma) of the red color component.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-sop-sat::rslope</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>rSlope</NICK>
+<BLURB>Slope of the red color component.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-sop-sat::saturation</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>saturation</NICK>
+<BLURB>Overall saturation.</BLURB>
+<DEFAULT>200</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-sharpness::amount</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Amount</NICK>
+<BLURB></BLURB>
+<DEFAULT>0.3</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-sharpness::size</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Size</NICK>
+<BLURB></BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-select0r::color-to-select-b</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Color to select</NICK>
+<BLURB></BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-select0r::color-to-select-g</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Color to select</NICK>
+<BLURB></BLURB>
+<DEFAULT>0.8</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-select0r::color-to-select-r</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Color to select-R</NICK>
+<BLURB></BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-select0r::delta-b---i---i</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Delta B / I / I</NICK>
+<BLURB></BLURB>
+<DEFAULT>0.2</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-select0r::delta-g---b---chroma</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Delta G / B / Chroma</NICK>
+<BLURB></BLURB>
+<DEFAULT>0.2</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-select0r::delta-r---a---hue</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Delta R / A / Hue</NICK>
+<BLURB></BLURB>
+<DEFAULT>0.2</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-select0r::edge-mode</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Edge mode</NICK>
+<BLURB></BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-select0r::invert-selection</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Invert selection</NICK>
+<BLURB></BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-select0r::operation</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Operation</NICK>
+<BLURB></BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-select0r::selection-subspace</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Selection subspace</NICK>
+<BLURB></BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-select0r::subspace-shape</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Subspace shape</NICK>
+<BLURB></BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-pr0file::alpha-trace</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Alpha trace</NICK>
+<BLURB>Show Alpha trace on scope.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-pr0file::b-trace</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>B trace</NICK>
+<BLURB>Show B trace on scope.</BLURB>
+<DEFAULT>TRUE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-pr0file::channel</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Channel</NICK>
+<BLURB>Channel to numerically display.</BLURB>
+<DEFAULT>0.375005</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-pr0file::color</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Color</NICK>
+<BLURB>rec 601 or rec 709.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-pr0file::crosshair-color</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Crosshair color</NICK>
+<BLURB>Color of the profile marker.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-pr0file::display-average</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Display average</NICK>
+<BLURB>e.</BLURB>
+<DEFAULT>TRUE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-pr0file::display-maximum</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Display maximum</NICK>
+<BLURB></BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-pr0file::display-minimum</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Display minimum</NICK>
+<BLURB></BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-pr0file::display-rms</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Display RMS</NICK>
+<BLURB></BLURB>
+<DEFAULT>TRUE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-pr0file::g-trace</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>G trace</NICK>
+<BLURB>Show G trace on scope.</BLURB>
+<DEFAULT>TRUE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-pr0file::length</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Length</NICK>
+<BLURB>Length of profile.</BLURB>
+<DEFAULT>0.589744</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-pr0file::marker-1</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Marker 1</NICK>
+<BLURB>Position of marker 1.</BLURB>
+<DEFAULT>-0.2</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-pr0file::marker-2</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Marker 2</NICK>
+<BLURB>Position of marker 2.</BLURB>
+<DEFAULT>-0.2</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-pr0file::param-256-scale</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>256 scale</NICK>
+<BLURB>use 0-255 instead of 0.0-1.0.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-pr0file::pb-trace</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Pb trace</NICK>
+<BLURB>Show Pb trace on scope.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-pr0file::pr-trace</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Pr trace</NICK>
+<BLURB>Show Pr trace on scope.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-pr0file::r-trace</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>R trace</NICK>
+<BLURB>Show R trace on scope.</BLURB>
+<DEFAULT>TRUE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-pr0file::tilt</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Tilt</NICK>
+<BLURB>Tilt of profile.</BLURB>
+<DEFAULT>0.5</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-pr0file::x</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>X</NICK>
+<BLURB>X position of profile.</BLURB>
+<DEFAULT>0.5</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-pr0file::y</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Y</NICK>
+<BLURB>Y position of profile.</BLURB>
+<DEFAULT>0.5</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-pr0file::y-trace</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Y trace</NICK>
+<BLURB>Show Y' trace on scope.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-pr0be::big-window</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Big window</NICK>
+<BLURB>Display more data.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-pr0be::measurement</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Measurement</NICK>
+<BLURB>What measurement to display.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-pr0be::param-256-scale</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>256 scale</NICK>
+<BLURB>use 0-255 instead of 0.0-1.0.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-pr0be::show-alpha</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Show alpha</NICK>
+<BLURB>Display alpha value too.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-pr0be::x</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>X</NICK>
+<BLURB>X position of probe.</BLURB>
+<DEFAULT>0.5</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-pr0be::x-size</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>X size</NICK>
+<BLURB>X size of probe.</BLURB>
+<DEFAULT>0.25</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-pr0be::y</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Y</NICK>
+<BLURB>Y position of probe.</BLURB>
+<DEFAULT>0.5</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-pr0be::y-size</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Y size</NICK>
+<BLURB>Y size of probe.</BLURB>
+<DEFAULT>0.25</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-light-graffiti::backgroundweight</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>backgroundWeight</NICK>
+<BLURB>Describes how strong the (accumulated) background should shine through.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-light-graffiti::blackreference</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>blackReference</NICK>
+<BLURB>Uses black as background image instead of the first frame.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-light-graffiti::dim</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>dim</NICK>
+<BLURB>Dimming of the light mask.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-light-graffiti::longalpha</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>longAlpha</NICK>
+<BLURB>Alpha value for moving average.</BLURB>
+<DEFAULT>0.0078125</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-light-graffiti::loweroverexposure</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>lowerOverexposure</NICK>
+<BLURB>Prevents some overexposure if the light source stays steady too long (varying speed).</BLURB>
+<DEFAULT>5.23869e-11</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-light-graffiti::nonlineardim</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>nonlinearDim</NICK>
+<BLURB>Nonlinear dimming (may look more natural).</BLURB>
+<DEFAULT>5.23869e-11</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-light-graffiti::reset</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>reset</NICK>
+<BLURB>Reset filter masks.</BLURB>
+<DEFAULT>5.23869e-11</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-light-graffiti::saturation</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>saturation</NICK>
+<BLURB>Saturation of lights.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-light-graffiti::sensitivity</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>sensitivity</NICK>
+<BLURB>Sensitivity of the effect for light (higher sensitivity will lead to brighter lights).</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-light-graffiti::statsbrightness</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>statsBrightness</NICK>
+<BLURB>Display the brightness and threshold, for adjusting the brightness threshold parameter.</BLURB>
+<DEFAULT>5.23869e-11</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-light-graffiti::statsdifference</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>statsDifference</NICK>
+<BLURB>Display the background difference and threshold.</BLURB>
+<DEFAULT>5.23869e-11</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-light-graffiti::statsdiffsum</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>statsDiffSum</NICK>
+<BLURB>Display the sum of the background difference and the threshold.</BLURB>
+<DEFAULT>5.23869e-11</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-light-graffiti::thresholdbrightness</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>thresholdBrightness</NICK>
+<BLURB>Brightness threshold to distinguish between foreground and background.</BLURB>
+<DEFAULT>450</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-light-graffiti::thresholddifference</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>thresholdDifference</NICK>
+<BLURB>Threshold: Difference to background to distinguish between fore- and background.</BLURB>
+<DEFAULT>5.23869e-11</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-light-graffiti::thresholddiffsum</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>thresholdDiffSum</NICK>
+<BLURB>Threshold for sum of differences. Can in most cases be ignored (set to 0).</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-light-graffiti::transparentbackground</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>transparentBackground</NICK>
+<BLURB>Make the background transparent.</BLURB>
+<DEFAULT>5.23869e-11</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-hqdn3d::spatial</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Spatial</NICK>
+<BLURB>Amount of spatial filtering.</BLURB>
+<DEFAULT>0.04</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-hqdn3d::temporal</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Temporal</NICK>
+<BLURB>Amount of temporal filtering.</BLURB>
+<DEFAULT>0.06</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-facebl0r::classifier</NAME>
+<TYPE>gchar*</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Classifier</NICK>
+<BLURB>Full path to the XML pattern model for recognition; look in /usr/share/opencv/haarcascades.</BLURB>
+<DEFAULT>"/usr/share/opencv/haarcascades/haarcascade_frontalface_default.xml"</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-facebl0r::ellipse</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ellipse</NICK>
+<BLURB>Draw a red ellipse around the object.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-facebl0r::largest</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Largest</NICK>
+<BLURB>Maximum object size in pixels, divided by 10000.</BLURB>
+<DEFAULT>0.05</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-facebl0r::neighbors</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Neighbors</NICK>
+<BLURB>Minimum number of rectangles that makes up an object, divided by 100.</BLURB>
+<DEFAULT>0.02</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-facebl0r::recheck</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Recheck</NICK>
+<BLURB>How often to detect an object in number of frames, divided by 1000.</BLURB>
+<DEFAULT>0.025</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-facebl0r::search-scale</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Search scale</NICK>
+<BLURB>The search window scale factor, divided by 10.</BLURB>
+<DEFAULT>0.12</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-facebl0r::smallest</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Smallest</NICK>
+<BLURB>Minimum window size in pixels, divided by 1000.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-facebl0r::threads</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Threads</NICK>
+<BLURB>How many threads to use divided by 100; 0 uses CPU count.</BLURB>
+<DEFAULT>0.01</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-defish0r::amount</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Amount</NICK>
+<BLURB>Focal Ratio.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-defish0r::aspect-type</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Aspect type</NICK>
+<BLURB>Pixel aspect ratio presets.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-defish0r::defish</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>DeFish</NICK>
+<BLURB>Fish or Defish.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-defish0r::interpolator</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Interpolator</NICK>
+<BLURB>Quality of interpolation.</BLURB>
+<DEFAULT>0.166667</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-defish0r::manual-aspect</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Manual Aspect</NICK>
+<BLURB>Manual Pixel Aspect ratio.</BLURB>
+<DEFAULT>0.5</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-defish0r::manual-scale</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Manual Scale</NICK>
+<BLURB>Manual Scale.</BLURB>
+<DEFAULT>0.5</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-defish0r::scaling</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Scaling</NICK>
+<BLURB>Scaling method.</BLURB>
+<DEFAULT>0.666667</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-defish0r::type</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Type</NICK>
+<BLURB>Mapping function.</BLURB>
+<DEFAULT>0.666667</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-coloradj-rgb::action</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Action</NICK>
+<BLURB>Type of color adjustment.</BLURB>
+<DEFAULT>0.333344</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-coloradj-rgb::alpha-controlled</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Alpha controlled</NICK>
+<BLURB>Adjust only areas with nonzero alpha.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-coloradj-rgb::b</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>B</NICK>
+<BLURB>Amount of blue.</BLURB>
+<DEFAULT>0.5</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-coloradj-rgb::g</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>G</NICK>
+<BLURB>Amount of green.</BLURB>
+<DEFAULT>0.5</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-coloradj-rgb::keep-luma</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Keep luma</NICK>
+<BLURB>Don't change brightness.</BLURB>
+<DEFAULT>TRUE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-coloradj-rgb::luma-formula</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Luma formula</NICK>
+<BLURB></BLURB>
+<DEFAULT>0.500025</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-coloradj-rgb::r</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>R</NICK>
+<BLURB>Amount of red.</BLURB>
+<DEFAULT>0.5</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-c0rners::alpha-operation</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Alpha operation</NICK>
+<BLURB></BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-c0rners::corner-1-x</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Corner 1 X</NICK>
+<BLURB>X coordinate of corner 1.</BLURB>
+<DEFAULT>0.333333</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-c0rners::corner-1-y</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Corner 1 Y</NICK>
+<BLURB>Y coordinate of corner 1.</BLURB>
+<DEFAULT>0.333333</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-c0rners::corner-2-x</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Corner 2 X</NICK>
+<BLURB>X coordinate of corner 2.</BLURB>
+<DEFAULT>0.666666</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-c0rners::corner-2-y</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Corner 2 Y</NICK>
+<BLURB>Y coordinate of corner 2.</BLURB>
+<DEFAULT>0.333333</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-c0rners::corner-3-x</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Corner 3 X</NICK>
+<BLURB>X coordinate of corner 3.</BLURB>
+<DEFAULT>0.666666</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-c0rners::corner-3-y</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Corner 3 Y</NICK>
+<BLURB>Y coordinate of corner 3.</BLURB>
+<DEFAULT>0.666666</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-c0rners::corner-4-x</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Corner 4 X</NICK>
+<BLURB>X coordinate of corner 4.</BLURB>
+<DEFAULT>0.333333</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-c0rners::corner-4-y</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Corner 4 Y</NICK>
+<BLURB>Y coordinate of corner 4.</BLURB>
+<DEFAULT>0.666666</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-c0rners::enable-stretch</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Enable Stretch</NICK>
+<BLURB>Enable stretching.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-c0rners::feather-alpha</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Feather Alpha</NICK>
+<BLURB>Makes smooth transition into transparent.</BLURB>
+<DEFAULT>0.01</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-c0rners::interpolator</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Interpolator</NICK>
+<BLURB>Quality of interpolation.</BLURB>
+<DEFAULT>0.166667</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-c0rners::stretch-x</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Stretch X</NICK>
+<BLURB>Amount of stretching in X direction.</BLURB>
+<DEFAULT>0.5</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-c0rners::stretch-y</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Stretch Y</NICK>
+<BLURB>Amount of stretching in Y direction.</BLURB>
+<DEFAULT>0.5</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-c0rners::transparent-background</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Transparent Background</NICK>
+<BLURB>Makes background transparent.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-alphaspot::max</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Max</NICK>
+<BLURB></BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-alphaspot::min</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Min</NICK>
+<BLURB></BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-alphaspot::operation</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Operation</NICK>
+<BLURB></BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-alphaspot::position-x</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Position X</NICK>
+<BLURB></BLURB>
+<DEFAULT>0.5</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-alphaspot::position-y</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Position Y</NICK>
+<BLURB></BLURB>
+<DEFAULT>0.5</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-alphaspot::shape</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Shape</NICK>
+<BLURB></BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-alphaspot::size-x</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Size X</NICK>
+<BLURB></BLURB>
+<DEFAULT>0.1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-alphaspot::size-y</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Size Y</NICK>
+<BLURB></BLURB>
+<DEFAULT>0.1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-alphaspot::tilt</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Tilt</NICK>
+<BLURB></BLURB>
+<DEFAULT>0.5</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-alphaspot::transition-width</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Transition width</NICK>
+<BLURB></BLURB>
+<DEFAULT>0.2</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-alphagrad::max</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Max</NICK>
+<BLURB></BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-alphagrad::min</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Min</NICK>
+<BLURB></BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-alphagrad::operation</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Operation</NICK>
+<BLURB></BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-alphagrad::position</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Position</NICK>
+<BLURB></BLURB>
+<DEFAULT>0.5</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-alphagrad::tilt</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Tilt</NICK>
+<BLURB></BLURB>
+<DEFAULT>0.5</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-alphagrad::transition-width</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Transition width</NICK>
+<BLURB></BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-alpha0ps::display</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Display</NICK>
+<BLURB></BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-alpha0ps::display-input-alpha</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Display input alpha</NICK>
+<BLURB></BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-alpha0ps::invert</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Invert</NICK>
+<BLURB></BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-alpha0ps::operation</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Operation</NICK>
+<BLURB></BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-alpha0ps::shrink-grow-amount</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Shrink/grow amount</NICK>
+<BLURB></BLURB>
+<DEFAULT>0.333344</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>frei0r-filter-alpha0ps::threshold</NAME>
+<TYPE>gdouble</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Threshold</NICK>
+<BLURB></BLURB>
+<DEFAULT>0.5</DEFAULT>
+</ARG>
+
diff --git a/docs/plugins/gst-plugins-bad-plugins.hierarchy b/docs/plugins/gst-plugins-bad-plugins.hierarchy
index ef9c6f37b6..cbfda73b5d 100644
--- a/docs/plugins/gst-plugins-bad-plugins.hierarchy
+++ b/docs/plugins/gst-plugins-bad-plugins.hierarchy
@@ -13,7 +13,6 @@ GObject
       GstAiffParse
       GstAsfMux
       GstAsfParse
-      GstAssRender
       GstBaseAudioVisualizer
         GstSpaceScope
         GstSpectraScope
@@ -35,42 +34,48 @@ GObject
         GstBaseAudioSink
           GstAudioSink
             GstApExSink
-            GstNasSink
             GstSDLAudioSink
         GstChecksumSink
+        GstCurlSink
         GstDCCPClientSink
         GstDCCPServerSink
         GstFBDEVSink
         GstInterAudioSink
         GstInterVideoSink
         GstLinsysSdiSink
-        GstSFSink
         GstShmSink
         GstVideoSink
-          GstDfbVideoSink
           GstSDLVideoSink
       GstBaseSrc
         GstDTMFSrc
         GstDataURISrc
-        GstFliteTestSrc
         GstInterAudioSrc
         GstInterVideoSrc
         GstLinsysSdiSrc
         GstPushSrc
           GstDCCPClientSrc
           GstDCCPServerSrc
-          GstDc1394
           GstDvbSrc
           GstMMS
+          GstNeonhttpSrc
           GstRfbSrc
           GstShmSrc
           GstVCDSrc
+          frei0r-src-ising0r
+          frei0r-src-lissajous0r
+          frei0r-src-nois0r
+          frei0r-src-onecol0r
+          frei0r-src-partik0l
+          frei0r-src-plasma
+          frei0r-src-test-pat-b
+          frei0r-src-test-pat-c
+          frei0r-src-test-pat-g
+          frei0r-src-test-pat-i
+          frei0r-src-test-pat-l
+          frei0r-src-test-pat-r
         GstRTPDTMFSrc
-        GstSFSrc
       GstBaseTransform
         GstAudioFilter
-          GstBPMDetect
-          GstOFA
           GstStereo
         GstBayer2RGB
         GstCogScale
@@ -113,34 +118,99 @@ GObject
             GstMirror
             GstRotate
             GstSquare
-          GstRsvgOverlay
           GstSolarize
           GstVideoAnalyse
           GstVideoDetect
           GstVideoMark
+          frei0r-filter-3-point-color-balance
+          frei0r-filter-3dflippo
+          frei0r-filter-alpha0ps
+          frei0r-filter-alphagrad
+          frei0r-filter-alphaspot
+          frei0r-filter-b
+          frei0r-filter-baltan
+          frei0r-filter-bluescreen0r
+          frei0r-filter-brightness
+          frei0r-filter-bw0r
+          frei0r-filter-c0rners
+          frei0r-filter-cartoon
+          frei0r-filter-color-distance
+          frei0r-filter-coloradj-rgb
+          frei0r-filter-contrast0r
+          frei0r-filter-curves
+          frei0r-filter-defish0r
+          frei0r-filter-delay0r
+          frei0r-filter-delaygrab
+          frei0r-filter-distort0r
+          frei0r-filter-edgeglow
+          frei0r-filter-equaliz0r
+          frei0r-filter-facebl0r
+          frei0r-filter-flippo
+          frei0r-filter-g
+          frei0r-filter-gamma
+          frei0r-filter-glow
+          frei0r-filter-hqdn3d
+          frei0r-filter-hueshift0r
+          frei0r-filter-invert0r
+          frei0r-filter-k-means-clustering
+          frei0r-filter-lens-correction
+          frei0r-filter-letterb0xed
+          frei0r-filter-levels
+          frei0r-filter-light-graffiti
+          frei0r-filter-luminance
+          frei0r-filter-mask0mate
+          frei0r-filter-nervous
+          frei0r-filter-nikon-d90-stairstepping-fix
+          frei0r-filter-nosync0r
+          frei0r-filter-opencvfacedetect
+          frei0r-filter-perspective
+          frei0r-filter-pixeliz0r
+          frei0r-filter-pr0be
+          frei0r-filter-pr0file
+          frei0r-filter-primaries
+          frei0r-filter-r
+          frei0r-filter-rgb-parade
+          frei0r-filter-saturat0r
+          frei0r-filter-scale0tilt
+          frei0r-filter-scanline0r
+          frei0r-filter-select0r
+          frei0r-filter-sharpness
+          frei0r-filter-sobel
+          frei0r-filter-sop-sat
+          frei0r-filter-squareblur
+          frei0r-filter-tehroxx0r
+          frei0r-filter-threelay0r
+          frei0r-filter-threshold0r
+          frei0r-filter-tint0r
+          frei0r-filter-transparency
+          frei0r-filter-twolay0r
+          frei0r-filter-vectorscope
+          frei0r-filter-vertigo
+          frei0r-filter-white-balance
         GstVideoFilter2
           GstSceneChange
           GstZebraStripe
         GstVideoMaxRate
       GstBaseVideoCodec
         GstBaseVideoDecoder
-          GstSchroDec
+          GstVP8Dec
         GstBaseVideoEncoder
-          GstDiracEnc
-          GstSchroEnc
+          GstVP8Enc
       GstBin
         DvbBaseBin
         GstAutoConvert
         GstAutoVideoConvert
-        GstBaseCameraSrc
-          GstWrapperCameraBinSrc
         GstFPSDisplaySink
         GstFaceOverlay
+        GstGSettingsSwitchSink
+          GstGSettingsAudioSink
+          GstGSettingsVideoSink
+        GstGSettingsSwitchSrc
+          GstGSettingsAudioSrc
+          GstGSettingsVideoSrc
         GstPipeline
           GstCameraBin
-          GstCameraBin2
         GstSDPDemux
-        GstViewfinderBin
         RsnDvdBin
       GstBz2dec
       GstBz2enc
@@ -154,26 +224,20 @@ GObject
       GstDVDSpu
       GstDecklinkSink
       GstDecklinkSrc
-      GstDtsDec
+      GstFaac
       GstFaad
       GstFestival
       GstFieldAnalysis
       GstFreeze
-      GstGSMDec
-      GstGSMEnc
-      GstGmeDec
       GstHLSDemux
       GstId3BaseMux
         GstId3Mux
       GstInterlace
+      GstInvtelecine
       GstIvfParse
       GstJP2kDecimator
       GstJifMux
       GstJpegParse
-      GstKateDec
-      GstKateEnc
-      GstKateParse
-        GstKateTag
       GstLegacyH264Parse
       GstLiveAdder
       GstMSE
@@ -181,16 +245,13 @@ GObject
       GstMXFMux
       GstMimDec
       GstMimEnc
-      GstModPlug
       GstMpegPSDemux
       GstMpegTSDemux
-      GstMusepackDec
       GstMveDemux
       GstMveMux
       GstNsfDec
       GstNuvDemux
       GstPcapParse
-      GstPitch
       GstPnmdec
       GstPnmenc
       GstRTPMux
@@ -200,34 +261,20 @@ GObject
         GstVideoParse
       GstRealAudioDec
       GstRealVideoDec
-      GstRsvgDec
       GstSSim
       GstSdiDemux
       GstSdiMux
       GstSegmentClip
         GstAudioSegmentClip
         GstVideoSegmentClip
-      GstSignalProcessor
-        ladspa-amp-mono
-        ladspa-amp-stereo
-        ladspa-delay-5s
-        ladspa-hpf
-        ladspa-lpf
-        ladspa-noise-white
-        ladspa-sine-faaa
-        ladspa-sine-faac
-        ladspa-sine-fcaa
-        ladspa-sine-fcac
       GstSirenDec
       GstSirenEnc
       GstSpeed
       GstSrtEnc
-      GstTRM
       GstTtaDec
       GstTtaParse
       GstVMncDec
       GstVcdParse
-      GstWildmidi
       GstY4mDec
       MpegPsMux
       MpegTSBase
@@ -236,9 +283,39 @@ GObject
       MpegTSParse
       MpegTsMux
       MpegVideoParse
+      frei0r-mixer-addition
+      frei0r-mixer-addition-alpha
+      frei0r-mixer-alpha-injection
+      frei0r-mixer-alphaatop
+      frei0r-mixer-alphain
+      frei0r-mixer-alphaout
+      frei0r-mixer-alphaover
+      frei0r-mixer-alphaxor
+      frei0r-mixer-blend
+      frei0r-mixer-burn
+      frei0r-mixer-color-only
+      frei0r-mixer-composition
+      frei0r-mixer-darken
+      frei0r-mixer-difference
+      frei0r-mixer-divide
+      frei0r-mixer-dodge
+      frei0r-mixer-grain-extract
+      frei0r-mixer-grain-merge
+      frei0r-mixer-hardlight
+      frei0r-mixer-hue
+      frei0r-mixer-lighten
+      frei0r-mixer-multiply
+      frei0r-mixer-overlay
+      frei0r-mixer-rgb
+      frei0r-mixer-saturation
+      frei0r-mixer-screen
+      frei0r-mixer-softlight
+      frei0r-mixer-subtract
+      frei0r-mixer-uv-map
+      frei0r-mixer-value
+      frei0r-mixer-xfade0r
     GstPad
     GstPadTemplate
-      GstSignalProcessorPadTemplate
     GstPlugin
     GstPluginFeature
       GstElementFactory
diff --git a/tests/examples/camerabin/gst-camera-perf.c b/tests/examples/camerabin/gst-camera-perf.c
index bb37ceecd0..c5554a0e3b 100644
--- a/tests/examples/camerabin/gst-camera-perf.c
+++ b/tests/examples/camerabin/gst-camera-perf.c
@@ -44,7 +44,7 @@
  * Includes
  */
 #ifdef HAVE_CONFIG_H
-#  include "config.h"
+#include "config.h"
 #endif
 
 /* save the snapshot images
@@ -300,8 +300,6 @@ img_capture_done (GstElement * camera, GString * fname, gpointer user_data)
       GstClockTime max = 0;
       GstClockTime min = -1;
       GstClockTime total = 0;
-      GstClockTime first_shot = 0;
-      GstClockTime snd_shot = 0;
 
       num_pics_cont = 0;
       signal_cont = FALSE;
@@ -309,13 +307,11 @@ img_capture_done (GstElement * camera, GString * fname, gpointer user_data)
       DIFF_TIME (t_final[0], t_initial, diff);
       max < diff ? max = diff : max;
       min > diff ? min = diff : min;
-      first_shot = diff;
       total += diff;
 
       DIFF_TIME (t_final[1], t_final[0], diff);
       max < diff ? max = diff : max;
       min > diff ? min = diff : min;
-      snd_shot = diff;
       total += diff;
 
       for (i = 2; i < CONT_SHOTS; ++i) {

From 1f50564962c0c94cd160b4bf972458de6fc7782a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Wed, 13 Jul 2011 10:33:58 +0200
Subject: [PATCH 077/158] diracenc: Fix compilation by including the new
 gstbasevideoutils.h header and fixing some set but not used compiler warnings

---
 ext/dirac/gstdiracenc.cc | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/ext/dirac/gstdiracenc.cc b/ext/dirac/gstdiracenc.cc
index 1c499d71f8..7239ccf278 100644
--- a/ext/dirac/gstdiracenc.cc
+++ b/ext/dirac/gstdiracenc.cc
@@ -24,6 +24,7 @@
 #include <gst/gst.h>
 #include <gst/video/video.h>
 #include <gst/video/gstbasevideoencoder.h>
+#include <gst/video/gstbasevideoutils.h>
 #include <string.h>
 #include <libdirac_encoder/dirac_encoder.h>
 #include <math.h>
@@ -223,13 +224,11 @@ static void
 gst_dirac_enc_class_init (GstDiracEncClass * klass)
 {
   GObjectClass *gobject_class;
-  GstElementClass *gstelement_class;
   GstBaseVideoEncoderClass *basevideoencoder_class;
 
   //int i;
 
   gobject_class = G_OBJECT_CLASS (klass);
-  gstelement_class = GST_ELEMENT_CLASS (klass);
   basevideoencoder_class = GST_BASE_VIDEO_ENCODER_CLASS (klass);
 
   gobject_class->set_property = gst_dirac_enc_set_property;
@@ -1136,7 +1135,6 @@ gst_dirac_enc_process (GstDiracEnc * dirac_enc, gboolean end_sequence)
 {
   GstBuffer *outbuf;
   GstFlowReturn ret;
-  int presentation_frame;
   int parse_code;
   int state;
   GstVideoFrame *frame;
@@ -1192,8 +1190,6 @@ gst_dirac_enc_process (GstDiracEnc * dirac_enc, gboolean end_sequence)
         dirac_enc->pull_frame_num++;
 
         parse_code = ((guint8 *) GST_BUFFER_DATA (outbuf))[4];
-        /* FIXME */
-        presentation_frame = 0;
 
         if (DIRAC_PARSE_CODE_IS_SEQ_HEADER (parse_code)) {
           frame->is_sync_point = TRUE;
@@ -1230,7 +1226,6 @@ gst_dirac_enc_shape_output_ogg (GstBaseVideoEncoder * base_video_encoder,
     GstVideoFrame * frame)
 {
   GstDiracEnc *dirac_enc;
-  int dpn;
   int delay;
   int dist;
   int pt;
@@ -1241,8 +1236,6 @@ gst_dirac_enc_shape_output_ogg (GstBaseVideoEncoder * base_video_encoder,
 
   dirac_enc = GST_DIRAC_ENC (base_video_encoder);
 
-  dpn = frame->decode_frame_number;
-
   pt = frame->presentation_frame_number * 2 + dirac_enc->granule_offset;
   dt = frame->decode_frame_number * 2 + dirac_enc->granule_offset;
   delay = pt - dt;

From 62224e66f9f682aef95e25ace7225e2682d5b5f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Wed, 13 Jul 2011 10:42:36 +0200
Subject: [PATCH 078/158] schroedinger: Fix compilation and set-but-not-used
 compiler warnings

---
 ext/schroedinger/gstschrodec.c | 56 ++++------------------------------
 ext/schroedinger/gstschroenc.c |  4 +--
 2 files changed, 7 insertions(+), 53 deletions(-)

diff --git a/ext/schroedinger/gstschrodec.c b/ext/schroedinger/gstschrodec.c
index ab2c45a2c3..126ef1fed4 100644
--- a/ext/schroedinger/gstschrodec.c
+++ b/ext/schroedinger/gstschrodec.c
@@ -78,10 +78,6 @@ enum
 };
 
 static void gst_schro_dec_finalize (GObject * object);
-static void gst_schro_dec_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec);
-static void gst_schro_dec_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec);
 
 static gboolean gst_schro_dec_sink_query (GstPad * pad, GstQuery * query);
 
@@ -137,8 +133,6 @@ gst_schro_dec_class_init (GstSchroDecClass * klass)
   gobject_class = G_OBJECT_CLASS (klass);
   base_video_decoder_class = GST_BASE_VIDEO_DECODER_CLASS (klass);
 
-  gobject_class->set_property = gst_schro_dec_set_property;
-  gobject_class->get_property = gst_schro_dec_get_property;
   gobject_class->finalize = gst_schro_dec_finalize;
 
   base_video_decoder_class->start = GST_DEBUG_FUNCPTR (gst_schro_dec_start);
@@ -172,21 +166,16 @@ static gint64
 granulepos_to_frame (gint64 granulepos)
 {
   guint64 pt;
-  int dist_h;
-  int dist_l;
-  int dist;
-  int delay;
-  guint64 dt;
 
   if (granulepos == -1)
     return -1;
 
   pt = ((granulepos >> 22) + (granulepos & OGG_DIRAC_GRANULE_LOW_MASK)) >> 9;
-  dist_h = (granulepos >> 22) & 0xff;
-  dist_l = granulepos & 0xff;
-  dist = (dist_h << 8) | dist_l;
-  delay = (granulepos >> 9) & 0x1fff;
-  dt = pt - delay;
+  /* dist_h = (granulepos >> 22) & 0xff;
+   * dist_l = granulepos & 0xff;
+   * dist = (dist_h << 8) | dist_l;
+   * delay = (granulepos >> 9) & 0x1fff;
+   * dt = pt - delay; */
 
   return pt >> 1;
 }
@@ -308,38 +297,6 @@ gst_schro_dec_finalize (GObject * object)
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
-static void
-gst_schro_dec_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec)
-{
-  GstSchroDec *src;
-
-  g_return_if_fail (GST_IS_SCHRO_DEC (object));
-  src = GST_SCHRO_DEC (object);
-
-  GST_DEBUG ("gst_schro_dec_set_property");
-  switch (prop_id) {
-    default:
-      break;
-  }
-}
-
-static void
-gst_schro_dec_get_property (GObject * object, guint prop_id, GValue * value,
-    GParamSpec * pspec)
-{
-  GstSchroDec *src;
-
-  g_return_if_fail (GST_IS_SCHRO_DEC (object));
-  src = GST_SCHRO_DEC (object);
-
-  switch (prop_id) {
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
-
 static void
 parse_sequence_header (GstSchroDec * schro_dec, guint8 * data, int size)
 {
@@ -642,7 +599,6 @@ gst_schro_dec_handle_frame (GstBaseVideoDecoder * base_video_decoder,
     GstVideoFrame * frame)
 {
   GstSchroDec *schro_dec;
-  int schro_ret;
   SchroBuffer *input_buffer;
 
   schro_dec = GST_SCHRO_DEC (base_video_decoder);
@@ -654,7 +610,7 @@ gst_schro_dec_handle_frame (GstBaseVideoDecoder * base_video_decoder,
 
   input_buffer->tag = schro_tag_new (frame, NULL);
 
-  schro_ret = schro_decoder_autoparse_push (schro_dec->decoder, input_buffer);
+  schro_decoder_autoparse_push (schro_dec->decoder, input_buffer);
 
   return gst_schro_dec_process (schro_dec, FALSE);
 }
diff --git a/ext/schroedinger/gstschroenc.c b/ext/schroedinger/gstschroenc.c
index 16a3af95a2..3dbe9fe991 100644
--- a/ext/schroedinger/gstschroenc.c
+++ b/ext/schroedinger/gstschroenc.c
@@ -24,6 +24,7 @@
 #include <gst/gst.h>
 #include <gst/video/video.h>
 #include <gst/video/gstbasevideoencoder.h>
+#include <gst/video/gstbasevideoutils.h>
 #include <string.h>
 
 #include <schroedinger/schro.h>
@@ -612,7 +613,6 @@ gst_schro_enc_shape_output_ogg (GstBaseVideoEncoder * base_video_encoder,
     GstVideoFrame * frame)
 {
   GstSchroEnc *schro_enc;
-  int dpn;
   int delay;
   int dist;
   int pt;
@@ -623,8 +623,6 @@ gst_schro_enc_shape_output_ogg (GstBaseVideoEncoder * base_video_encoder,
 
   schro_enc = GST_SCHRO_ENC (base_video_encoder);
 
-  dpn = frame->decode_frame_number;
-
   pt = frame->presentation_frame_number * 2 + schro_enc->granule_offset;
   dt = frame->decode_frame_number * 2 + schro_enc->granule_offset;
   delay = pt - dt;

From ad9780749755f1ec1067052c3cbde515b76e4214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
Date: Wed, 13 Jul 2011 13:38:31 -0400
Subject: [PATCH 079/158] mpegdemux: Restore erroneously removed data++

Also, put back some unused code in comment and replace // comments by /* */
---
 gst/mpegdemux/mpegtspacketizer.c | 36 +++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/gst/mpegdemux/mpegtspacketizer.c b/gst/mpegdemux/mpegtspacketizer.c
index 83e89ac93d..a9a69c9d3c 100644
--- a/gst/mpegdemux/mpegtspacketizer.c
+++ b/gst/mpegdemux/mpegtspacketizer.c
@@ -344,6 +344,7 @@ mpegts_packetizer_parse_descriptors (MpegTSPacketizer * packetizer,
   data = *buffer;
 
   while (data < buffer_end) {
+    data++;                     /* skip tag */
     length = *data++;
 
     if (data + length > buffer_end) {
@@ -1354,6 +1355,9 @@ mpegts_packetizer_parse_sdt (MpegTSPacketizer * packetizer,
     service_id = GST_READ_UINT16_BE (data);
     data += 2;
 
+    /* EIT_schedule = ((*data & 0x02) == 2); */
+    /* EIT_present_following = (*data & 0x01) == 1; */
+
     data += 1;
     tmp = GST_READ_UINT16_BE (data);
 
@@ -1560,6 +1564,7 @@ mpegts_packetizer_parse_eit (MpegTSPacketizer * packetizer,
 
     event_id = GST_READ_UINT16_BE (data);
     data += 2;
+    /* start_and_duration = GST_READ_UINT64_BE (data); */
     duration_ptr = data + 5;
     utc_ptr = data + 2;
     mjd = GST_READ_UINT16_BE (data);
@@ -1703,7 +1708,7 @@ mpegts_packetizer_parse_eit (MpegTSPacketizer * packetizer,
           GValue component_value = { 0 };
           gint widescreen = 0;  /* 0 for 4:3, 1 for 16:9, 2 for > 16:9 */
           gint freq = 25;       /* 25 or 30 measured in Hertz */
-          //gboolean highdef = FALSE;
+          /* gboolean highdef = FALSE; */
           gboolean panvectors = FALSE;
           const gchar *comptype = "";
 
@@ -1750,46 +1755,46 @@ mpegts_packetizer_parse_eit (MpegTSPacketizer * packetizer,
                   break;
                 case 0x09:
                   widescreen = 0;
-                  //highdef = TRUE;
+                  /* highdef = TRUE; */
                   freq = 25;
                   break;
                 case 0x0A:
                   widescreen = 1;
-                  //highdef = TRUE;
+                  /* highdef = TRUE; */
                   panvectors = TRUE;
                   freq = 25;
                   break;
                 case 0x0B:
                   widescreen = 1;
-                  //highdef = TRUE;
+                  /* highdef = TRUE; */
                   panvectors = FALSE;
                   freq = 25;
                   break;
                 case 0x0C:
                   widescreen = 2;
-                  //highdef = TRUE;
+                  /* highdef = TRUE; */
                   freq = 25;
                   break;
                 case 0x0D:
                   widescreen = 0;
-                  //highdef = TRUE;
+                  /* highdef = TRUE; */
                   freq = 30;
                   break;
                 case 0x0E:
                   widescreen = 1;
-                  //highdef = TRUE;
+                  /* highdef = TRUE; */
                   panvectors = TRUE;
                   freq = 30;
                   break;
                 case 0x0F:
                   widescreen = 1;
-                  //highdef = TRUE;
+                  /* highdef = TRUE; */
                   panvectors = FALSE;
                   freq = 30;
                   break;
                 case 0x10:
                   widescreen = 2;
-                  //highdef = TRUE;
+                  /* highdef = TRUE; */
                   freq = 30;
                   break;
               }
@@ -2379,14 +2384,15 @@ get_encoding (const gchar * text, guint * start_text, gboolean * is_multibyte)
     *start_text = 1;
     *is_multibyte = TRUE;
   } else if (firstbyte == 0x12) {
-    // That's korean encoding.
-    // The spec says it's encoded in KSC 5601, but iconv only knows KSC 5636.
-    // Couldn't find any information about either of them.
+    /* That's korean encoding.
+     * The spec says it's encoded in KSC 5601, but iconv only knows KSC 5636.
+     * Couldn't find any information about either of them.
+     */
     encoding = NULL;
     *start_text = 1;
     *is_multibyte = TRUE;
   } else {
-    // reserved
+    /* reserved */
     encoding = NULL;
     *start_text = 0;
     *is_multibyte = FALSE;
@@ -2436,7 +2442,7 @@ convert_to_utf8 (const gchar * text, gint length, guint start,
             /* skip it */
             break;
           case 0xE08A:{
-            guint8 nl[] = { 0x0A, 0x00 };       // new line
+            guint8 nl[] = { 0x0A, 0x00 };       /* new line */
             g_byte_array_append (sb, nl, 2);
             break;
           }
@@ -2457,7 +2463,7 @@ convert_to_utf8 (const gchar * text, gint length, guint start,
             /* skip it */
             break;
           case 0xE08A:{
-            guint8 nl[] = { 0x0A, 0x00 };       // new line
+            guint8 nl[] = { 0x0A, 0x00 };       /* new line */
             g_byte_array_append (sb, nl, 2);
             break;
           }

From ca7a5127394778315ead588b6856617cf0b8ef00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
Date: Wed, 13 Jul 2011 13:39:46 -0400
Subject: [PATCH 080/158] mpegtsdemux: Restore erroneously removed data++

Also, put back some unused code in comment and replace // comments by /* */
---
 gst/mpegtsdemux/mpegtspacketizer.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/gst/mpegtsdemux/mpegtspacketizer.c b/gst/mpegtsdemux/mpegtspacketizer.c
index 2c026e6b43..25d75cfa84 100644
--- a/gst/mpegtsdemux/mpegtspacketizer.c
+++ b/gst/mpegtsdemux/mpegtspacketizer.c
@@ -384,6 +384,7 @@ mpegts_packetizer_parse_descriptors (MpegTSPacketizer2 * packetizer,
   data = *buffer;
 
   while (data < buffer_end) {
+    data++;                     /* skip tag */
     length = *data++;
 
     if (data + length > buffer_end) {
@@ -1404,6 +1405,9 @@ mpegts_packetizer_parse_sdt (MpegTSPacketizer2 * packetizer,
     service_id = GST_READ_UINT16_BE (data);
     data += 2;
 
+    /* EIT_schedule = ((*data & 0x02) == 2); */
+    /* EIT_present_following = (*data & 0x01) == 1; */
+
     data += 1;
     tmp = GST_READ_UINT16_BE (data);
 
@@ -1610,6 +1614,7 @@ mpegts_packetizer_parse_eit (MpegTSPacketizer2 * packetizer,
 
     event_id = GST_READ_UINT16_BE (data);
     data += 2;
+    /* start_and_duration = GST_READ_UINT64_BE (data); */
     duration_ptr = data + 5;
     utc_ptr = data + 2;
     mjd = GST_READ_UINT16_BE (data);
@@ -2514,14 +2519,15 @@ get_encoding (const gchar * text, guint * start_text, gboolean * is_multibyte)
     *start_text = 1;
     *is_multibyte = TRUE;
   } else if (firstbyte == 0x12) {
-    // That's korean encoding.
-    // The spec says it's encoded in KSC 5601, but iconv only knows KSC 5636.
-    // Couldn't find any information about either of them.
+    /* That's korean encoding.
+     * The spec says it's encoded in KSC 5601, but iconv only knows KSC 5636.
+     * Couldn't find any information about either of them.
+     */
     encoding = NULL;
     *start_text = 1;
     *is_multibyte = TRUE;
   } else {
-    // reserved
+    /* reserved */
     encoding = NULL;
     *start_text = 0;
     *is_multibyte = FALSE;
@@ -2571,7 +2577,7 @@ convert_to_utf8 (const gchar * text, gint length, guint start,
             /* skip it */
             break;
           case 0xE08A:{
-            guint8 nl[] = { 0x0A, 0x00 };       // new line
+            guint8 nl[] = { 0x0A, 0x00 };       /* new line */
             g_byte_array_append (sb, nl, 2);
             break;
           }
@@ -2592,7 +2598,7 @@ convert_to_utf8 (const gchar * text, gint length, guint start,
             /* skip it */
             break;
           case 0xE08A:{
-            guint8 nl[] = { 0x0A, 0x00 };       // new line
+            guint8 nl[] = { 0x0A, 0x00 };       /* new line */
             g_byte_array_append (sb, nl, 2);
             break;
           }

From 4fffbd2cd033091c2f24688074d2772ca5404886 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
Date: Wed, 13 Jul 2011 13:42:09 -0400
Subject: [PATCH 081/158] mpegvideoparse: Restore some unused variables as
 comments

---
 gst/mpegvideoparse/mpegpacketiser.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gst/mpegvideoparse/mpegpacketiser.c b/gst/mpegvideoparse/mpegpacketiser.c
index 2a95fa688c..78721daea1 100644
--- a/gst/mpegvideoparse/mpegpacketiser.c
+++ b/gst/mpegvideoparse/mpegpacketiser.c
@@ -521,8 +521,10 @@ mpeg_util_parse_extension_packet (MPEGSeqHdr * hdr, guint8 * data, guint8 * end)
       hdr->profile = data[0] & 0x0f;    /* profile (0:2) + escape bit (3) */
       hdr->level = (data[1] >> 4) & 0x0f;
       hdr->progressive = data[1] & 0x08;
+      /* chroma_format = (data[1] >> 2) & 0x03; */
       horiz_size_ext = ((data[1] << 1) & 0x02) | ((data[2] >> 7) & 0x01);
       vert_size_ext = (data[2] >> 5) & 0x03;
+      /* low_delay = data[5] >> 7; */
       fps_n_ext = (data[5] >> 5) & 0x03;
       fps_d_ext = data[5] & 0x1f;
 
@@ -579,6 +581,7 @@ mpeg_util_parse_sequence_hdr (MPEGSeqHdr * hdr, guint8 * data, guint8 * end)
     hdr->bitrate *= 400;
   }
 
+  /* constrained_flag = (data[7] >> 2) & 0x01; */
   load_intra_flag = (data[7] >> 1) & 0x01;
   if (load_intra_flag) {
     if (G_UNLIKELY ((end - data) < 64))

From 021696db6b843f33506ac8092789977247939cfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
Date: Wed, 13 Jul 2011 13:44:41 -0400
Subject: [PATCH 082/158] docs: Revert wrongly committed changes to
 .args/.hierarchy

---
 docs/plugins/gst-plugins-bad-plugins.args     | 1916 +----------------
 .../plugins/gst-plugins-bad-plugins.hierarchy |  163 +-
 2 files changed, 66 insertions(+), 2013 deletions(-)

diff --git a/docs/plugins/gst-plugins-bad-plugins.args b/docs/plugins/gst-plugins-bad-plugins.args
index 51392aab10..2640dd488c 100644
--- a/docs/plugins/gst-plugins-bad-plugins.args
+++ b/docs/plugins/gst-plugins-bad-plugins.args
@@ -26710,7 +26710,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ratiox</NICK>
 <BLURB>x-ratio.</BLURB>
-<DEFAULT>3.06544e-115</DEFAULT>
+<DEFAULT>1.21136e-314</DEFAULT>
 </ARG>
 
 <ARG>
@@ -26720,7 +26720,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ratioy</NICK>
 <BLURB>y-ratio.</BLURB>
-<DEFAULT>1.53064e-18</DEFAULT>
+<DEFAULT>2.33156e-310</DEFAULT>
 </ARG>
 
 <ARG>
@@ -26730,7 +26730,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>DelayTime</NICK>
 <BLURB>the delay time.</BLURB>
-<DEFAULT>0</DEFAULT>
+<DEFAULT>1.37974e-309</DEFAULT>
 </ARG>
 
 <ARG>
@@ -26760,7 +26760,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>Color</NICK>
 <BLURB>the color of the image.</BLURB>
-<DEFAULT>0.011489</DEFAULT>
+<DEFAULT>0</DEFAULT>
 </ARG>
 
 <ARG>
@@ -26770,7 +26770,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>Color</NICK>
 <BLURB>the color of the image.</BLURB>
-<DEFAULT>9.33458e-15</DEFAULT>
+<DEFAULT>0</DEFAULT>
 </ARG>
 
 <ARG>
@@ -26780,7 +26780,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>Color-R</NICK>
 <BLURB>the color of the image.</BLURB>
-<DEFAULT>8.37068e-21</DEFAULT>
+<DEFAULT>0</DEFAULT>
 </ARG>
 
 <ARG>
@@ -27120,7 +27120,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>lthresh</NICK>
 <BLURB>threshold for edge lightening.</BLURB>
-<DEFAULT>0</DEFAULT>
+<DEFAULT>6.9235e+228</DEFAULT>
 </ARG>
 
 <ARG>
@@ -27130,7 +27130,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>lupscale</NICK>
 <BLURB>multiplier for upscaling edge brightness.</BLURB>
-<DEFAULT>0</DEFAULT>
+<DEFAULT>8.20074e-304</DEFAULT>
 </ARG>
 
 <ARG>
@@ -27300,7 +27300,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>blend</NICK>
 <BLURB>blend factor.</BLURB>
-<DEFAULT>4.62958e-299</DEFAULT>
+<DEFAULT>7.75037e-304</DEFAULT>
 </ARG>
 
 <ARG>
@@ -27310,7 +27310,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>fader</NICK>
 <BLURB>the fader position.</BLURB>
-<DEFAULT>7.06238e-304</DEFAULT>
+<DEFAULT>3.84008e-315</DEFAULT>
 </ARG>
 
 <ARG>
@@ -27490,7 +27490,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>HSync</NICK>
 <BLURB>the hsync offset.</BLURB>
-<DEFAULT>0</DEFAULT>
+<DEFAULT>1</DEFAULT>
 </ARG>
 
 <ARG>
@@ -33819,8 +33819,8 @@
 <RANGE></RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>Channel</NICK>
-<BLURB>Channel to adjust (0 = red, 0.1 = green, 0.2 = blue, 0.3 = alpha, 0.4 = luma, 0.5 = rgb, 0.6 = hue, 0.7 = saturation).</BLURB>
-<DEFAULT>0.5</DEFAULT>
+<BLURB>Channel to adjust levels (1 = RED; 2 = GREEN; 3 = BLUE; 4 = LUMA).</BLURB>
+<DEFAULT>0</DEFAULT>
 </ARG>
 
 <ARG>
@@ -33829,7 +33829,7 @@
 <RANGE></RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>Curve point number</NICK>
-<BLURB>Number of points to use to build curve.</BLURB>
+<BLURB>Number of point to use to build curve.</BLURB>
 <DEFAULT>2</DEFAULT>
 </ARG>
 
@@ -33850,7 +33850,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>Point 1 input value</NICK>
 <BLURB>Point 1 input value.</BLURB>
-<DEFAULT>0</DEFAULT>
+<DEFAULT>1</DEFAULT>
 </ARG>
 
 <ARG>
@@ -33860,7 +33860,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>Point 1 output value</NICK>
 <BLURB>Point 1 output value.</BLURB>
-<DEFAULT>0</DEFAULT>
+<DEFAULT>1</DEFAULT>
 </ARG>
 
 <ARG>
@@ -33890,7 +33890,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>Point 3 input value</NICK>
 <BLURB>Point 3 input value.</BLURB>
-<DEFAULT>0</DEFAULT>
+<DEFAULT>1</DEFAULT>
 </ARG>
 
 <ARG>
@@ -33900,7 +33900,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>Point 3 output value</NICK>
 <BLURB>Point 3 output value.</BLURB>
-<DEFAULT>0</DEFAULT>
+<DEFAULT>1</DEFAULT>
 </ARG>
 
 <ARG>
@@ -33910,7 +33910,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>Point 4 input value</NICK>
 <BLURB>Point 4 input value.</BLURB>
-<DEFAULT>0</DEFAULT>
+<DEFAULT>1</DEFAULT>
 </ARG>
 
 <ARG>
@@ -33920,7 +33920,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>Point 4 output value</NICK>
 <BLURB>Point 4 output value.</BLURB>
-<DEFAULT>0</DEFAULT>
+<DEFAULT>1</DEFAULT>
 </ARG>
 
 <ARG>
@@ -33930,7 +33930,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>Point 5 input value</NICK>
 <BLURB>Point 5 input value.</BLURB>
-<DEFAULT>0</DEFAULT>
+<DEFAULT>1</DEFAULT>
 </ARG>
 
 <ARG>
@@ -33940,7 +33940,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>Point 5 output value</NICK>
 <BLURB>Point 5 output value.</BLURB>
-<DEFAULT>0</DEFAULT>
+<DEFAULT>1</DEFAULT>
 </ARG>
 
 <ARG>
@@ -33953,26 +33953,6 @@
 <DEFAULT>TRUE</DEFAULT>
 </ARG>
 
-<ARG>
-<NAME>frei0r-filter-curves::b--zier-spline</NAME>
-<TYPE>gchar*</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Bézier spline</NICK>
-<BLURB>Use cubic Bézier spline. Has to be a sorted list of points in the format "handle1x;handle1y#pointx;pointy#handle2x;handle2y"(pointx = in, pointy = out). Points are separated by a "|".The values can have "double" precision. x, y for points should be in the range 0-1. x,y for handles might also be out of this range.</BLURB>
-<DEFAULT>""</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-curves::luma-formula</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Luma formula</NICK>
-<BLURB>Use Rec. 601 (false) or Rec. 709 (true).</BLURB>
-<DEFAULT>TRUE</DEFAULT>
-</ARG>
-
 <ARG>
 <NAME>VdpSink::display</NAME>
 <TYPE>gchar*</TYPE>
@@ -45706,7 +45686,7 @@
 <ARG>
 <NAME>GstVP8Enc::speed</NAME>
 <TYPE>gint</TYPE>
-<RANGE>[0,7]</RANGE>
+<RANGE>[0,2]</RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>Speed</NICK>
 <BLURB>Speed.</BLURB>
@@ -46113,266 +46093,6 @@
 <DEFAULT>0</DEFAULT>
 </ARG>
 
-<ARG>
-<NAME>frei0r-filter-opencvfacedetect::alpha</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Alpha</NICK>
-<BLURB>The alpha channel value for the shapes.</BLURB>
-<DEFAULT>1</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-opencvfacedetect::antialias</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Antialias</NICK>
-<BLURB>Draw with antialiasing.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-opencvfacedetect::classifier</NAME>
-<TYPE>gchar*</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Classifier</NICK>
-<BLURB>Full path to the XML pattern model for recognition; look in /usr/share/opencv/haarcascades.</BLURB>
-<DEFAULT>"/usr/share/opencv/haarcascades/haarcascade_frontalface_default.xml"</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-opencvfacedetect::color-1-b</NAME>
-<TYPE>gfloat</TYPE>
-<RANGE>[0,1]</RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Color 1</NICK>
-<BLURB>The color of the first object.</BLURB>
-<DEFAULT>1</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-opencvfacedetect::color-1-g</NAME>
-<TYPE>gfloat</TYPE>
-<RANGE>[0,1]</RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Color 1</NICK>
-<BLURB>The color of the first object.</BLURB>
-<DEFAULT>1</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-opencvfacedetect::color-1-r</NAME>
-<TYPE>gfloat</TYPE>
-<RANGE>[0,1]</RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Color 1-R</NICK>
-<BLURB>The color of the first object.</BLURB>
-<DEFAULT>1</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-opencvfacedetect::color-2-b</NAME>
-<TYPE>gfloat</TYPE>
-<RANGE>[0,1]</RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Color 2</NICK>
-<BLURB>The color of the second object.</BLURB>
-<DEFAULT>1</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-opencvfacedetect::color-2-g</NAME>
-<TYPE>gfloat</TYPE>
-<RANGE>[0,1]</RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Color 2</NICK>
-<BLURB>The color of the second object.</BLURB>
-<DEFAULT>1</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-opencvfacedetect::color-2-r</NAME>
-<TYPE>gfloat</TYPE>
-<RANGE>[0,1]</RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Color 2-R</NICK>
-<BLURB>The color of the second object.</BLURB>
-<DEFAULT>1</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-opencvfacedetect::color-3-b</NAME>
-<TYPE>gfloat</TYPE>
-<RANGE>[0,1]</RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Color 3</NICK>
-<BLURB>The color of the third object.</BLURB>
-<DEFAULT>1</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-opencvfacedetect::color-3-g</NAME>
-<TYPE>gfloat</TYPE>
-<RANGE>[0,1]</RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Color 3</NICK>
-<BLURB>The color of the third object.</BLURB>
-<DEFAULT>1</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-opencvfacedetect::color-3-r</NAME>
-<TYPE>gfloat</TYPE>
-<RANGE>[0,1]</RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Color 3-R</NICK>
-<BLURB>The color of the third object.</BLURB>
-<DEFAULT>1</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-opencvfacedetect::color-4-b</NAME>
-<TYPE>gfloat</TYPE>
-<RANGE>[0,1]</RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Color 4</NICK>
-<BLURB>The color of the fourth object.</BLURB>
-<DEFAULT>1</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-opencvfacedetect::color-4-g</NAME>
-<TYPE>gfloat</TYPE>
-<RANGE>[0,1]</RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Color 4</NICK>
-<BLURB>The color of the fourth object.</BLURB>
-<DEFAULT>1</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-opencvfacedetect::color-4-r</NAME>
-<TYPE>gfloat</TYPE>
-<RANGE>[0,1]</RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Color 4-R</NICK>
-<BLURB>The color of the fourth object.</BLURB>
-<DEFAULT>1</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-opencvfacedetect::color-5-b</NAME>
-<TYPE>gfloat</TYPE>
-<RANGE>[0,1]</RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Color 5</NICK>
-<BLURB>The color of the fifth object.</BLURB>
-<DEFAULT>1</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-opencvfacedetect::color-5-g</NAME>
-<TYPE>gfloat</TYPE>
-<RANGE>[0,1]</RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Color 5</NICK>
-<BLURB>The color of the fifth object.</BLURB>
-<DEFAULT>1</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-opencvfacedetect::color-5-r</NAME>
-<TYPE>gfloat</TYPE>
-<RANGE>[0,1]</RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Color 5-R</NICK>
-<BLURB>The color of the fifth object.</BLURB>
-<DEFAULT>1</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-opencvfacedetect::neighbors</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Neighbors</NICK>
-<BLURB>Minimum number of rectangles that makes up an object, divided by 100.</BLURB>
-<DEFAULT>0.02</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-opencvfacedetect::recheck</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Recheck</NICK>
-<BLURB>How often to detect an object in number of frames, divided by 1000.</BLURB>
-<DEFAULT>0.025</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-opencvfacedetect::scale</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Scale</NICK>
-<BLURB>Down scale the image prior detection.</BLURB>
-<DEFAULT>0.666667</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-opencvfacedetect::search-scale</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Search scale</NICK>
-<BLURB>The search window scale factor, divided by 10.</BLURB>
-<DEFAULT>0.12</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-opencvfacedetect::shape</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Shape</NICK>
-<BLURB>The shape to draw: 0=circle, 0.1=ellipse, 0.2=rectangle, 1=random.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-opencvfacedetect::smallest</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Smallest</NICK>
-<BLURB>Minimum window size in pixels, divided by 1000.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-opencvfacedetect::stroke</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Stroke</NICK>
-<BLURB>Line width, divided by 100, or fill if 0.</BLURB>
-<DEFAULT>-1</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-opencvfacedetect::threads</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Threads</NICK>
-<BLURB>How many threads to use divided by 100; 0 uses CPU count.</BLURB>
-<DEFAULT>0.01</DEFAULT>
-</ARG>
-
 <ARG>
 <NAME>GstVideoMaxRate::average-period</NAME>
 <TYPE>guint64</TYPE>
@@ -57933,1593 +57653,3 @@
 <DEFAULT>ntsc</DEFAULT>
 </ARG>
 
-<ARG>
-<NAME>frei0r-src-test-pat-r::amplitude</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Amplitude</NICK>
-<BLURB>Amplitude (contrast) of the pattern.</BLURB>
-<DEFAULT>0.8</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-src-test-pat-r::aspect-type</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Aspect type</NICK>
-<BLURB>Pixel aspect ratio presets.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-src-test-pat-r::channel</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Channel</NICK>
-<BLURB>Into which color channel to draw.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-src-test-pat-r::freq-1</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Freq 1</NICK>
-<BLURB>Pattern 7 H frequency.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-src-test-pat-r::freq-2</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Freq 2</NICK>
-<BLURB>Pattern 7 V frequency.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-src-test-pat-r::lin-p-swp</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Lin P swp</NICK>
-<BLURB>Use linear period sweep.</BLURB>
-<DEFAULT>FALSE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-src-test-pat-r::manual-aspect</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Manual aspect</NICK>
-<BLURB>Manual pixel aspect ratio.</BLURB>
-<DEFAULT>0.5</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-src-test-pat-r::type</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Type</NICK>
-<BLURB>Type of test pattern.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-src-test-pat-l::channel</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Channel</NICK>
-<BLURB>Into which color channel to draw.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-src-test-pat-l::type</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Type</NICK>
-<BLURB>Type of test pattern.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-src-test-pat-i::amplitude</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Amplitude</NICK>
-<BLURB>Amplitude (contrast) of the pattern.</BLURB>
-<DEFAULT>0.8</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-src-test-pat-i::channel</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Channel</NICK>
-<BLURB>Into which color channel to draw.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-src-test-pat-i::tilt</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Tilt</NICK>
-<BLURB>Angle of step function.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-src-test-pat-i::type</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Type</NICK>
-<BLURB>Type of test pattern.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-src-test-pat-i::width</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Width</NICK>
-<BLURB>Width of impulse.</BLURB>
-<DEFAULT>0.040404</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-src-test-pat-g::aspect-type</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Aspect type</NICK>
-<BLURB>Pixel aspect ratio presets.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-src-test-pat-g::manual-aspect</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Manual Aspect</NICK>
-<BLURB>Manual pixel aspect ratio.</BLURB>
-<DEFAULT>0.5</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-src-test-pat-g::size-1</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Size 1</NICK>
-<BLURB>Size of major features.</BLURB>
-<DEFAULT>0.28125</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-src-test-pat-g::size-2</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Size 2</NICK>
-<BLURB>Size of minor features.</BLURB>
-<DEFAULT>0.0625</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-src-test-pat-g::type</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Type</NICK>
-<BLURB>Type of test pattern.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-src-test-pat-c::color-space</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Color space</NICK>
-<BLURB></BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-src-test-pat-c::cross-section</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Cross section</NICK>
-<BLURB></BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-src-test-pat-c::third-axis-value</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Third axis value</NICK>
-<BLURB></BLURB>
-<DEFAULT>0.5</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-src-test-pat-b::aspect-type</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Aspect type</NICK>
-<BLURB>7 choices, pixel aspect ratio.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-src-test-pat-b::manual-aspect</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Manual Aspect</NICK>
-<BLURB>Manual pixel aspect ratio (Aspect type 6).</BLURB>
-<DEFAULT>0.5</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-src-test-pat-b::type</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Type</NICK>
-<BLURB>8 choices, select test pattern.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-sop-sat::aoffset</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>aOffset</NICK>
-<BLURB>Offset of the alpha component.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-sop-sat::apower</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>aPower</NICK>
-<BLURB>Power (Gamma) of the alpha component.</BLURB>
-<DEFAULT>1</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-sop-sat::aslope</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>aSlope</NICK>
-<BLURB>Slope of the alpha component.</BLURB>
-<DEFAULT>1</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-sop-sat::boffset</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>bOffset</NICK>
-<BLURB>Offset of the blue color component.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-sop-sat::bpower</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>bPower</NICK>
-<BLURB>Power (Gamma) of the blue color component.</BLURB>
-<DEFAULT>1</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-sop-sat::bslope</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>bSlope</NICK>
-<BLURB>Slope of the blue color component.</BLURB>
-<DEFAULT>1</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-sop-sat::goffset</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>gOffset</NICK>
-<BLURB>Offset of the green color component.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-sop-sat::gpower</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>gPower</NICK>
-<BLURB>Power (Gamma) of the green color component.</BLURB>
-<DEFAULT>1</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-sop-sat::gslope</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>gSlope</NICK>
-<BLURB>Slope of the green color component.</BLURB>
-<DEFAULT>1</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-sop-sat::roffset</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>rOffset</NICK>
-<BLURB>Offset of the red color component.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-sop-sat::rpower</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>rPower</NICK>
-<BLURB>Power (Gamma) of the red color component.</BLURB>
-<DEFAULT>1</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-sop-sat::rslope</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>rSlope</NICK>
-<BLURB>Slope of the red color component.</BLURB>
-<DEFAULT>1</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-sop-sat::saturation</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>saturation</NICK>
-<BLURB>Overall saturation.</BLURB>
-<DEFAULT>200</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-sharpness::amount</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Amount</NICK>
-<BLURB></BLURB>
-<DEFAULT>0.3</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-sharpness::size</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Size</NICK>
-<BLURB></BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-select0r::color-to-select-b</NAME>
-<TYPE>gfloat</TYPE>
-<RANGE>[0,1]</RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Color to select</NICK>
-<BLURB></BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-select0r::color-to-select-g</NAME>
-<TYPE>gfloat</TYPE>
-<RANGE>[0,1]</RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Color to select</NICK>
-<BLURB></BLURB>
-<DEFAULT>0.8</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-select0r::color-to-select-r</NAME>
-<TYPE>gfloat</TYPE>
-<RANGE>[0,1]</RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Color to select-R</NICK>
-<BLURB></BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-select0r::delta-b---i---i</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Delta B / I / I</NICK>
-<BLURB></BLURB>
-<DEFAULT>0.2</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-select0r::delta-g---b---chroma</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Delta G / B / Chroma</NICK>
-<BLURB></BLURB>
-<DEFAULT>0.2</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-select0r::delta-r---a---hue</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Delta R / A / Hue</NICK>
-<BLURB></BLURB>
-<DEFAULT>0.2</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-select0r::edge-mode</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Edge mode</NICK>
-<BLURB></BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-select0r::invert-selection</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Invert selection</NICK>
-<BLURB></BLURB>
-<DEFAULT>FALSE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-select0r::operation</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Operation</NICK>
-<BLURB></BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-select0r::selection-subspace</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Selection subspace</NICK>
-<BLURB></BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-select0r::subspace-shape</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Subspace shape</NICK>
-<BLURB></BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-pr0file::alpha-trace</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Alpha trace</NICK>
-<BLURB>Show Alpha trace on scope.</BLURB>
-<DEFAULT>FALSE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-pr0file::b-trace</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>B trace</NICK>
-<BLURB>Show B trace on scope.</BLURB>
-<DEFAULT>TRUE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-pr0file::channel</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Channel</NICK>
-<BLURB>Channel to numerically display.</BLURB>
-<DEFAULT>0.375005</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-pr0file::color</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Color</NICK>
-<BLURB>rec 601 or rec 709.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-pr0file::crosshair-color</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Crosshair color</NICK>
-<BLURB>Color of the profile marker.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-pr0file::display-average</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Display average</NICK>
-<BLURB>e.</BLURB>
-<DEFAULT>TRUE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-pr0file::display-maximum</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Display maximum</NICK>
-<BLURB></BLURB>
-<DEFAULT>FALSE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-pr0file::display-minimum</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Display minimum</NICK>
-<BLURB></BLURB>
-<DEFAULT>FALSE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-pr0file::display-rms</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Display RMS</NICK>
-<BLURB></BLURB>
-<DEFAULT>TRUE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-pr0file::g-trace</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>G trace</NICK>
-<BLURB>Show G trace on scope.</BLURB>
-<DEFAULT>TRUE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-pr0file::length</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Length</NICK>
-<BLURB>Length of profile.</BLURB>
-<DEFAULT>0.589744</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-pr0file::marker-1</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Marker 1</NICK>
-<BLURB>Position of marker 1.</BLURB>
-<DEFAULT>-0.2</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-pr0file::marker-2</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Marker 2</NICK>
-<BLURB>Position of marker 2.</BLURB>
-<DEFAULT>-0.2</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-pr0file::param-256-scale</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>256 scale</NICK>
-<BLURB>use 0-255 instead of 0.0-1.0.</BLURB>
-<DEFAULT>FALSE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-pr0file::pb-trace</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Pb trace</NICK>
-<BLURB>Show Pb trace on scope.</BLURB>
-<DEFAULT>FALSE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-pr0file::pr-trace</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Pr trace</NICK>
-<BLURB>Show Pr trace on scope.</BLURB>
-<DEFAULT>FALSE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-pr0file::r-trace</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>R trace</NICK>
-<BLURB>Show R trace on scope.</BLURB>
-<DEFAULT>TRUE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-pr0file::tilt</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Tilt</NICK>
-<BLURB>Tilt of profile.</BLURB>
-<DEFAULT>0.5</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-pr0file::x</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>X</NICK>
-<BLURB>X position of profile.</BLURB>
-<DEFAULT>0.5</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-pr0file::y</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Y</NICK>
-<BLURB>Y position of profile.</BLURB>
-<DEFAULT>0.5</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-pr0file::y-trace</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Y trace</NICK>
-<BLURB>Show Y' trace on scope.</BLURB>
-<DEFAULT>FALSE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-pr0be::big-window</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Big window</NICK>
-<BLURB>Display more data.</BLURB>
-<DEFAULT>FALSE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-pr0be::measurement</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Measurement</NICK>
-<BLURB>What measurement to display.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-pr0be::param-256-scale</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>256 scale</NICK>
-<BLURB>use 0-255 instead of 0.0-1.0.</BLURB>
-<DEFAULT>FALSE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-pr0be::show-alpha</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Show alpha</NICK>
-<BLURB>Display alpha value too.</BLURB>
-<DEFAULT>FALSE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-pr0be::x</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>X</NICK>
-<BLURB>X position of probe.</BLURB>
-<DEFAULT>0.5</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-pr0be::x-size</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>X size</NICK>
-<BLURB>X size of probe.</BLURB>
-<DEFAULT>0.25</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-pr0be::y</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Y</NICK>
-<BLURB>Y position of probe.</BLURB>
-<DEFAULT>0.5</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-pr0be::y-size</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Y size</NICK>
-<BLURB>Y size of probe.</BLURB>
-<DEFAULT>0.25</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-light-graffiti::backgroundweight</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>backgroundWeight</NICK>
-<BLURB>Describes how strong the (accumulated) background should shine through.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-light-graffiti::blackreference</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>blackReference</NICK>
-<BLURB>Uses black as background image instead of the first frame.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-light-graffiti::dim</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>dim</NICK>
-<BLURB>Dimming of the light mask.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-light-graffiti::longalpha</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>longAlpha</NICK>
-<BLURB>Alpha value for moving average.</BLURB>
-<DEFAULT>0.0078125</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-light-graffiti::loweroverexposure</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>lowerOverexposure</NICK>
-<BLURB>Prevents some overexposure if the light source stays steady too long (varying speed).</BLURB>
-<DEFAULT>5.23869e-11</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-light-graffiti::nonlineardim</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>nonlinearDim</NICK>
-<BLURB>Nonlinear dimming (may look more natural).</BLURB>
-<DEFAULT>5.23869e-11</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-light-graffiti::reset</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>reset</NICK>
-<BLURB>Reset filter masks.</BLURB>
-<DEFAULT>5.23869e-11</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-light-graffiti::saturation</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>saturation</NICK>
-<BLURB>Saturation of lights.</BLURB>
-<DEFAULT>1</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-light-graffiti::sensitivity</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>sensitivity</NICK>
-<BLURB>Sensitivity of the effect for light (higher sensitivity will lead to brighter lights).</BLURB>
-<DEFAULT>1</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-light-graffiti::statsbrightness</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>statsBrightness</NICK>
-<BLURB>Display the brightness and threshold, for adjusting the brightness threshold parameter.</BLURB>
-<DEFAULT>5.23869e-11</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-light-graffiti::statsdifference</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>statsDifference</NICK>
-<BLURB>Display the background difference and threshold.</BLURB>
-<DEFAULT>5.23869e-11</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-light-graffiti::statsdiffsum</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>statsDiffSum</NICK>
-<BLURB>Display the sum of the background difference and the threshold.</BLURB>
-<DEFAULT>5.23869e-11</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-light-graffiti::thresholdbrightness</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>thresholdBrightness</NICK>
-<BLURB>Brightness threshold to distinguish between foreground and background.</BLURB>
-<DEFAULT>450</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-light-graffiti::thresholddifference</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>thresholdDifference</NICK>
-<BLURB>Threshold: Difference to background to distinguish between fore- and background.</BLURB>
-<DEFAULT>5.23869e-11</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-light-graffiti::thresholddiffsum</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>thresholdDiffSum</NICK>
-<BLURB>Threshold for sum of differences. Can in most cases be ignored (set to 0).</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-light-graffiti::transparentbackground</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>transparentBackground</NICK>
-<BLURB>Make the background transparent.</BLURB>
-<DEFAULT>5.23869e-11</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-hqdn3d::spatial</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Spatial</NICK>
-<BLURB>Amount of spatial filtering.</BLURB>
-<DEFAULT>0.04</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-hqdn3d::temporal</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Temporal</NICK>
-<BLURB>Amount of temporal filtering.</BLURB>
-<DEFAULT>0.06</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-facebl0r::classifier</NAME>
-<TYPE>gchar*</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Classifier</NICK>
-<BLURB>Full path to the XML pattern model for recognition; look in /usr/share/opencv/haarcascades.</BLURB>
-<DEFAULT>"/usr/share/opencv/haarcascades/haarcascade_frontalface_default.xml"</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-facebl0r::ellipse</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Ellipse</NICK>
-<BLURB>Draw a red ellipse around the object.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-facebl0r::largest</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Largest</NICK>
-<BLURB>Maximum object size in pixels, divided by 10000.</BLURB>
-<DEFAULT>0.05</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-facebl0r::neighbors</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Neighbors</NICK>
-<BLURB>Minimum number of rectangles that makes up an object, divided by 100.</BLURB>
-<DEFAULT>0.02</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-facebl0r::recheck</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Recheck</NICK>
-<BLURB>How often to detect an object in number of frames, divided by 1000.</BLURB>
-<DEFAULT>0.025</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-facebl0r::search-scale</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Search scale</NICK>
-<BLURB>The search window scale factor, divided by 10.</BLURB>
-<DEFAULT>0.12</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-facebl0r::smallest</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Smallest</NICK>
-<BLURB>Minimum window size in pixels, divided by 1000.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-facebl0r::threads</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Threads</NICK>
-<BLURB>How many threads to use divided by 100; 0 uses CPU count.</BLURB>
-<DEFAULT>0.01</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-defish0r::amount</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Amount</NICK>
-<BLURB>Focal Ratio.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-defish0r::aspect-type</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Aspect type</NICK>
-<BLURB>Pixel aspect ratio presets.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-defish0r::defish</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>DeFish</NICK>
-<BLURB>Fish or Defish.</BLURB>
-<DEFAULT>FALSE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-defish0r::interpolator</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Interpolator</NICK>
-<BLURB>Quality of interpolation.</BLURB>
-<DEFAULT>0.166667</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-defish0r::manual-aspect</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Manual Aspect</NICK>
-<BLURB>Manual Pixel Aspect ratio.</BLURB>
-<DEFAULT>0.5</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-defish0r::manual-scale</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Manual Scale</NICK>
-<BLURB>Manual Scale.</BLURB>
-<DEFAULT>0.5</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-defish0r::scaling</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Scaling</NICK>
-<BLURB>Scaling method.</BLURB>
-<DEFAULT>0.666667</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-defish0r::type</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Type</NICK>
-<BLURB>Mapping function.</BLURB>
-<DEFAULT>0.666667</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-coloradj-rgb::action</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Action</NICK>
-<BLURB>Type of color adjustment.</BLURB>
-<DEFAULT>0.333344</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-coloradj-rgb::alpha-controlled</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Alpha controlled</NICK>
-<BLURB>Adjust only areas with nonzero alpha.</BLURB>
-<DEFAULT>FALSE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-coloradj-rgb::b</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>B</NICK>
-<BLURB>Amount of blue.</BLURB>
-<DEFAULT>0.5</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-coloradj-rgb::g</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>G</NICK>
-<BLURB>Amount of green.</BLURB>
-<DEFAULT>0.5</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-coloradj-rgb::keep-luma</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Keep luma</NICK>
-<BLURB>Don't change brightness.</BLURB>
-<DEFAULT>TRUE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-coloradj-rgb::luma-formula</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Luma formula</NICK>
-<BLURB></BLURB>
-<DEFAULT>0.500025</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-coloradj-rgb::r</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>R</NICK>
-<BLURB>Amount of red.</BLURB>
-<DEFAULT>0.5</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-c0rners::alpha-operation</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Alpha operation</NICK>
-<BLURB></BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-c0rners::corner-1-x</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Corner 1 X</NICK>
-<BLURB>X coordinate of corner 1.</BLURB>
-<DEFAULT>0.333333</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-c0rners::corner-1-y</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Corner 1 Y</NICK>
-<BLURB>Y coordinate of corner 1.</BLURB>
-<DEFAULT>0.333333</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-c0rners::corner-2-x</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Corner 2 X</NICK>
-<BLURB>X coordinate of corner 2.</BLURB>
-<DEFAULT>0.666666</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-c0rners::corner-2-y</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Corner 2 Y</NICK>
-<BLURB>Y coordinate of corner 2.</BLURB>
-<DEFAULT>0.333333</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-c0rners::corner-3-x</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Corner 3 X</NICK>
-<BLURB>X coordinate of corner 3.</BLURB>
-<DEFAULT>0.666666</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-c0rners::corner-3-y</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Corner 3 Y</NICK>
-<BLURB>Y coordinate of corner 3.</BLURB>
-<DEFAULT>0.666666</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-c0rners::corner-4-x</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Corner 4 X</NICK>
-<BLURB>X coordinate of corner 4.</BLURB>
-<DEFAULT>0.333333</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-c0rners::corner-4-y</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Corner 4 Y</NICK>
-<BLURB>Y coordinate of corner 4.</BLURB>
-<DEFAULT>0.666666</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-c0rners::enable-stretch</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Enable Stretch</NICK>
-<BLURB>Enable stretching.</BLURB>
-<DEFAULT>FALSE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-c0rners::feather-alpha</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Feather Alpha</NICK>
-<BLURB>Makes smooth transition into transparent.</BLURB>
-<DEFAULT>0.01</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-c0rners::interpolator</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Interpolator</NICK>
-<BLURB>Quality of interpolation.</BLURB>
-<DEFAULT>0.166667</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-c0rners::stretch-x</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Stretch X</NICK>
-<BLURB>Amount of stretching in X direction.</BLURB>
-<DEFAULT>0.5</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-c0rners::stretch-y</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Stretch Y</NICK>
-<BLURB>Amount of stretching in Y direction.</BLURB>
-<DEFAULT>0.5</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-c0rners::transparent-background</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Transparent Background</NICK>
-<BLURB>Makes background transparent.</BLURB>
-<DEFAULT>FALSE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-alphaspot::max</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Max</NICK>
-<BLURB></BLURB>
-<DEFAULT>1</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-alphaspot::min</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Min</NICK>
-<BLURB></BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-alphaspot::operation</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Operation</NICK>
-<BLURB></BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-alphaspot::position-x</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Position X</NICK>
-<BLURB></BLURB>
-<DEFAULT>0.5</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-alphaspot::position-y</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Position Y</NICK>
-<BLURB></BLURB>
-<DEFAULT>0.5</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-alphaspot::shape</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Shape</NICK>
-<BLURB></BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-alphaspot::size-x</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Size X</NICK>
-<BLURB></BLURB>
-<DEFAULT>0.1</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-alphaspot::size-y</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Size Y</NICK>
-<BLURB></BLURB>
-<DEFAULT>0.1</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-alphaspot::tilt</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Tilt</NICK>
-<BLURB></BLURB>
-<DEFAULT>0.5</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-alphaspot::transition-width</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Transition width</NICK>
-<BLURB></BLURB>
-<DEFAULT>0.2</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-alphagrad::max</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Max</NICK>
-<BLURB></BLURB>
-<DEFAULT>1</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-alphagrad::min</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Min</NICK>
-<BLURB></BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-alphagrad::operation</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Operation</NICK>
-<BLURB></BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-alphagrad::position</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Position</NICK>
-<BLURB></BLURB>
-<DEFAULT>0.5</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-alphagrad::tilt</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Tilt</NICK>
-<BLURB></BLURB>
-<DEFAULT>0.5</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-alphagrad::transition-width</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Transition width</NICK>
-<BLURB></BLURB>
-<DEFAULT>FALSE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-alpha0ps::display</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Display</NICK>
-<BLURB></BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-alpha0ps::display-input-alpha</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Display input alpha</NICK>
-<BLURB></BLURB>
-<DEFAULT>FALSE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-alpha0ps::invert</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Invert</NICK>
-<BLURB></BLURB>
-<DEFAULT>FALSE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-alpha0ps::operation</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Operation</NICK>
-<BLURB></BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-alpha0ps::shrink-grow-amount</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Shrink/grow amount</NICK>
-<BLURB></BLURB>
-<DEFAULT>0.333344</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>frei0r-filter-alpha0ps::threshold</NAME>
-<TYPE>gdouble</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Threshold</NICK>
-<BLURB></BLURB>
-<DEFAULT>0.5</DEFAULT>
-</ARG>
-
diff --git a/docs/plugins/gst-plugins-bad-plugins.hierarchy b/docs/plugins/gst-plugins-bad-plugins.hierarchy
index cbfda73b5d..ef9c6f37b6 100644
--- a/docs/plugins/gst-plugins-bad-plugins.hierarchy
+++ b/docs/plugins/gst-plugins-bad-plugins.hierarchy
@@ -13,6 +13,7 @@ GObject
       GstAiffParse
       GstAsfMux
       GstAsfParse
+      GstAssRender
       GstBaseAudioVisualizer
         GstSpaceScope
         GstSpectraScope
@@ -34,48 +35,42 @@ GObject
         GstBaseAudioSink
           GstAudioSink
             GstApExSink
+            GstNasSink
             GstSDLAudioSink
         GstChecksumSink
-        GstCurlSink
         GstDCCPClientSink
         GstDCCPServerSink
         GstFBDEVSink
         GstInterAudioSink
         GstInterVideoSink
         GstLinsysSdiSink
+        GstSFSink
         GstShmSink
         GstVideoSink
+          GstDfbVideoSink
           GstSDLVideoSink
       GstBaseSrc
         GstDTMFSrc
         GstDataURISrc
+        GstFliteTestSrc
         GstInterAudioSrc
         GstInterVideoSrc
         GstLinsysSdiSrc
         GstPushSrc
           GstDCCPClientSrc
           GstDCCPServerSrc
+          GstDc1394
           GstDvbSrc
           GstMMS
-          GstNeonhttpSrc
           GstRfbSrc
           GstShmSrc
           GstVCDSrc
-          frei0r-src-ising0r
-          frei0r-src-lissajous0r
-          frei0r-src-nois0r
-          frei0r-src-onecol0r
-          frei0r-src-partik0l
-          frei0r-src-plasma
-          frei0r-src-test-pat-b
-          frei0r-src-test-pat-c
-          frei0r-src-test-pat-g
-          frei0r-src-test-pat-i
-          frei0r-src-test-pat-l
-          frei0r-src-test-pat-r
         GstRTPDTMFSrc
+        GstSFSrc
       GstBaseTransform
         GstAudioFilter
+          GstBPMDetect
+          GstOFA
           GstStereo
         GstBayer2RGB
         GstCogScale
@@ -118,99 +113,34 @@ GObject
             GstMirror
             GstRotate
             GstSquare
+          GstRsvgOverlay
           GstSolarize
           GstVideoAnalyse
           GstVideoDetect
           GstVideoMark
-          frei0r-filter-3-point-color-balance
-          frei0r-filter-3dflippo
-          frei0r-filter-alpha0ps
-          frei0r-filter-alphagrad
-          frei0r-filter-alphaspot
-          frei0r-filter-b
-          frei0r-filter-baltan
-          frei0r-filter-bluescreen0r
-          frei0r-filter-brightness
-          frei0r-filter-bw0r
-          frei0r-filter-c0rners
-          frei0r-filter-cartoon
-          frei0r-filter-color-distance
-          frei0r-filter-coloradj-rgb
-          frei0r-filter-contrast0r
-          frei0r-filter-curves
-          frei0r-filter-defish0r
-          frei0r-filter-delay0r
-          frei0r-filter-delaygrab
-          frei0r-filter-distort0r
-          frei0r-filter-edgeglow
-          frei0r-filter-equaliz0r
-          frei0r-filter-facebl0r
-          frei0r-filter-flippo
-          frei0r-filter-g
-          frei0r-filter-gamma
-          frei0r-filter-glow
-          frei0r-filter-hqdn3d
-          frei0r-filter-hueshift0r
-          frei0r-filter-invert0r
-          frei0r-filter-k-means-clustering
-          frei0r-filter-lens-correction
-          frei0r-filter-letterb0xed
-          frei0r-filter-levels
-          frei0r-filter-light-graffiti
-          frei0r-filter-luminance
-          frei0r-filter-mask0mate
-          frei0r-filter-nervous
-          frei0r-filter-nikon-d90-stairstepping-fix
-          frei0r-filter-nosync0r
-          frei0r-filter-opencvfacedetect
-          frei0r-filter-perspective
-          frei0r-filter-pixeliz0r
-          frei0r-filter-pr0be
-          frei0r-filter-pr0file
-          frei0r-filter-primaries
-          frei0r-filter-r
-          frei0r-filter-rgb-parade
-          frei0r-filter-saturat0r
-          frei0r-filter-scale0tilt
-          frei0r-filter-scanline0r
-          frei0r-filter-select0r
-          frei0r-filter-sharpness
-          frei0r-filter-sobel
-          frei0r-filter-sop-sat
-          frei0r-filter-squareblur
-          frei0r-filter-tehroxx0r
-          frei0r-filter-threelay0r
-          frei0r-filter-threshold0r
-          frei0r-filter-tint0r
-          frei0r-filter-transparency
-          frei0r-filter-twolay0r
-          frei0r-filter-vectorscope
-          frei0r-filter-vertigo
-          frei0r-filter-white-balance
         GstVideoFilter2
           GstSceneChange
           GstZebraStripe
         GstVideoMaxRate
       GstBaseVideoCodec
         GstBaseVideoDecoder
-          GstVP8Dec
+          GstSchroDec
         GstBaseVideoEncoder
-          GstVP8Enc
+          GstDiracEnc
+          GstSchroEnc
       GstBin
         DvbBaseBin
         GstAutoConvert
         GstAutoVideoConvert
+        GstBaseCameraSrc
+          GstWrapperCameraBinSrc
         GstFPSDisplaySink
         GstFaceOverlay
-        GstGSettingsSwitchSink
-          GstGSettingsAudioSink
-          GstGSettingsVideoSink
-        GstGSettingsSwitchSrc
-          GstGSettingsAudioSrc
-          GstGSettingsVideoSrc
         GstPipeline
           GstCameraBin
+          GstCameraBin2
         GstSDPDemux
+        GstViewfinderBin
         RsnDvdBin
       GstBz2dec
       GstBz2enc
@@ -224,20 +154,26 @@ GObject
       GstDVDSpu
       GstDecklinkSink
       GstDecklinkSrc
-      GstFaac
+      GstDtsDec
       GstFaad
       GstFestival
       GstFieldAnalysis
       GstFreeze
+      GstGSMDec
+      GstGSMEnc
+      GstGmeDec
       GstHLSDemux
       GstId3BaseMux
         GstId3Mux
       GstInterlace
-      GstInvtelecine
       GstIvfParse
       GstJP2kDecimator
       GstJifMux
       GstJpegParse
+      GstKateDec
+      GstKateEnc
+      GstKateParse
+        GstKateTag
       GstLegacyH264Parse
       GstLiveAdder
       GstMSE
@@ -245,13 +181,16 @@ GObject
       GstMXFMux
       GstMimDec
       GstMimEnc
+      GstModPlug
       GstMpegPSDemux
       GstMpegTSDemux
+      GstMusepackDec
       GstMveDemux
       GstMveMux
       GstNsfDec
       GstNuvDemux
       GstPcapParse
+      GstPitch
       GstPnmdec
       GstPnmenc
       GstRTPMux
@@ -261,20 +200,34 @@ GObject
         GstVideoParse
       GstRealAudioDec
       GstRealVideoDec
+      GstRsvgDec
       GstSSim
       GstSdiDemux
       GstSdiMux
       GstSegmentClip
         GstAudioSegmentClip
         GstVideoSegmentClip
+      GstSignalProcessor
+        ladspa-amp-mono
+        ladspa-amp-stereo
+        ladspa-delay-5s
+        ladspa-hpf
+        ladspa-lpf
+        ladspa-noise-white
+        ladspa-sine-faaa
+        ladspa-sine-faac
+        ladspa-sine-fcaa
+        ladspa-sine-fcac
       GstSirenDec
       GstSirenEnc
       GstSpeed
       GstSrtEnc
+      GstTRM
       GstTtaDec
       GstTtaParse
       GstVMncDec
       GstVcdParse
+      GstWildmidi
       GstY4mDec
       MpegPsMux
       MpegTSBase
@@ -283,39 +236,9 @@ GObject
       MpegTSParse
       MpegTsMux
       MpegVideoParse
-      frei0r-mixer-addition
-      frei0r-mixer-addition-alpha
-      frei0r-mixer-alpha-injection
-      frei0r-mixer-alphaatop
-      frei0r-mixer-alphain
-      frei0r-mixer-alphaout
-      frei0r-mixer-alphaover
-      frei0r-mixer-alphaxor
-      frei0r-mixer-blend
-      frei0r-mixer-burn
-      frei0r-mixer-color-only
-      frei0r-mixer-composition
-      frei0r-mixer-darken
-      frei0r-mixer-difference
-      frei0r-mixer-divide
-      frei0r-mixer-dodge
-      frei0r-mixer-grain-extract
-      frei0r-mixer-grain-merge
-      frei0r-mixer-hardlight
-      frei0r-mixer-hue
-      frei0r-mixer-lighten
-      frei0r-mixer-multiply
-      frei0r-mixer-overlay
-      frei0r-mixer-rgb
-      frei0r-mixer-saturation
-      frei0r-mixer-screen
-      frei0r-mixer-softlight
-      frei0r-mixer-subtract
-      frei0r-mixer-uv-map
-      frei0r-mixer-value
-      frei0r-mixer-xfade0r
     GstPad
     GstPadTemplate
+      GstSignalProcessorPadTemplate
     GstPlugin
     GstPluginFeature
       GstElementFactory

From 04f0b55609becae064febe2ff92fbcaff4bcc209 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Thu, 14 Jul 2011 14:37:14 +0100
Subject: [PATCH 083/158] tests: add some more unit test binaries to .gitignore

---
 tests/check/elements/.gitignore  | 4 ++++
 tests/check/pipelines/.gitignore | 1 +
 2 files changed, 5 insertions(+)

diff --git a/tests/check/elements/.gitignore b/tests/check/elements/.gitignore
index 4554222b92..6df3baedad 100644
--- a/tests/check/elements/.gitignore
+++ b/tests/check/elements/.gitignore
@@ -12,6 +12,8 @@ faac
 faad
 gdpdepay
 gdppay
+h263parse
+h264parse
 id3mux
 imagecapturebin
 interleave
@@ -21,6 +23,8 @@ kate
 legacyresample
 logoinsert
 mpeg2enc
+mpegvideoparse
+mpeg4videoparse
 mplex
 mxfdemux
 mxfmux
diff --git a/tests/check/pipelines/.gitignore b/tests/check/pipelines/.gitignore
index ec9623ff33..909ffabee7 100644
--- a/tests/check/pipelines/.gitignore
+++ b/tests/check/pipelines/.gitignore
@@ -2,3 +2,4 @@
 mxf
 mimic
 tagschecking
+colorspace

From 93af6831e28da9c46aaccf087d3020198b8dfe18 Mon Sep 17 00:00:00 2001
From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Thu, 14 Jul 2011 16:40:14 +0200
Subject: [PATCH 084/158] pcapparse: also support extracting tcp data

---
 gst/pcapparse/gstpcapparse.c | 63 ++++++++++++++++++++++++------------
 1 file changed, 42 insertions(+), 21 deletions(-)

diff --git a/gst/pcapparse/gstpcapparse.c b/gst/pcapparse/gstpcapparse.c
index 47bf0ace23..c559a58559 100644
--- a/gst/pcapparse/gstpcapparse.c
+++ b/gst/pcapparse/gstpcapparse.c
@@ -20,8 +20,8 @@
 /**
  * SECTION:element-pcapparse
  *
- * Extracts payloads from Ethernet-encapsulated IP packets, currently limited
- * to UDP. Use #GstPcapParse:src-ip, #GstPcapParse:dst-ip,
+ * Extracts payloads from Ethernet-encapsulated IP packets.
+ * Use #GstPcapParse:src-ip, #GstPcapParse:dst-ip,
  * #GstPcapParse:src-port and #GstPcapParse:dst-port to restrict which packets
  * should be included.
  *
@@ -324,6 +324,8 @@ gst_pcap_parse_read_uint32 (GstPcapParse * self, const guint8 * p)
 #define UDP_HEADER_LEN     8
 
 #define IP_PROTO_UDP      17
+#define IP_PROTO_TCP      6
+
 
 static gboolean
 gst_pcap_parse_scan_frame (GstPcapParse * self,
@@ -331,16 +333,16 @@ gst_pcap_parse_scan_frame (GstPcapParse * self,
     gint buf_size, const guint8 ** payload, gint * payload_size)
 {
   const guint8 *buf_ip = 0;
-  const guint8 *buf_udp;
+  const guint8 *buf_proto;
   guint16 eth_type;
   guint8 b;
   guint8 ip_header_size;
   guint8 ip_protocol;
   guint32 ip_src_addr;
   guint32 ip_dst_addr;
-  guint16 udp_src_port;
-  guint16 udp_dst_port;
-  guint16 udp_len;
+  guint16 src_port;
+  guint16 dst_port;
+  guint16 len;
 
   switch (self->linktype) {
     case DLT_ETHER:
@@ -375,34 +377,53 @@ gst_pcap_parse_scan_frame (GstPcapParse * self,
     return FALSE;
 
   ip_protocol = *(buf_ip + 9);
-  if (ip_protocol != IP_PROTO_UDP)
+  GST_LOG_OBJECT (self, "ip proto %d", (gint) ip_protocol);
+
+  if (ip_protocol != IP_PROTO_UDP && ip_protocol != IP_PROTO_TCP)
     return FALSE;
 
+  /* ip info */
   ip_src_addr = *((guint32 *) (buf_ip + 12));
+  ip_dst_addr = *((guint32 *) (buf_ip + 16));
+  buf_proto = buf_ip + ip_header_size;
+
+  /* ok for tcp and udp */
+  src_port = GUINT16_FROM_BE (*((guint16 *) (buf_proto + 0)));
+  dst_port = GUINT16_FROM_BE (*((guint16 *) (buf_proto + 2)));
+
+  /* extract some params and data according to protocol */
+  if (ip_protocol == IP_PROTO_UDP) {
+    len = GUINT16_FROM_BE (*((guint16 *) (buf_proto + 4)));
+    if (len < UDP_HEADER_LEN || buf_proto + len > buf + buf_size)
+      return FALSE;
+
+    *payload = buf_proto + UDP_HEADER_LEN;
+    *payload_size = len - UDP_HEADER_LEN;
+  } else {
+    if (buf_proto + 12 >= buf + buf_size)
+      return FALSE;
+    len = (buf_proto[12] >> 4) * 4;
+    if (buf_proto + len > buf + buf_size)
+      return FALSE;
+
+    /* all remaining data following tcp header is payload */
+    *payload = buf_proto + len;
+    *payload_size = self->cur_packet_size - (buf_proto - buf) - len;
+  }
+
+  /* but still filter as configured */
   if (self->src_ip >= 0 && ip_src_addr != self->src_ip)
     return FALSE;
 
-  ip_dst_addr = *((guint32 *) (buf_ip + 16));
   if (self->dst_ip >= 0 && ip_dst_addr != self->dst_ip)
     return FALSE;
 
-  buf_udp = buf_ip + ip_header_size;
-
-  udp_src_port = GUINT16_FROM_BE (*((guint16 *) (buf_udp + 0)));
-  if (self->src_port >= 0 && udp_src_port != self->src_port)
+  if (self->src_port >= 0 && src_port != self->src_port)
     return FALSE;
 
-  udp_dst_port = GUINT16_FROM_BE (*((guint16 *) (buf_udp + 2)));
-  if (self->dst_port >= 0 && udp_dst_port != self->dst_port)
+  if (self->dst_port >= 0 && dst_port != self->dst_port)
     return FALSE;
 
-  udp_len = GUINT16_FROM_BE (*((guint16 *) (buf_udp + 4)));
-  if (udp_len < UDP_HEADER_LEN || buf_udp + udp_len > buf + buf_size)
-    return FALSE;
-
-  *payload = buf_udp + UDP_HEADER_LEN;
-  *payload_size = udp_len - UDP_HEADER_LEN;
-
   return TRUE;
 }
 

From 671a9faad61bd1aa97f3ce139bbd9f9e7432bec1 Mon Sep 17 00:00:00 2001
From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Thu, 14 Jul 2011 16:50:29 +0200
Subject: [PATCH 085/158] pcapparse: optionally output relative timestamps,
 possibly shifted by offset

That is, output timestamps can then either be the absolute capture time,
or the relative capture time (w.r.t. to first output buffer), or the relative
capture time incremented by some offset.
---
 gst/pcapparse/gstpcapparse.c | 24 ++++++++++++++++++++++++
 gst/pcapparse/gstpcapparse.h |  2 ++
 2 files changed, 26 insertions(+)

diff --git a/gst/pcapparse/gstpcapparse.c b/gst/pcapparse/gstpcapparse.c
index c559a58559..69c22f6aed 100644
--- a/gst/pcapparse/gstpcapparse.c
+++ b/gst/pcapparse/gstpcapparse.c
@@ -64,6 +64,7 @@ enum
   PROP_SRC_PORT,
   PROP_DST_PORT,
   PROP_CAPS,
+  PROP_OFFSET,
   PROP_LAST
 };
 
@@ -143,6 +144,11 @@ gst_pcap_parse_class_init (GstPcapParseClass * klass)
           "The caps of the source pad", GST_TYPE_CAPS,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
+  g_object_class_install_property (gobject_class, PROP_OFFSET,
+      g_param_spec_int64 ("offset", "Offset",
+          "Relative timestamp offset (ns) to apply (-1 = use absolute packet time)",
+          -1, G_MAXINT64, -1, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
   GST_DEBUG_CATEGORY_INIT (gst_pcap_parse_debug, "pcapparse", 0, "pcap parser");
 }
 
@@ -165,6 +171,7 @@ gst_pcap_parse_init (GstPcapParse * self, GstPcapParseClass * gclass)
   self->dst_ip = -1;
   self->src_port = -1;
   self->dst_port = -1;
+  self->offset = -1;
 
   self->adapter = gst_adapter_new ();
 
@@ -234,6 +241,10 @@ gst_pcap_parse_get_property (GObject * object, guint prop_id,
       gst_value_set_caps (value, self->caps);
       break;
 
+    case PROP_OFFSET:
+      g_value_set_int64 (value, self->offset);
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -283,6 +294,11 @@ gst_pcap_parse_set_property (GObject * object, guint prop_id,
       gst_pad_set_caps (self->src_pad, new_caps);
       break;
     }
+
+    case PROP_OFFSET:
+      self->offset = g_value_get_int64 (value);
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -297,6 +313,7 @@ gst_pcap_parse_reset (GstPcapParse * self)
   self->cur_packet_size = -1;
   self->buffer_offset = 0;
   self->cur_ts = GST_CLOCK_TIME_NONE;
+  self->base_ts = GST_CLOCK_TIME_NONE;
   self->newsegment_sent = FALSE;
 
   gst_adapter_clear (self->adapter);
@@ -461,6 +478,13 @@ gst_pcap_parse_chain (GstPad * pad, GstBuffer * buffer)
 
             if (ret == GST_FLOW_OK) {
 
+              if (GST_CLOCK_TIME_IS_VALID (self->cur_ts)) {
+                if (!GST_CLOCK_TIME_IS_VALID (self->base_ts))
+                  self->base_ts = self->cur_ts;
+                if (self->offset >= 0)
+                  self->cur_ts -= self->base_ts + self->offset;
+              }
+
               memcpy (GST_BUFFER_DATA (out_buf), payload_data, payload_size);
               GST_BUFFER_TIMESTAMP (out_buf) = self->cur_ts;
 
diff --git a/gst/pcapparse/gstpcapparse.h b/gst/pcapparse/gstpcapparse.h
index 35742394ef..49e432c776 100644
--- a/gst/pcapparse/gstpcapparse.h
+++ b/gst/pcapparse/gstpcapparse.h
@@ -71,6 +71,7 @@ struct _GstPcapParse
   gint32 src_port;
   gint32 dst_port;
   GstCaps *caps;
+  gint64 offset;
 
   /* state */
   GstAdapter * adapter;
@@ -78,6 +79,7 @@ struct _GstPcapParse
   gboolean swap_endian;
   gint64 cur_packet_size;
   GstClockTime cur_ts;
+  GstClockTime base_ts;
   GstPcapParseLinktype linktype;
 
   gboolean newsegment_sent;

From 592d7cbc158362b9c6d92d6b3772602062e178b5 Mon Sep 17 00:00:00 2001
From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Thu, 14 Jul 2011 17:06:38 +0200
Subject: [PATCH 086/158] pcapparse: properly apply ts offset

---
 gst/pcapparse/gstpcapparse.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gst/pcapparse/gstpcapparse.c b/gst/pcapparse/gstpcapparse.c
index 69c22f6aed..25d57c7b7c 100644
--- a/gst/pcapparse/gstpcapparse.c
+++ b/gst/pcapparse/gstpcapparse.c
@@ -481,8 +481,10 @@ gst_pcap_parse_chain (GstPad * pad, GstBuffer * buffer)
               if (GST_CLOCK_TIME_IS_VALID (self->cur_ts)) {
                 if (!GST_CLOCK_TIME_IS_VALID (self->base_ts))
                   self->base_ts = self->cur_ts;
-                if (self->offset >= 0)
-                  self->cur_ts -= self->base_ts + self->offset;
+                if (self->offset >= 0) {
+                  self->cur_ts -= self->base_ts;
+                  self->cur_ts += self->offset;
+                }
               }
 
               memcpy (GST_BUFFER_DATA (out_buf), payload_data, payload_size);

From a82483e36772467de9d00dcca52214bcf548df6a Mon Sep 17 00:00:00 2001
From: Edward Hervey <bilboed@bilboed.com>
Date: Thu, 14 Jul 2011 22:08:56 +0200
Subject: [PATCH 087/158] mpegtsbase: Split up whether we saw a PAT and its
 offset

Fixes the issue with streams that don't set an offset on their buffers,
like those coming from hlsdemux.

Fixes #653481
---
 gst/mpegtsdemux/mpegtsbase.c | 5 +++--
 gst/mpegtsdemux/mpegtsbase.h | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/gst/mpegtsdemux/mpegtsbase.c b/gst/mpegtsdemux/mpegtsbase.c
index 866f0d4ccd..a2e7cbaeaa 100644
--- a/gst/mpegtsdemux/mpegtsbase.c
+++ b/gst/mpegtsdemux/mpegtsbase.c
@@ -239,6 +239,7 @@ mpegts_base_init (MpegTSBase * base, MpegTSBaseClass * klass)
   base->stream_size = sizeof (MpegTSBaseStream);
 
   base->mode = BASE_MODE_STREAMING;
+  base->seen_pat = FALSE;
   base->first_pat_offset = -1;
 }
 
@@ -705,7 +706,7 @@ mpegts_base_apply_pmt (MpegTSBase * base,
   const GValue *value;
   MpegTSBaseClass *klass = GST_MPEGTS_BASE_GET_CLASS (base);
 
-  if (G_UNLIKELY (base->first_pat_offset == -1)) {
+  if (G_UNLIKELY (base->seen_pat == FALSE)) {
     GST_WARNING ("Got pmt without pat first. Returning");
     /* remove the stream since we won't get another PMT otherwise */
     mpegts_packetizer_remove_stream (base->packetizer, pmt_pid);
@@ -832,7 +833,7 @@ mpegts_base_handle_psi (MpegTSBase * base, MpegTSPacketizerSection * section)
       structure = mpegts_packetizer_parse_pat (base->packetizer, section);
       if (G_LIKELY (structure)) {
         mpegts_base_apply_pat (base, structure);
-        if (base->first_pat_offset == -1) {
+        if (base->seen_pat == FALSE) {
 
           base->first_pat_offset = GST_BUFFER_OFFSET (section->buffer);
           GST_DEBUG ("First PAT offset: %" G_GUINT64_FORMAT,
diff --git a/gst/mpegtsdemux/mpegtsbase.h b/gst/mpegtsdemux/mpegtsbase.h
index a8e66721a1..44ea90a11a 100644
--- a/gst/mpegtsdemux/mpegtsbase.h
+++ b/gst/mpegtsdemux/mpegtsbase.h
@@ -117,6 +117,9 @@ struct _MpegTSBase {
    * by subclasses if they have their own MpegTSBaseStream subclasses */
   gsize stream_size;
 
+  /* Whether we saw a PAT yet */
+  gboolean seen_pat;
+
   /*Offset from the origin to the first PAT (pullmode) */
   guint64    first_pat_offset;
 };

From adc048eb64bc26c7a2e210cc440a33737f8c4e43 Mon Sep 17 00:00:00 2001
From: Alessandro Decina <alessandro.d@gmail.com>
Date: Sun, 26 Jun 2011 20:32:53 +0200
Subject: [PATCH 088/158] neonhttpsrc: implement URI query

---
 ext/neon/gstneonhttpsrc.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/ext/neon/gstneonhttpsrc.c b/ext/neon/gstneonhttpsrc.c
index 2844dcd648..b295f08375 100644
--- a/ext/neon/gstneonhttpsrc.c
+++ b/ext/neon/gstneonhttpsrc.c
@@ -98,6 +98,7 @@ static gboolean gst_neonhttp_src_get_size (GstBaseSrc * bsrc, guint64 * size);
 static gboolean gst_neonhttp_src_is_seekable (GstBaseSrc * bsrc);
 static gboolean gst_neonhttp_src_do_seek (GstBaseSrc * bsrc,
     GstSegment * segment);
+static gboolean gst_neonhttp_src_query (GstBaseSrc * bsrc, GstQuery * query);
 
 static gboolean gst_neonhttp_src_set_proxy (GstNeonhttpSrc * src,
     const gchar * uri);
@@ -268,6 +269,7 @@ gst_neonhttp_src_class_init (GstNeonhttpSrcClass * klass)
   gstbasesrc_class->is_seekable =
       GST_DEBUG_FUNCPTR (gst_neonhttp_src_is_seekable);
   gstbasesrc_class->do_seek = GST_DEBUG_FUNCPTR (gst_neonhttp_src_do_seek);
+  gstbasesrc_class->query = GST_DEBUG_FUNCPTR (gst_neonhttp_src_query);
 
   gstpushsrc_class->create = GST_DEBUG_FUNCPTR (gst_neonhttp_src_create);
 
@@ -777,6 +779,28 @@ gst_neonhttp_src_do_seek (GstBaseSrc * bsrc, GstSegment * segment)
   return FALSE;
 }
 
+static gboolean
+gst_neonhttp_src_query (GstBaseSrc * bsrc, GstQuery * query)
+{
+  GstNeonhttpSrc *src = GST_NEONHTTP_SRC (bsrc);
+  gboolean ret;
+
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_URI:
+      gst_query_set_uri (query, src->location);
+      ret = TRUE;
+      break;
+    default:
+      ret = FALSE;
+      break;
+  }
+
+  if (!ret)
+    ret = GST_BASE_SRC_CLASS (parent_class)->query (bsrc, query);
+
+  return ret;
+}
+
 static gboolean
 gst_neonhttp_src_set_location (GstNeonhttpSrc * src, const gchar * uri)
 {

From d439f2d38d590a47e60e5b4d7fd7a2f2307beac6 Mon Sep 17 00:00:00 2001
From: Alessandro Decina <alessandro.d@gmail.com>
Date: Fri, 15 Jul 2011 00:03:10 +0200
Subject: [PATCH 089/158] mpegtsbase: actually set seen_pat=TRUE when we see a
 PAT

---
 gst/mpegtsdemux/mpegtsbase.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gst/mpegtsdemux/mpegtsbase.c b/gst/mpegtsdemux/mpegtsbase.c
index a2e7cbaeaa..463090a296 100644
--- a/gst/mpegtsdemux/mpegtsbase.c
+++ b/gst/mpegtsdemux/mpegtsbase.c
@@ -834,7 +834,7 @@ mpegts_base_handle_psi (MpegTSBase * base, MpegTSPacketizerSection * section)
       if (G_LIKELY (structure)) {
         mpegts_base_apply_pat (base, structure);
         if (base->seen_pat == FALSE) {
-
+          base->seen_pat = TRUE;
           base->first_pat_offset = GST_BUFFER_OFFSET (section->buffer);
           GST_DEBUG ("First PAT offset: %" G_GUINT64_FORMAT,
               base->first_pat_offset);

From 1972c26bde5f67346fb1677d6d82349dc2956b30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Thu, 14 Jul 2011 19:30:45 +0100
Subject: [PATCH 090/158] vdpau: fix some variable-set-but-unused compiler
 warnings

---
 sys/vdpau/basevideodecoder/gstbasevideodecoder.c | 13 -------------
 sys/vdpau/gstvdpsink.c                           |  2 --
 sys/vdpau/h264/gsth264dpb.c                      |  3 ---
 sys/vdpau/h264/gsth264parser.c                   |  2 +-
 sys/vdpau/h264/gstvdph264dec.c                   |  4 ++--
 5 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/sys/vdpau/basevideodecoder/gstbasevideodecoder.c b/sys/vdpau/basevideodecoder/gstbasevideodecoder.c
index 7bbfb4ea57..d2a1b145de 100644
--- a/sys/vdpau/basevideodecoder/gstbasevideodecoder.c
+++ b/sys/vdpau/basevideodecoder/gstbasevideodecoder.c
@@ -266,12 +266,9 @@ static gboolean
 gst_base_video_decoder_sink_event (GstPad * pad, GstEvent * event)
 {
   GstBaseVideoDecoder *base_video_decoder;
-  GstBaseVideoDecoderClass *base_video_decoder_class;
   gboolean res = FALSE;
 
   base_video_decoder = GST_BASE_VIDEO_DECODER (gst_pad_get_parent (pad));
-  base_video_decoder_class =
-      GST_BASE_VIDEO_DECODER_GET_CLASS (base_video_decoder);
 
   switch (GST_EVENT_TYPE (event)) {
     case GST_EVENT_EOS:
@@ -634,7 +631,6 @@ static GstFlowReturn
 gst_base_video_decoder_chain (GstPad * pad, GstBuffer * buf)
 {
   GstBaseVideoDecoder *base_video_decoder;
-  GstBaseVideoDecoderClass *base_video_decoder_class;
   GstFlowReturn ret;
 
   GST_DEBUG ("chain %" GST_TIME_FORMAT " duration %" GST_TIME_FORMAT,
@@ -651,8 +647,6 @@ gst_base_video_decoder_chain (GstPad * pad, GstBuffer * buf)
 #endif
 
   base_video_decoder = GST_BASE_VIDEO_DECODER (gst_pad_get_parent (pad));
-  base_video_decoder_class =
-      GST_BASE_VIDEO_DECODER_GET_CLASS (base_video_decoder);
 
   GST_DEBUG_OBJECT (base_video_decoder, "chain");
 
@@ -968,16 +962,11 @@ void
 gst_base_video_decoder_skip_frame (GstBaseVideoDecoder * base_video_decoder,
     GstVideoFrame * frame)
 {
-  GstBaseVideoDecoderClass *base_video_decoder_class;
-
   GstClockTime presentation_timestamp;
   GstClockTime presentation_duration;
 
   GST_DEBUG ("skip frame");
 
-  base_video_decoder_class =
-      GST_BASE_VIDEO_DECODER_GET_CLASS (base_video_decoder);
-
   gst_base_video_decoder_calculate_timestamps (base_video_decoder, frame,
       &presentation_timestamp, &presentation_duration);
 
@@ -1112,11 +1101,9 @@ static void
 gst_base_video_decoder_finalize (GObject * object)
 {
   GstBaseVideoDecoder *base_video_decoder;
-  GstBaseVideoDecoderClass *base_video_decoder_class;
 
   g_return_if_fail (GST_IS_BASE_VIDEO_DECODER (object));
   base_video_decoder = GST_BASE_VIDEO_DECODER (object);
-  base_video_decoder_class = GST_BASE_VIDEO_DECODER_GET_CLASS (object);
 
   g_object_unref (base_video_decoder->input_adapter);
 
diff --git a/sys/vdpau/gstvdpsink.c b/sys/vdpau/gstvdpsink.c
index 31a3d5926d..c3d097fdd4 100644
--- a/sys/vdpau/gstvdpsink.c
+++ b/sys/vdpau/gstvdpsink.c
@@ -1391,11 +1391,9 @@ static void
 gst_vdp_sink_class_init (VdpSinkClass * klass)
 {
   GObjectClass *gobject_class;
-  GstElementClass *gstelement_class;
   GstBaseSinkClass *gstbasesink_class;
 
   gobject_class = (GObjectClass *) klass;
-  gstelement_class = (GstElementClass *) klass;
   gstbasesink_class = (GstBaseSinkClass *) klass;
 
   parent_class = g_type_class_peek_parent (klass);
diff --git a/sys/vdpau/h264/gsth264dpb.c b/sys/vdpau/h264/gsth264dpb.c
index 71a04e9635..4fadc171c2 100644
--- a/sys/vdpau/h264/gsth264dpb.c
+++ b/sys/vdpau/h264/gsth264dpb.c
@@ -132,13 +132,10 @@ gst_h264_dpb_bump (GstH264DPB * dpb, guint poc, GstFlowReturn * ret)
 GstFlowReturn
 gst_h264_dpb_add (GstH264DPB * dpb, GstH264Frame * h264_frame)
 {
-  GstH264Frame **frames;
   GstFlowReturn ret;
 
   GST_DEBUG ("add frame with poc: %d", h264_frame->poc);
 
-  frames = dpb->frames;
-
   if (h264_frame->is_reference && h264_frame->is_long_term &&
       (h264_frame->frame_idx > dpb->max_longterm_frame_idx))
     h264_frame->is_reference = FALSE;
diff --git a/sys/vdpau/h264/gsth264parser.c b/sys/vdpau/h264/gsth264parser.c
index b154a54cc7..a2a3cf0b82 100644
--- a/sys/vdpau/h264/gsth264parser.c
+++ b/sys/vdpau/h264/gsth264parser.c
@@ -768,7 +768,7 @@ gst_h264_slice_parse_ref_pic_list_reordering (GstH264Slice * slice,
       do {
         READ_UE_ALLOWED (reader, reordering_of_pic_nums_idc, 0, 3);
         if (reordering_of_pic_nums_idc == 0 || reordering_of_pic_nums_idc == 1) {
-          guint32 abs_diff_pic_num_minus1;
+          guint32 abs_diff_pic_num_minus1 G_GNUC_UNUSED;
 
           READ_UE_ALLOWED (reader, abs_diff_pic_num_minus1, 0,
               slice->MaxPicNum - 1);
diff --git a/sys/vdpau/h264/gstvdph264dec.c b/sys/vdpau/h264/gstvdph264dec.c
index 8d7e3fa4ec..6c181aff01 100644
--- a/sys/vdpau/h264/gstvdph264dec.c
+++ b/sys/vdpau/h264/gstvdph264dec.c
@@ -471,8 +471,8 @@ gst_vdp_h264_dec_handle_frame (GstBaseVideoDecoder * base_video_decoder,
 
   GstH264Frame *h264_frame;
   GstH264Slice *slice;
-  GstH264Picture *pic;
-  GstH264Sequence *seq;
+  GstH264Picture *pic G_GNUC_UNUSED;
+  GstH264Sequence *seq G_GNUC_UNUSED;
 
   GstFlowReturn ret;
   GstVdpVideoBuffer *outbuf;

From 01cf66b642ff2a68ae5bec4d9866abb0976e7b83 Mon Sep 17 00:00:00 2001
From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Fri, 15 Jul 2011 10:04:53 +0200
Subject: [PATCH 091/158] pcapparse: rename offset property to ts-offset

... so as to promote consistency with some other elements in the wild.
---
 gst/pcapparse/gstpcapparse.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/gst/pcapparse/gstpcapparse.c b/gst/pcapparse/gstpcapparse.c
index 25d57c7b7c..36fcc3126b 100644
--- a/gst/pcapparse/gstpcapparse.c
+++ b/gst/pcapparse/gstpcapparse.c
@@ -64,7 +64,7 @@ enum
   PROP_SRC_PORT,
   PROP_DST_PORT,
   PROP_CAPS,
-  PROP_OFFSET,
+  PROP_TS_OFFSET,
   PROP_LAST
 };
 
@@ -144,8 +144,8 @@ gst_pcap_parse_class_init (GstPcapParseClass * klass)
           "The caps of the source pad", GST_TYPE_CAPS,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
-  g_object_class_install_property (gobject_class, PROP_OFFSET,
-      g_param_spec_int64 ("offset", "Offset",
+  g_object_class_install_property (gobject_class, PROP_TS_OFFSET,
+      g_param_spec_int64 ("ts-offset", "Timestamp Offset",
           "Relative timestamp offset (ns) to apply (-1 = use absolute packet time)",
           -1, G_MAXINT64, -1, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
@@ -241,7 +241,7 @@ gst_pcap_parse_get_property (GObject * object, guint prop_id,
       gst_value_set_caps (value, self->caps);
       break;
 
-    case PROP_OFFSET:
+    case PROP_TS_OFFSET:
       g_value_set_int64 (value, self->offset);
       break;
 
@@ -295,7 +295,7 @@ gst_pcap_parse_set_property (GObject * object, guint prop_id,
       break;
     }
 
-    case PROP_OFFSET:
+    case PROP_TS_OFFSET:
       self->offset = g_value_get_int64 (value);
       break;
 
@@ -469,6 +469,9 @@ gst_pcap_parse_chain (GstPad * pad, GstBuffer * buffer)
 
           data = gst_adapter_peek (self->adapter, self->cur_packet_size);
 
+          GST_LOG_OBJECT (self, "examining packet size %d",
+              self->cur_packet_size);
+
           if (gst_pcap_parse_scan_frame (self, data, self->cur_packet_size,
                   &payload_data, &payload_size)) {
             GstBuffer *out_buf;
@@ -571,6 +574,7 @@ gst_pcap_parse_chain (GstPad * pad, GstBuffer * buffer)
         goto out;
       }
 
+      GST_DEBUG_OBJECT (self, "linktype %u", linktype);
       self->linktype = linktype;
 
       gst_adapter_flush (self->adapter, 24);

From 736aebc37e3fc04ca0bedb277793368da2a8485a Mon Sep 17 00:00:00 2001
From: Raluca Elena Podiuc <ralucaelena1985@gmail.com>
Date: Wed, 13 Jul 2011 17:15:36 +0300
Subject: [PATCH 092/158] tests: camerabin2: fix name of 'image-done' bus
 message

Use the correct bus message for camerabin2 image done and removes
check that is no longer needed for these tests.
---
 tests/check/elements/camerabin2.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tests/check/elements/camerabin2.c b/tests/check/elements/camerabin2.c
index 1016a0ca86..5277b619a6 100644
--- a/tests/check/elements/camerabin2.c
+++ b/tests/check/elements/camerabin2.c
@@ -258,11 +258,8 @@ capture_bus_cb (GstBus * bus, GstMessage * message, gpointer data)
       break;
     default:
       st = gst_message_get_structure (message);
-      if (st && gst_structure_has_name (st, "image-captured")) {
-        gboolean ready = FALSE;
+      if (st && gst_structure_has_name (st, "image-done")) {
         GST_INFO ("image captured");
-        g_object_get (camera, "ready-for-capture", &ready, NULL);
-        fail_if (!ready, "not ready for capture");
       } else if (st && gst_structure_has_name (st,
               GST_BASE_CAMERA_SRC_PREVIEW_MESSAGE_NAME)) {
         GstBuffer *buf;

From 33428b79f96731eb02ebb1e061c91fcff94e8de6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Fri, 15 Jul 2011 16:10:57 +0100
Subject: [PATCH 093/158] We need core/base from git

Update requirements after out-of-order 0.10.35 release
---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1aac3360a4..b953183d67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,8 +52,8 @@ AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 
 dnl *** required versions of GStreamer stuff ***
-GST_REQ=0.10.34.1
-GSTPB_REQ=0.10.34.1
+GST_REQ=0.10.35.1
+GSTPB_REQ=0.10.35.1
 
 dnl *** autotools stuff ****
 

From 1c3229307e88fe24a25e782577c63ea5808b8ac2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Fri, 15 Jul 2011 20:39:20 +0100
Subject: [PATCH 094/158] tagmux: fix up private base class header so it can be
 made public

Move private bits into a private struct, add some padding.

https://bugzilla.gnome.org/show_bug.cgi?id=555437
---
 gst/id3tag/gsttagmux.c | 212 ++++++++++++++++++++++++-----------------
 gst/id3tag/gsttagmux.h |  20 ++--
 gst/id3tag/id3tag.c    |   2 -
 3 files changed, 132 insertions(+), 102 deletions(-)

diff --git a/gst/id3tag/gsttagmux.c b/gst/id3tag/gsttagmux.c
index 4aafb96d85..c7d9f0823d 100644
--- a/gst/id3tag/gsttagmux.c
+++ b/gst/id3tag/gsttagmux.c
@@ -1,5 +1,4 @@
 /* GStreamer tag muxer base class
- *
  * Copyright (C) 2006 Christophe Fergeau  <teuf@gnome.org>
  * Copyright (C) 2006 Tim-Philipp Müller <tim centricular net>
  * Copyright (C) 2006 Sebastian Dröge <slomo@circular-chaos.org>
@@ -31,6 +30,23 @@
 
 #include "gsttagmux.h"
 
+struct _GstTagMuxPrivate
+{
+  GstPad *srcpad;
+  GstPad *sinkpad;
+  GstTagList *event_tags;       /* tags received from upstream elements */
+  GstTagList *final_tags;       /* Final set of tags used for muxing */
+  gsize start_tag_size;
+  gsize end_tag_size;
+  gboolean render_start_tag;
+  gboolean render_end_tag;
+
+  gint64 current_offset;
+  gint64 max_offset;
+
+  GstEvent *newsegment_ev;      /* cached newsegment event from upstream */
+};
+
 GST_DEBUG_CATEGORY_STATIC (gst_tag_mux_debug);
 #define GST_CAT_DEFAULT gst_tag_mux_debug
 
@@ -74,19 +90,19 @@ gst_tag_mux_finalize (GObject * obj)
 {
   GstTagMux *mux = GST_TAG_MUX (obj);
 
-  if (mux->newsegment_ev) {
-    gst_event_unref (mux->newsegment_ev);
-    mux->newsegment_ev = NULL;
+  if (mux->priv->newsegment_ev) {
+    gst_event_unref (mux->priv->newsegment_ev);
+    mux->priv->newsegment_ev = NULL;
   }
 
-  if (mux->event_tags) {
-    gst_tag_list_free (mux->event_tags);
-    mux->event_tags = NULL;
+  if (mux->priv->event_tags) {
+    gst_tag_list_free (mux->priv->event_tags);
+    mux->priv->event_tags = NULL;
   }
 
-  if (mux->final_tags) {
-    gst_tag_list_free (mux->final_tags);
-    mux->final_tags = NULL;
+  if (mux->priv->final_tags) {
+    gst_tag_list_free (mux->priv->final_tags);
+    mux->priv->final_tags = NULL;
   }
 
   G_OBJECT_CLASS (parent_class)->finalize (obj);
@@ -115,6 +131,8 @@ gst_tag_mux_class_init (GstTagMuxClass * klass)
 
   gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_tag_mux_finalize);
   gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_tag_mux_change_state);
+
+  g_type_class_add_private (klass, sizeof (GstTagMuxPrivate));
 }
 
 static void
@@ -123,26 +141,30 @@ gst_tag_mux_init (GstTagMux * mux, GstTagMuxClass * mux_class)
   GstElementClass *element_klass = GST_ELEMENT_CLASS (mux_class);
   GstPadTemplate *tmpl;
 
+  mux->priv =
+      G_TYPE_INSTANCE_GET_PRIVATE (mux, GST_TYPE_TAG_MUX, GstTagMuxPrivate);
+
   /* pad through which data comes in to the element */
-  mux->sinkpad =
+  mux->priv->sinkpad =
       gst_pad_new_from_static_template (&gst_tag_mux_sink_template, "sink");
-  gst_pad_set_chain_function (mux->sinkpad,
+  gst_pad_set_chain_function (mux->priv->sinkpad,
       GST_DEBUG_FUNCPTR (gst_tag_mux_chain));
-  gst_pad_set_event_function (mux->sinkpad,
+  gst_pad_set_event_function (mux->priv->sinkpad,
       GST_DEBUG_FUNCPTR (gst_tag_mux_sink_event));
-  gst_element_add_pad (GST_ELEMENT (mux), mux->sinkpad);
+  gst_element_add_pad (GST_ELEMENT (mux), mux->priv->sinkpad);
 
   /* pad through which data goes out of the element */
   tmpl = gst_element_class_get_pad_template (element_klass, "src");
   if (tmpl) {
-    mux->srcpad = gst_pad_new_from_template (tmpl, "src");
-    gst_pad_use_fixed_caps (mux->srcpad);
-    gst_pad_set_caps (mux->srcpad, gst_pad_template_get_caps (tmpl));
-    gst_element_add_pad (GST_ELEMENT (mux), mux->srcpad);
+    mux->priv->srcpad = gst_pad_new_from_template (tmpl, "src");
+    gst_pad_use_fixed_caps (mux->priv->srcpad);
+    /* FIXME: we assume the template caps are fixed.. */
+    gst_pad_set_caps (mux->priv->srcpad, gst_pad_template_get_caps (tmpl));
+    gst_element_add_pad (GST_ELEMENT (mux), mux->priv->srcpad);
   }
 
-  mux->render_start_tag = TRUE;
-  mux->render_end_tag = TRUE;
+  mux->priv->render_start_tag = TRUE;
+  mux->priv->render_end_tag = TRUE;
 }
 
 static GstTagList *
@@ -152,22 +174,22 @@ gst_tag_mux_get_tags (GstTagMux * mux)
   const GstTagList *tagsetter_tags;
   GstTagMergeMode merge_mode;
 
-  if (mux->final_tags)
-    return mux->final_tags;
+  if (mux->priv->final_tags)
+    return mux->priv->final_tags;
 
   tagsetter_tags = gst_tag_setter_get_tag_list (tagsetter);
   merge_mode = gst_tag_setter_get_tag_merge_mode (tagsetter);
 
   GST_LOG_OBJECT (mux, "merging tags, merge mode = %d", merge_mode);
-  GST_LOG_OBJECT (mux, "event tags: %" GST_PTR_FORMAT, mux->event_tags);
+  GST_LOG_OBJECT (mux, "event tags: %" GST_PTR_FORMAT, mux->priv->event_tags);
   GST_LOG_OBJECT (mux, "set   tags: %" GST_PTR_FORMAT, tagsetter_tags);
 
-  mux->final_tags =
-      gst_tag_list_merge (tagsetter_tags, mux->event_tags, merge_mode);
+  mux->priv->final_tags =
+      gst_tag_list_merge (tagsetter_tags, mux->priv->event_tags, merge_mode);
 
-  GST_LOG_OBJECT (mux, "final tags: %" GST_PTR_FORMAT, mux->final_tags);
+  GST_LOG_OBJECT (mux, "final tags: %" GST_PTR_FORMAT, mux->priv->final_tags);
 
-  return mux->final_tags;
+  return mux->priv->final_tags;
 }
 
 static GstFlowReturn
@@ -191,29 +213,35 @@ gst_tag_mux_render_start_tag (GstTagMux * mux)
   /* Null buffer is ok, just means we're not outputting anything */
   if (buffer == NULL) {
     GST_INFO_OBJECT (mux, "No start tag generated");
-    mux->start_tag_size = 0;
+    mux->priv->start_tag_size = 0;
     return GST_FLOW_OK;
   }
 
-  mux->start_tag_size = GST_BUFFER_SIZE (buffer);
+  if (GST_BUFFER_CAPS (buffer) == NULL) {
+    buffer = gst_buffer_make_metadata_writable (buffer);
+    gst_buffer_set_caps (buffer, GST_PAD_CAPS (mux->priv->srcpad));
+  }
+
+  mux->priv->start_tag_size = GST_BUFFER_SIZE (buffer);
   GST_LOG_OBJECT (mux, "tag size = %" G_GSIZE_FORMAT " bytes",
-      mux->start_tag_size);
+      mux->priv->start_tag_size);
 
   /* Send newsegment event from byte position 0, so the tag really gets
    * written to the start of the file, independent of the upstream segment */
-  gst_pad_push_event (mux->srcpad,
+  gst_pad_push_event (mux->priv->srcpad,
       gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_BYTES, 0, -1, 0));
 
   /* Send an event about the new tags to downstream elements */
   /* gst_event_new_tag takes ownership of the list, so use a copy */
   event = gst_event_new_tag (gst_tag_list_copy (taglist));
-  gst_pad_push_event (mux->srcpad, event);
+  gst_pad_push_event (mux->priv->srcpad, event);
 
   GST_BUFFER_OFFSET (buffer) = 0;
-  ret = gst_pad_push (mux->srcpad, buffer);
+  ret = gst_pad_push (mux->priv->srcpad, buffer);
 
-  mux->current_offset = mux->start_tag_size;
-  mux->max_offset = MAX (mux->max_offset, mux->current_offset);
+  mux->priv->current_offset = mux->priv->start_tag_size;
+  mux->priv->max_offset =
+      MAX (mux->priv->max_offset, mux->priv->current_offset);
 
   return ret;
 
@@ -244,22 +272,27 @@ gst_tag_mux_render_end_tag (GstTagMux * mux)
 
   if (buffer == NULL) {
     GST_INFO_OBJECT (mux, "No end tag generated");
-    mux->end_tag_size = 0;
+    mux->priv->end_tag_size = 0;
     return GST_FLOW_OK;
   }
 
-  mux->end_tag_size = GST_BUFFER_SIZE (buffer);
+  if (GST_BUFFER_CAPS (buffer) == NULL) {
+    buffer = gst_buffer_make_metadata_writable (buffer);
+    gst_buffer_set_caps (buffer, GST_PAD_CAPS (mux->priv->srcpad));
+  }
+
+  mux->priv->end_tag_size = GST_BUFFER_SIZE (buffer);
   GST_LOG_OBJECT (mux, "tag size = %" G_GSIZE_FORMAT " bytes",
-      mux->end_tag_size);
+      mux->priv->end_tag_size);
 
   /* Send newsegment event from the end of the file, so it gets written there,
      independent of whatever new segment events upstream has sent us */
-  gst_pad_push_event (mux->srcpad,
-      gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_BYTES, mux->max_offset,
-          -1, 0));
+  gst_pad_push_event (mux->priv->srcpad,
+      gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_BYTES,
+          mux->priv->max_offset, -1, 0));
 
-  GST_BUFFER_OFFSET (buffer) = mux->max_offset;
-  ret = gst_pad_push (mux->srcpad, buffer);
+  GST_BUFFER_OFFSET (buffer) = mux->priv->max_offset;
+  ret = gst_pad_push (mux->priv->srcpad, buffer);
 
   return ret;
 
@@ -284,15 +317,16 @@ gst_tag_mux_adjust_event_offsets (GstTagMux * mux,
   g_assert (format == GST_FORMAT_BYTES);
 
   if (start != -1)
-    start += mux->start_tag_size;
+    start += mux->priv->start_tag_size;
   if (stop != -1)
-    stop += mux->start_tag_size;
+    stop += mux->priv->start_tag_size;
   if (cur != -1)
-    cur += mux->start_tag_size;
+    cur += mux->priv->start_tag_size;
 
   GST_DEBUG_OBJECT (mux, "adjusting newsegment event offsets to start=%"
       G_GINT64_FORMAT ", stop=%" G_GINT64_FORMAT ", cur=%" G_GINT64_FORMAT
-      " (delta = +%" G_GSIZE_FORMAT ")", start, stop, cur, mux->start_tag_size);
+      " (delta = +%" G_GSIZE_FORMAT ")", start, stop, cur,
+      mux->priv->start_tag_size);
 
   return gst_event_new_new_segment (TRUE, 1.0, format, start, stop, cur);
 }
@@ -304,7 +338,7 @@ gst_tag_mux_chain (GstPad * pad, GstBuffer * buffer)
   GstFlowReturn ret;
   int length;
 
-  if (mux->render_start_tag) {
+  if (mux->priv->render_start_tag) {
 
     GST_INFO_OBJECT (mux, "Adding tags to stream");
     ret = gst_tag_mux_render_start_tag (mux);
@@ -315,26 +349,27 @@ gst_tag_mux_chain (GstPad * pad, GstBuffer * buffer)
     }
 
     /* Now send the cached newsegment event that we got from upstream */
-    if (mux->newsegment_ev) {
+    if (mux->priv->newsegment_ev) {
       gint64 start;
       GstEvent *newseg;
 
       GST_DEBUG_OBJECT (mux, "sending cached newsegment event");
-      newseg = gst_tag_mux_adjust_event_offsets (mux, mux->newsegment_ev);
-      gst_event_unref (mux->newsegment_ev);
-      mux->newsegment_ev = NULL;
+      newseg = gst_tag_mux_adjust_event_offsets (mux, mux->priv->newsegment_ev);
+      gst_event_unref (mux->priv->newsegment_ev);
+      mux->priv->newsegment_ev = NULL;
 
       gst_event_parse_new_segment (newseg, NULL, NULL, NULL, &start, NULL,
           NULL);
 
-      gst_pad_push_event (mux->srcpad, newseg);
-      mux->current_offset = start;
-      mux->max_offset = MAX (mux->max_offset, mux->current_offset);
+      gst_pad_push_event (mux->priv->srcpad, newseg);
+      mux->priv->current_offset = start;
+      mux->priv->max_offset =
+          MAX (mux->priv->max_offset, mux->priv->current_offset);
     } else {
       /* upstream sent no newsegment event or only one in a non-BYTE format */
     }
 
-    mux->render_start_tag = FALSE;
+    mux->priv->render_start_tag = FALSE;
   }
 
   buffer = gst_buffer_make_metadata_writable (buffer);
@@ -342,17 +377,18 @@ gst_tag_mux_chain (GstPad * pad, GstBuffer * buffer)
   if (GST_BUFFER_OFFSET (buffer) != GST_BUFFER_OFFSET_NONE) {
     GST_LOG_OBJECT (mux, "Adjusting buffer offset from %" G_GINT64_FORMAT
         " to %" G_GINT64_FORMAT, GST_BUFFER_OFFSET (buffer),
-        GST_BUFFER_OFFSET (buffer) + mux->start_tag_size);
-    GST_BUFFER_OFFSET (buffer) += mux->start_tag_size;
+        GST_BUFFER_OFFSET (buffer) + mux->priv->start_tag_size);
+    GST_BUFFER_OFFSET (buffer) += mux->priv->start_tag_size;
   }
 
   length = GST_BUFFER_SIZE (buffer);
 
-  gst_buffer_set_caps (buffer, GST_PAD_CAPS (mux->srcpad));
-  ret = gst_pad_push (mux->srcpad, buffer);
+  gst_buffer_set_caps (buffer, GST_PAD_CAPS (mux->priv->srcpad));
+  ret = gst_pad_push (mux->priv->srcpad, buffer);
 
-  mux->current_offset += length;
-  mux->max_offset = MAX (mux->max_offset, mux->current_offset);
+  mux->priv->current_offset += length;
+  mux->priv->max_offset =
+      MAX (mux->priv->max_offset, mux->priv->current_offset);
 
   return ret;
 }
@@ -374,14 +410,15 @@ gst_tag_mux_sink_event (GstPad * pad, GstEvent * event)
 
       GST_INFO_OBJECT (mux, "Got tag event: %" GST_PTR_FORMAT, tags);
 
-      if (mux->event_tags != NULL) {
-        gst_tag_list_insert (mux->event_tags, tags, GST_TAG_MERGE_REPLACE);
+      if (mux->priv->event_tags != NULL) {
+        gst_tag_list_insert (mux->priv->event_tags, tags,
+            GST_TAG_MERGE_REPLACE);
       } else {
-        mux->event_tags = gst_tag_list_copy (tags);
+        mux->priv->event_tags = gst_tag_list_copy (tags);
       }
 
       GST_INFO_OBJECT (mux, "Event tags are now: %" GST_PTR_FORMAT,
-          mux->event_tags);
+          mux->priv->event_tags);
 
       /* just drop the event, we'll push a new tag event in render_start_tag */
       gst_event_unref (event);
@@ -401,34 +438,35 @@ gst_tag_mux_sink_event (GstPad * pad, GstEvent * event)
         break;
       }
 
-      if (mux->render_start_tag) {
+      if (mux->priv->render_start_tag) {
         /* we have not rendered the tag yet, which means that we don't know
          * how large it is going to be yet, so we can't adjust the offsets
          * here at this point and need to cache the newsegment event for now
          * (also, there could be tag events coming after this newsegment event
          *  and before the first buffer). */
-        if (mux->newsegment_ev) {
+        if (mux->priv->newsegment_ev) {
           GST_WARNING_OBJECT (mux, "discarding old cached newsegment event");
-          gst_event_unref (mux->newsegment_ev);
+          gst_event_unref (mux->priv->newsegment_ev);
         }
 
         GST_LOG_OBJECT (mux, "caching newsegment event for later");
-        mux->newsegment_ev = event;
+        mux->priv->newsegment_ev = event;
       } else {
         GST_DEBUG_OBJECT (mux, "got newsegment event, adjusting offsets");
-        gst_pad_push_event (mux->srcpad,
+        gst_pad_push_event (mux->priv->srcpad,
             gst_tag_mux_adjust_event_offsets (mux, event));
         gst_event_unref (event);
 
-        mux->current_offset = start;
-        mux->max_offset = MAX (mux->max_offset, mux->current_offset);
+        mux->priv->current_offset = start;
+        mux->priv->max_offset =
+            MAX (mux->priv->max_offset, mux->priv->current_offset);
       }
       event = NULL;
       result = TRUE;
       break;
     }
     case GST_EVENT_EOS:{
-      if (mux->render_end_tag) {
+      if (mux->priv->render_end_tag) {
         GstFlowReturn ret;
 
         GST_INFO_OBJECT (mux, "Adding tags to stream");
@@ -438,7 +476,7 @@ gst_tag_mux_sink_event (GstPad * pad, GstEvent * event)
           return ret;
         }
 
-        mux->render_end_tag = FALSE;
+        mux->priv->render_end_tag = FALSE;
       }
 
       /* Now forward EOS */
@@ -471,20 +509,20 @@ gst_tag_mux_change_state (GstElement * element, GstStateChange transition)
 
   switch (transition) {
     case GST_STATE_CHANGE_PAUSED_TO_READY:{
-      if (mux->newsegment_ev) {
-        gst_event_unref (mux->newsegment_ev);
-        mux->newsegment_ev = NULL;
+      if (mux->priv->newsegment_ev) {
+        gst_event_unref (mux->priv->newsegment_ev);
+        mux->priv->newsegment_ev = NULL;
       }
-      if (mux->event_tags) {
-        gst_tag_list_free (mux->event_tags);
-        mux->event_tags = NULL;
+      if (mux->priv->event_tags) {
+        gst_tag_list_free (mux->priv->event_tags);
+        mux->priv->event_tags = NULL;
       }
-      mux->start_tag_size = 0;
-      mux->end_tag_size = 0;
-      mux->render_start_tag = TRUE;
-      mux->render_end_tag = TRUE;
-      mux->current_offset = 0;
-      mux->max_offset = 0;
+      mux->priv->start_tag_size = 0;
+      mux->priv->end_tag_size = 0;
+      mux->priv->render_start_tag = TRUE;
+      mux->priv->render_end_tag = TRUE;
+      mux->priv->current_offset = 0;
+      mux->priv->max_offset = 0;
       break;
     }
     default:
diff --git a/gst/id3tag/gsttagmux.h b/gst/id3tag/gsttagmux.h
index c13a7326d2..49a0ab912d 100644
--- a/gst/id3tag/gsttagmux.h
+++ b/gst/id3tag/gsttagmux.h
@@ -29,24 +29,16 @@ G_BEGIN_DECLS
 
 typedef struct _GstTagMux GstTagMux;
 typedef struct _GstTagMuxClass GstTagMuxClass;
+typedef struct _GstTagMuxPrivate GstTagMuxPrivate;
 
 /* Definition of structure storing data for this element. */
 struct _GstTagMux {
   GstElement    element;
 
-  GstPad       *srcpad;
-  GstPad       *sinkpad;
-  GstTagList   *event_tags; /* tags received from upstream elements */
-  GstTagList   *final_tags; /* Final set of tags used for muxing */
-  gsize         start_tag_size;
-  gsize         end_tag_size;
-  gboolean      render_start_tag;
-  gboolean      render_end_tag;
+  /*< private >*/
+  GstTagMuxPrivate *priv;
 
-  gint64        current_offset;
-  gint64        max_offset;
-
-  GstEvent     *newsegment_ev; /* cached newsegment event from upstream */
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 /* Standard definition defining a class for this element. */
@@ -56,6 +48,9 @@ struct _GstTagMuxClass {
   /* vfuncs */
   GstBuffer  * (*render_start_tag) (GstTagMux * mux, GstTagList * tag_list);
   GstBuffer  * (*render_end_tag) (GstTagMux * mux, GstTagList * tag_list);
+
+  /*< private >*/
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 /* Standard macros for defining types for this element.  */
@@ -76,4 +71,3 @@ GType gst_tag_mux_get_type (void);
 G_END_DECLS
 
 #endif
-
diff --git a/gst/id3tag/id3tag.c b/gst/id3tag/id3tag.c
index 2f3bebf848..ef1948be2e 100644
--- a/gst/id3tag/id3tag.c
+++ b/gst/id3tag/id3tag.c
@@ -1159,7 +1159,6 @@ id3_mux_render_v2_tag (GstTagMux * mux, GstTagList * taglist, int version)
 
   /* Create buffer with tag */
   buf = id3v2_tag_to_buffer (&tag);
-  gst_buffer_set_caps (buf, GST_PAD_CAPS (mux->srcpad));
   GST_LOG_OBJECT (mux, "tag size = %d bytes", GST_BUFFER_SIZE (buf));
 
   id3v2_tag_unset (&tag);
@@ -1312,6 +1311,5 @@ id3_mux_render_v1_tag (GstTagMux * mux, GstTagList * taglist)
     return NULL;
   }
 
-  gst_buffer_set_caps (buf, GST_PAD_CAPS (mux->srcpad));
   return buf;
 }

From f054eab77e24051fd9ff733c873e62f236a1dc11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Fri, 15 Jul 2011 20:57:47 +0100
Subject: [PATCH 095/158] tagmux: const-ify GstTagList argument of render
 vfuncs

---
 gst/id3tag/gstid3mux.c | 12 +++++-----
 gst/id3tag/gsttagmux.h | 52 +++++++++++++++++++-----------------------
 gst/id3tag/id3tag.c    |  4 ++--
 gst/id3tag/id3tag.h    | 10 ++++----
 4 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/gst/id3tag/gstid3mux.c b/gst/id3tag/gstid3mux.c
index 43ab1a08b4..d203fb3c6d 100644
--- a/gst/id3tag/gstid3mux.c
+++ b/gst/id3tag/gstid3mux.c
@@ -79,9 +79,9 @@ static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
 GST_BOILERPLATE (GstId3Mux, gst_id3_mux, GstTagMux, GST_TYPE_TAG_MUX);
 
 static GstBuffer *gst_id3_mux_render_v2_tag (GstTagMux * mux,
-    GstTagList * taglist);
+    const GstTagList * taglist);
 static GstBuffer *gst_id3_mux_render_v1_tag (GstTagMux * mux,
-    GstTagList * taglist);
+    const GstTagList * taglist);
 
 static void gst_id3_mux_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);
@@ -129,8 +129,8 @@ gst_id3_mux_class_init (GstId3MuxClass * klass)
 
   GST_TAG_MUX_CLASS (klass)->render_start_tag =
       GST_DEBUG_FUNCPTR (gst_id3_mux_render_v2_tag);
-
-  GST_TAG_MUX_CLASS (klass)->render_end_tag = gst_id3_mux_render_v1_tag;
+  GST_TAG_MUX_CLASS (klass)->render_end_tag =
+      GST_DEBUG_FUNCPTR (gst_id3_mux_render_v1_tag);
 }
 
 static void
@@ -187,7 +187,7 @@ gst_id3_mux_get_property (GObject * object, guint prop_id,
 }
 
 static GstBuffer *
-gst_id3_mux_render_v2_tag (GstTagMux * mux, GstTagList * taglist)
+gst_id3_mux_render_v2_tag (GstTagMux * mux, const GstTagList * taglist)
 {
   GstId3Mux *id3mux = GST_ID3_MUX (mux);
 
@@ -198,7 +198,7 @@ gst_id3_mux_render_v2_tag (GstTagMux * mux, GstTagList * taglist)
 }
 
 static GstBuffer *
-gst_id3_mux_render_v1_tag (GstTagMux * mux, GstTagList * taglist)
+gst_id3_mux_render_v1_tag (GstTagMux * mux, const GstTagList * taglist)
 {
   GstId3Mux *id3mux = GST_ID3_MUX (mux);
 
diff --git a/gst/id3tag/gsttagmux.h b/gst/id3tag/gsttagmux.h
index 49a0ab912d..4677c32f75 100644
--- a/gst/id3tag/gsttagmux.h
+++ b/gst/id3tag/gsttagmux.h
@@ -27,33 +27,6 @@
 
 G_BEGIN_DECLS
 
-typedef struct _GstTagMux GstTagMux;
-typedef struct _GstTagMuxClass GstTagMuxClass;
-typedef struct _GstTagMuxPrivate GstTagMuxPrivate;
-
-/* Definition of structure storing data for this element. */
-struct _GstTagMux {
-  GstElement    element;
-
-  /*< private >*/
-  GstTagMuxPrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/* Standard definition defining a class for this element. */
-struct _GstTagMuxClass {
-  GstElementClass parent_class;
-
-  /* vfuncs */
-  GstBuffer  * (*render_start_tag) (GstTagMux * mux, GstTagList * tag_list);
-  GstBuffer  * (*render_end_tag) (GstTagMux * mux, GstTagList * tag_list);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/* Standard macros for defining types for this element.  */
 #define GST_TYPE_TAG_MUX \
   (gst_tag_mux_get_type())
 #define GST_TAG_MUX(obj) \
@@ -65,7 +38,30 @@ struct _GstTagMuxClass {
 #define GST_IS_TAG_MUX_CLASS(klass) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_TAG_MUX))
 
-/* Standard function returning type information. */
+typedef struct _GstTagMux GstTagMux;
+typedef struct _GstTagMuxClass GstTagMuxClass;
+typedef struct _GstTagMuxPrivate GstTagMuxPrivate;
+
+struct _GstTagMux {
+  GstElement    element;
+
+  /*< private >*/
+  GstTagMuxPrivate *priv;
+
+  gpointer _gst_reserved[GST_PADDING];
+};
+
+struct _GstTagMuxClass {
+  GstElementClass parent_class;
+
+  /* vfuncs */
+  GstBuffer  * (*render_start_tag) (GstTagMux * mux, const GstTagList * tag_list);
+  GstBuffer  * (*render_end_tag)   (GstTagMux * mux, const GstTagList * tag_list);
+
+  /*< private >*/
+  gpointer _gst_reserved[GST_PADDING];
+};
+
 GType gst_tag_mux_get_type (void);
 
 G_END_DECLS
diff --git a/gst/id3tag/id3tag.c b/gst/id3tag/id3tag.c
index ef1948be2e..3a0e4d48dd 100644
--- a/gst/id3tag/id3tag.c
+++ b/gst/id3tag/id3tag.c
@@ -1132,7 +1132,7 @@ foreach_add_tag (const GstTagList * list, const gchar * tag, gpointer userdata)
 }
 
 GstBuffer *
-id3_mux_render_v2_tag (GstTagMux * mux, GstTagList * taglist, int version)
+id3_mux_render_v2_tag (GstTagMux * mux, const GstTagList * taglist, int version)
 {
   GstId3v2Tag tag;
   GstBuffer *buf;
@@ -1284,7 +1284,7 @@ static const struct
 };
 
 GstBuffer *
-id3_mux_render_v1_tag (GstTagMux * mux, GstTagList * taglist)
+id3_mux_render_v1_tag (GstTagMux * mux, const GstTagList * taglist)
 {
   GstBuffer *buf = gst_buffer_new_and_alloc (ID3_V1_TAG_SIZE);
   guint8 *data = GST_BUFFER_DATA (buf);
diff --git a/gst/id3tag/id3tag.h b/gst/id3tag/id3tag.h
index d55049691f..eeb1995d5b 100644
--- a/gst/id3tag/id3tag.h
+++ b/gst/id3tag/id3tag.h
@@ -24,9 +24,11 @@ G_BEGIN_DECLS
 #define ID3_VERSION_2_3 3
 #define ID3_VERSION_2_4 4
 
-GstBuffer * id3_mux_render_v2_tag (GstTagMux * mux, GstTagList * taglist,
-        int version);
-GstBuffer * id3_mux_render_v1_tag (GstTagMux * mux, GstTagList * taglist);
+GstBuffer * id3_mux_render_v2_tag (GstTagMux        * mux,
+                                   const GstTagList * taglist,
+                                   int                version);
+
+GstBuffer * id3_mux_render_v1_tag (GstTagMux        * mux,
+                                   const GstTagList * taglist);
 
 G_END_DECLS
-

From b73679e13d23d39c9e34bb01909bf42649ea6dda Mon Sep 17 00:00:00 2001
From: Edward Hervey <edward.hervey@collabora.co.uk>
Date: Fri, 15 Jul 2011 12:08:40 +0200
Subject: [PATCH 096/158] mpegtsbase: Store incoming newsegments

---
 gst/mpegtsdemux/mpegtsbase.c | 26 +++++++++++++++++++++++---
 gst/mpegtsdemux/mpegtsbase.h |  5 ++++-
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/gst/mpegtsdemux/mpegtsbase.c b/gst/mpegtsdemux/mpegtsbase.c
index 463090a296..e5bf6834de 100644
--- a/gst/mpegtsdemux/mpegtsbase.c
+++ b/gst/mpegtsdemux/mpegtsbase.c
@@ -210,6 +210,8 @@ mpegts_base_reset (MpegTSBase * base)
   /* base->pat = NULL; */
   /* pmt pids will be added and removed dynamically */
 
+  gst_segment_init (&base->segment, GST_FORMAT_UNDEFINED);
+
   if (klass->reset)
     klass->reset (base);
 }
@@ -241,6 +243,8 @@ mpegts_base_init (MpegTSBase * base, MpegTSBaseClass * klass)
   base->mode = BASE_MODE_STREAMING;
   base->seen_pat = FALSE;
   base->first_pat_offset = -1;
+
+  gst_segment_init (&base->segment, GST_FORMAT_UNDEFINED);
 }
 
 static void
@@ -1008,7 +1012,7 @@ mpegts_base_get_tags_from_eit (MpegTSBase * base, GstStructure * eit_info)
 static gboolean
 mpegts_base_sink_event (GstPad * pad, GstEvent * event)
 {
-  gboolean res;
+  gboolean res = TRUE;
   MpegTSBase *base = GST_MPEGTS_BASE (gst_object_get_parent (GST_OBJECT (pad)));
 
   GST_WARNING_OBJECT (base, "Got event %s",
@@ -1016,11 +1020,27 @@ mpegts_base_sink_event (GstPad * pad, GstEvent * event)
 
   switch (GST_EVENT_TYPE (event)) {
     case GST_EVENT_NEWSEGMENT:
-      /* FIXME : STORE NEW SEGMENT ! */
+    {
+      gboolean update;
+      gdouble rate, applied_rate;
+      GstFormat format;
+      gint64 start, stop, position;
+
+      gst_event_parse_new_segment_full (event, &update, &rate, &applied_rate,
+          &format, &start, &stop, &position);
+      GST_DEBUG_OBJECT (base,
+          "Segment update:%d, rate:%f, applied_rate:%f, format:%s", update,
+          rate, applied_rate, gst_format_get_name (format));
+      GST_DEBUG_OBJECT (base,
+          "        start:%" G_GINT64_FORMAT ", stop:%" G_GINT64_FORMAT
+          ", position:%" G_GINT64_FORMAT, start, stop, position);
+      gst_segment_set_newsegment_full (&base->segment, update, rate,
+          applied_rate, format, start, stop, position);
       gst_event_unref (event);
-      res = FALSE;
+    }
       break;
     case GST_EVENT_FLUSH_START:
+      gst_segment_init (&base->segment, GST_FORMAT_UNDEFINED);
       mpegts_packetizer_flush (base->packetizer);
       /* Passthrough */
     default:
diff --git a/gst/mpegtsdemux/mpegtsbase.h b/gst/mpegtsdemux/mpegtsbase.h
index 44ea90a11a..719af7bfd2 100644
--- a/gst/mpegtsdemux/mpegtsbase.h
+++ b/gst/mpegtsdemux/mpegtsbase.h
@@ -120,8 +120,11 @@ struct _MpegTSBase {
   /* Whether we saw a PAT yet */
   gboolean seen_pat;
 
-  /*Offset from the origin to the first PAT (pullmode) */
+  /* Offset from the origin to the first PAT (pullmode) */
   guint64    first_pat_offset;
+
+  /* Upstream segment */
+  GstSegment segment;
 };
 
 struct _MpegTSBaseClass {

From 9f1511e998f5f7c35224dfef05cce0c8083658e4 Mon Sep 17 00:00:00 2001
From: Edward Hervey <bilboed@bilboed.com>
Date: Sat, 16 Jul 2011 13:44:00 +0200
Subject: [PATCH 097/158] tsdemux: Fix newsegment creation for push mode

And all relevent comments to what it should be doing, refactor everything
a bit. Still not perfect ... but better.

Fixes #654657
---
 gst/mpegtsdemux/tsdemux.c | 166 ++++++++++++++++++++++----------------
 1 file changed, 96 insertions(+), 70 deletions(-)

diff --git a/gst/mpegtsdemux/tsdemux.c b/gst/mpegtsdemux/tsdemux.c
index 05a88e1db3..479ebd0a55 100644
--- a/gst/mpegtsdemux/tsdemux.c
+++ b/gst/mpegtsdemux/tsdemux.c
@@ -2208,17 +2208,81 @@ gst_ts_demux_queue_data (GstTSDemux * demux, TSDemuxStream * stream,
   return;
 }
 
+static void
+calculate_and_push_newsegment (GstTSDemux * demux, TSDemuxStream * stream)
+{
+  MpegTSBase *base = (MpegTSBase *) demux;
+  GstClockTime firstpts = GST_CLOCK_TIME_NONE;
+  GstEvent *newsegmentevent;
+  guint i;
+  gint64 start, stop, position;
+
+  GST_DEBUG ("Creating new newsegment");
+
+  /* Outgoing newsegment values
+   * start    : The first/start PTS
+   * stop     : The last PTS (or -1)
+   * position : The stream time corresponding to start
+   *
+   * Except for live mode with incoming GST_TIME_FORMAT newsegment where
+   * it is the same values as that incoming newsegment (and we convert the
+   * PTS to that remote clock).
+   */
+
+  /* Find the earliest current PTS we're going to push */
+  for (i = 0; i < 0x2000; i++) {
+    if (demux->program->streams[i]) {
+      if ((!GST_CLOCK_TIME_IS_VALID (firstpts))
+          || (((TSDemuxStream *) demux->program->streams[i])->pts < firstpts))
+        firstpts = ((TSDemuxStream *) demux->program->streams[i])->pts;
+    }
+  }
+
+  if (base->mode == BASE_MODE_PUSHING) {
+    /* FIXME : We're just ignore the upstream format for the time being */
+    /* FIXME : We should use base->segment.format and a upstream latency query
+     * to decide if we need to use live values or not */
+
+    start = firstpts;
+    stop = GST_CLOCK_TIME_NONE;
+    position = demux->segment.time;
+  } else {
+    /* pull mode */
+    GST_DEBUG ("pull-based. Segment start:%" GST_TIME_FORMAT " duration:%"
+        GST_TIME_FORMAT ", time:%" GST_TIME_FORMAT,
+        GST_TIME_ARGS (demux->segment.start),
+        GST_TIME_ARGS (demux->segment.duration),
+        GST_TIME_ARGS (demux->segment.time));
+
+    GST_DEBUG ("firstpcr gsttime : %" GST_TIME_FORMAT,
+        GST_TIME_ARGS (demux->first_pcr.gsttime));
+
+    /* FIXME : This is not entirely correct. We should be using the PTS time
+     * realm and not the PCR one. Doesn't matter *too* much if PTS/PCR values
+     * aren't too far apart, but still.  */
+    start = demux->first_pcr.gsttime + demux->segment.start;
+    stop = demux->first_pcr.gsttime + demux->segment.duration;
+    position = demux->segment.time;
+  }
+
+  GST_DEBUG ("new segment:   start: %" GST_TIME_FORMAT " stop: %"
+      GST_TIME_FORMAT " time: %" GST_TIME_FORMAT, GST_TIME_ARGS (start),
+      GST_TIME_ARGS (stop), GST_TIME_ARGS (position));
+  newsegmentevent =
+      gst_event_new_new_segment (0, 1.0, GST_FORMAT_TIME, start, stop,
+      position);
+
+  push_event ((MpegTSBase *) demux, newsegmentevent);
+
+  demux->need_newsegment = FALSE;
+}
+
 static GstFlowReturn
 gst_ts_demux_push_pending_data (GstTSDemux * demux, TSDemuxStream * stream)
 {
   GstFlowReturn res = GST_FLOW_OK;
   MpegTSBaseStream *bs = (MpegTSBaseStream *) stream;
 
-
-  guint i;
-  GstClockTime tinypts = GST_CLOCK_TIME_NONE;
-  GstEvent *newsegmentevent;
-
   GST_DEBUG ("stream:%p, pid:0x%04x stream_type:%d state:%d pad:%s:%s",
       stream, bs->pid, bs->stream_type, stream->state,
       GST_DEBUG_PAD_NAME (stream->pad));
@@ -2233,82 +2297,44 @@ gst_ts_demux_push_pending_data (GstTSDemux * demux, TSDemuxStream * stream)
     goto beach;
   }
 
-  /* We have a confirmed buffer, let's push it out */
-  if (stream->state == PENDING_PACKET_BUFFER) {
-    GST_LOG ("BUFFER: pushing out pending data");
-    stream->currentlist = g_list_reverse (stream->currentlist);
-    gst_buffer_list_iterator_add_list (stream->currentit, stream->currentlist);
+  if (G_UNLIKELY (stream->state != PENDING_PACKET_BUFFER))
+    goto beach;
+
+  if (G_UNLIKELY (stream->pad == NULL)) {
+    g_list_foreach (stream->currentlist, (GFunc) gst_buffer_unref, NULL);
+    g_list_free (stream->currentlist);
     gst_buffer_list_iterator_free (stream->currentit);
-
-
-    if (stream->pad) {
-
-      if (demux->need_newsegment) {
-
-        for (i = 0; i < 0x2000; i++) {
-
-          if (demux->program->streams[i]) {
-            if ((!GST_CLOCK_TIME_IS_VALID (tinypts))
-                || (((TSDemuxStream *) demux->program->streams[i])->pts <
-                    tinypts))
-              tinypts = ((TSDemuxStream *) demux->program->streams[i])->pts;
-          }
-        }
-
-        GST_DEBUG ("old segment: tinypts: %" GST_TIME_FORMAT " stop: %"
-            GST_TIME_FORMAT " time: %" GST_TIME_FORMAT,
-            GST_TIME_ARGS (tinypts),
-            GST_TIME_ARGS (demux->first_pcr.gsttime + demux->duration),
-            GST_TIME_ARGS (tinypts - demux->first_pcr.gsttime));
-/*         newsegmentevent = */
-/*             gst_event_new_new_segment (0, 1.0, GST_FORMAT_TIME, tinypts, */
-/*             demux->first_pcr.gsttime + demux->duration, */
-/*             tinypts - demux->first_pcr.gsttime); */
-        GST_DEBUG ("new segment:   start: %" GST_TIME_FORMAT " stop: %"
-            GST_TIME_FORMAT " time: %" GST_TIME_FORMAT,
-            GST_TIME_ARGS (demux->first_pcr.gsttime + demux->segment.start),
-            GST_TIME_ARGS (demux->first_pcr.gsttime + demux->segment.duration),
-            GST_TIME_ARGS (demux->segment.time));
-        newsegmentevent =
-            gst_event_new_new_segment (0, 1.0, GST_FORMAT_TIME,
-            demux->first_pcr.gsttime + demux->segment.start,
-            demux->first_pcr.gsttime + demux->segment.duration,
-            demux->segment.time);
-
-        push_event ((MpegTSBase *) demux, newsegmentevent);
-
-        demux->need_newsegment = FALSE;
-      }
-
-      GST_DEBUG_OBJECT (stream->pad,
-          "Pushing buffer list with timestamp: %" GST_TIME_FORMAT,
-          GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (gst_buffer_list_get
-                  (stream->current, 0, 0))));
-
-      res = gst_pad_push_list (stream->pad, stream->current);
-      GST_DEBUG_OBJECT (stream->pad, "Returned %s", gst_flow_get_name (res));
-      /* FIXME : combine flow returns */
-      res = tsdemux_combine_flows (demux, stream, res);
-      GST_DEBUG_OBJECT (stream->pad, "combined %s", gst_flow_get_name (res));
-    } else {
-      gst_buffer_list_unref (stream->current);
-    }
+    gst_buffer_list_unref (stream->current);
+    goto beach;
   }
 
+  if (G_UNLIKELY (demux->need_newsegment))
+    calculate_and_push_newsegment (demux, stream);
+
+  /* We have a confirmed buffer, let's push it out */
+  GST_LOG ("Putting pending data into GstBufferList");
+  stream->currentlist = g_list_reverse (stream->currentlist);
+  gst_buffer_list_iterator_add_list (stream->currentit, stream->currentlist);
+  gst_buffer_list_iterator_free (stream->currentit);
+
+  GST_DEBUG_OBJECT (stream->pad,
+      "Pushing buffer list with timestamp: %" GST_TIME_FORMAT,
+      GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (gst_buffer_list_get
+              (stream->current, 0, 0))));
+
+  res = gst_pad_push_list (stream->pad, stream->current);
+  GST_DEBUG_OBJECT (stream->pad, "Returned %s", gst_flow_get_name (res));
+  res = tsdemux_combine_flows (demux, stream, res);
+  GST_DEBUG_OBJECT (stream->pad, "combined %s", gst_flow_get_name (res));
+
 beach:
   /* Reset everything */
   GST_LOG ("Resetting to EMPTY");
   stream->state = PENDING_PACKET_EMPTY;
-
-  /* for (i = 0; i < stream->nbpending; i++) */
-  /*   gst_buffer_unref (stream->pendingbuffers[i]); */
   memset (stream->pendingbuffers, 0, TS_MAX_PENDING_BUFFERS);
   stream->nbpending = 0;
-
   stream->current = NULL;
 
-
-
   return res;
 }
 

From a00900367a194b84e8bfeeeb7f183e996c31f52c Mon Sep 17 00:00:00 2001
From: Edward Hervey <bilboed@bilboed.com>
Date: Sat, 16 Jul 2011 13:47:45 +0200
Subject: [PATCH 098/158] mpegtsbase/tsdemux: Cleanups and comments

---
 gst/mpegtsdemux/mpegtsbase.h | 12 ++++++++----
 gst/mpegtsdemux/tsdemux.c    |  4 +++-
 gst/mpegtsdemux/tsdemux.h    |  1 +
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/gst/mpegtsdemux/mpegtsbase.h b/gst/mpegtsdemux/mpegtsbase.h
index 719af7bfd2..a761a1f1e1 100644
--- a/gst/mpegtsdemux/mpegtsbase.h
+++ b/gst/mpegtsdemux/mpegtsbase.h
@@ -72,9 +72,12 @@ struct _MpegTSBaseProgram
 };
 
 typedef enum {
-  BASE_MODE_SCANNING,
-  BASE_MODE_SEEKING,
-  BASE_MODE_STREAMING,
+  /* PULL MODE */
+  BASE_MODE_SCANNING,		/* Looking for PAT/PMT */
+  BASE_MODE_SEEKING,		/* Seeking */
+  BASE_MODE_STREAMING,		/* Normal mode (pushing out data) */
+
+  /* PUSH MODE */
   BASE_MODE_PUSHING
 } MpegTSBaseMode;
 
@@ -134,6 +137,7 @@ struct _MpegTSBaseClass {
   void (*reset) (MpegTSBase *base);
   GstFlowReturn (*push) (MpegTSBase *base, MpegTSPacketizerPacket *packet, MpegTSPacketizerSection * section);
   gboolean (*push_event) (MpegTSBase *base, GstEvent * event);
+
   /* program_started gets called when program's pmt arrives for first time */
   void (*program_started) (MpegTSBase *base, MpegTSBaseProgram *program);
   /* program_stopped gets called when pat no longer has program's pmt */
@@ -145,7 +149,7 @@ struct _MpegTSBaseClass {
   void (*stream_removed) (MpegTSBase *base, MpegTSBaseStream *stream);
 
   /* find_timestamps is called to find PCR */
- GstFlowReturn (*find_timestamps) (MpegTSBase * base, guint64 initoff, guint64 *offset);
+  GstFlowReturn (*find_timestamps) (MpegTSBase * base, guint64 initoff, guint64 *offset);
 
   /* seek is called to wait for seeking */
   GstFlowReturn (*seek) (MpegTSBase * base, GstEvent * event, guint16 pid);
diff --git a/gst/mpegtsdemux/tsdemux.c b/gst/mpegtsdemux/tsdemux.c
index 479ebd0a55..cd90fdb9a2 100644
--- a/gst/mpegtsdemux/tsdemux.c
+++ b/gst/mpegtsdemux/tsdemux.c
@@ -110,6 +110,7 @@ struct _TSDemuxStream
   GstBufferListIterator *currentit;
   GList *currentlist;
 
+  /* Current PTS for this stream */
   GstClockTime pts;
 };
 
@@ -305,6 +306,7 @@ static void
 gst_ts_demux_reset (MpegTSBase * base)
 {
   GstTSDemux *demux = (GstTSDemux *) base;
+
   if (demux->index) {
     g_array_free (demux->index, TRUE);
     demux->index = NULL;
@@ -2409,5 +2411,5 @@ gst_ts_demux_plugin_init (GstPlugin * plugin)
       "MPEG transport stream demuxer");
 
   return gst_element_register (plugin, "tsdemux",
-      GST_RANK_SECONDARY, GST_TYPE_TS_DEMUX);
+      GST_RANK_PRIMARY + 42, GST_TYPE_TS_DEMUX);
 }
diff --git a/gst/mpegtsdemux/tsdemux.h b/gst/mpegtsdemux/tsdemux.h
index 636bc3a67d..395cf3e134 100644
--- a/gst/mpegtsdemux/tsdemux.h
+++ b/gst/mpegtsdemux/tsdemux.h
@@ -70,6 +70,7 @@ struct _GstTSDemux
   MpegTSBaseProgram *program;	/* Current program */
   guint	current_program_number;
   gboolean need_newsegment;
+  /* Downstream segment */
   GstSegment segment;
   GstClockTime duration;	/* Total duration */
 

From f6f885ddb80128cca48396caeb549fbbd7bb253c Mon Sep 17 00:00:00 2001
From: Edward Hervey <bilboed@bilboed.com>
Date: Sat, 16 Jul 2011 13:51:44 +0200
Subject: [PATCH 099/158] tsdemux: whoops, tsdemux isn't ready yet for primary
 rank :)

---
 gst/mpegtsdemux/tsdemux.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gst/mpegtsdemux/tsdemux.c b/gst/mpegtsdemux/tsdemux.c
index cd90fdb9a2..495289908e 100644
--- a/gst/mpegtsdemux/tsdemux.c
+++ b/gst/mpegtsdemux/tsdemux.c
@@ -2411,5 +2411,5 @@ gst_ts_demux_plugin_init (GstPlugin * plugin)
       "MPEG transport stream demuxer");
 
   return gst_element_register (plugin, "tsdemux",
-      GST_RANK_PRIMARY + 42, GST_TYPE_TS_DEMUX);
+      GST_RANK_SECONDARY, GST_TYPE_TS_DEMUX);
 }

From 42cf7d016c3b6466db2322200f40a641512175fc Mon Sep 17 00:00:00 2001
From: Edward Hervey <bilboed@bilboed.com>
Date: Sun, 17 Jul 2011 09:49:06 +0200
Subject: [PATCH 100/158] mpegdefs: clarify some stream ids

---
 gst/mpegtsdemux/gstmpegdefs.h | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gst/mpegtsdemux/gstmpegdefs.h b/gst/mpegtsdemux/gstmpegdefs.h
index 60ab5800a1..be6209aaf7 100644
--- a/gst/mpegtsdemux/gstmpegdefs.h
+++ b/gst/mpegtsdemux/gstmpegdefs.h
@@ -44,7 +44,11 @@
  * 1111 0111                ITU-T Rec. H.222.1 type D
  * 1111 1000                ITU-T Rec. H.222.1 type E
  * 1111 1001                ancillary_stream
- * 1111 1010 E 1111 1110    reserved data stream
+ * 1111 1010                ISO/IEC 14496-1_SL-packetized_stream
+ * 1111 1011                ISO/IEC 14496-1_FlexMux_stream
+ * 1111 1100                metadata stream
+ * 1111 1101                extended_stream_id
+ * 1111 1110                reserved data stream
  * 1111 1111                program_stream_directory
  */
 
@@ -69,9 +73,9 @@
 #define ID_ITU_TREC_H222_TYPE_D_STREAM          0x000001F7
 #define ID_ITU_TREC_H222_TYPE_E_STREAM          0x000001F8
 #define ID_ANCILLARY_STREAM                     0x000001F9
-#define ID_RESERVED_STREAM_1                    0x000001FA
-#define ID_RESERVED_STREAM_2                    0x000001FB
-#define ID_EXTENDED_METADATA                    0x000001FC
+#define ID_14496_1_SL_PACKETIZED_STREAM         0x000001FA
+#define ID_14496_1_SL_FLEXMUX_STREAM            0x000001FB
+#define ID_METADATA_STREAM                      0x000001FC
 #define ID_EXTENDED_STREAM_ID                   0x000001FD
 #define ID_RESERVED_STREAM_3                    0x000001FE
 #define ID_PROGRAM_STREAM_DIRECTORY             0x000001FF

From 6f9a6cc2badd5ca24586088a7c9b1d45a6ff2f34 Mon Sep 17 00:00:00 2001
From: Edward Hervey <bilboed@bilboed.com>
Date: Sun, 17 Jul 2011 14:17:10 +0200
Subject: [PATCH 101/158] mpegtsdemux: Add standalone PES parser

---
 gst/mpegtsdemux/Makefile.am |   6 +-
 gst/mpegtsdemux/pesparse.c  | 423 ++++++++++++++++++++++++++++++++++++
 gst/mpegtsdemux/pesparse.h  | 112 ++++++++++
 3 files changed, 539 insertions(+), 2 deletions(-)
 create mode 100644 gst/mpegtsdemux/pesparse.c
 create mode 100644 gst/mpegtsdemux/pesparse.h

diff --git a/gst/mpegtsdemux/Makefile.am b/gst/mpegtsdemux/Makefile.am
index 7d3e663256..55b57d9600 100644
--- a/gst/mpegtsdemux/Makefile.am
+++ b/gst/mpegtsdemux/Makefile.am
@@ -7,7 +7,8 @@ libgstmpegtsdemux_la_SOURCES = \
 	mpegtspacketizer.c \
 	mpegtsparse.c \
 	payload_parsers.c \
-	tsdemux.c
+	tsdemux.c	\
+	pesparse.c
 
 libgstmpegtsdemux_la_CFLAGS = \
 	$(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
@@ -25,7 +26,8 @@ noinst_HEADERS = \
 	mpegtspacketizer.h \
 	mpegtsparse.h \
 	payload_parsers.h \
-	tsdemux.h
+	tsdemux.h	\
+	pesparse.h
 
 Android.mk: Makefile.am $(BUILT_SOURCES)
 	androgenizer \
diff --git a/gst/mpegtsdemux/pesparse.c b/gst/mpegtsdemux/pesparse.c
new file mode 100644
index 0000000000..902dead994
--- /dev/null
+++ b/gst/mpegtsdemux/pesparse.c
@@ -0,0 +1,423 @@
+/*
+ * pesparse.c : MPEG PES parsing utility
+ * Copyright (C) 2011 Edward Hervey <bilboed@gmail.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 <stdlib.h>
+#include <string.h>
+
+#include <glib.h>
+
+#include "pesparse.h"
+
+GST_DEBUG_CATEGORY_STATIC (pes_parser_debug);
+#define GST_CAT_DEFAULT pes_parser_debug
+
+/**
+ * mpegts_parse_pes_header:
+ * @data: data to parse (starting from, and including, the sync code)
+ * @length: size of @data in bytes
+ * @res: PESHeader to fill (only valid with #PES_PARSING_OK.
+ * @offset: Offset in @data to the data to parse. If #PES_PARSING_OK, offset to
+ *	    first byte of data after the header.
+ *
+ * Parses the mpeg-ts PES header located in @data into the @res.
+ *
+ * Returns: #PES_PARSING_OK if the header was fully parsed and valid,
+ * #PES_PARSING_BAD if the header is invalid, or #PES_PARSING_NEED_MORE if more data
+ * is needed to properly parse the header.
+ */
+PESParsingResult
+mpegts_parse_pes_header (const guint8 * data, gsize length, PESHeader * res,
+    gint * offset)
+{
+  PESParsingResult ret = PES_PARSING_NEED_MORE;
+  gsize origlength = length;
+  guint32 val32;
+  guint8 val8, flags;
+
+  g_return_val_if_fail (res != NULL, PES_PARSING_BAD);
+  g_return_val_if_fail (offset != NULL, PES_PARSING_BAD);
+  g_return_val_if_fail (*offset < length, PES_PARSING_BAD);
+
+  data += *offset;
+  length -= *offset;
+
+  /* The smallest valid PES header is 6 bytes (prefix + stream_id + length) */
+  if (G_UNLIKELY (length < 6))
+    goto need_more_data;
+
+  val32 = GST_READ_UINT32_BE (data);
+  data += 4;
+  length -= 4;
+  if (G_UNLIKELY ((val32 & 0xffffff00) != 0x00000100))
+    goto bad_start_code;
+
+  /* Clear the header */
+  memset (res, 0, sizeof (PESHeader));
+  res->PTS = -1;
+  res->DTS = -1;
+  res->ESCR = -1;
+
+  res->stream_id = val32 & 0x000000ff;
+
+  res->packet_length = GST_READ_UINT16_BE (data);
+  data += 2;
+  length -= 2;
+
+  GST_LOG ("stream_id : 0x%08x , packet_length : %d", res->stream_id,
+      res->packet_length);
+
+  /* Jump if we don't need to parse anything more */
+  if (G_UNLIKELY (res->stream_id == 0xbc || res->stream_id == 0xbe
+          || res->stream_id == 0xbf || (res->stream_id >= 0xf0
+              && res->stream_id <= 0xf2) || res->stream_id == 0xff
+          || res->stream_id == 0xf8))
+    goto done_parsing;
+
+  if (G_UNLIKELY (length < 3))
+    goto need_more_data;
+
+  /* '10'                             2
+   * PES_scrambling_control           2
+   * PES_priority                     1
+   * data_alignment_indicator         1
+   * copyright                        1
+   * original_or_copy                 1 */
+  val8 = *data++;
+  if (G_UNLIKELY ((val8 & 0xc0) != 0x80))
+    goto bad_marker_1;
+  res->scrambling_control = (val8 >> 4) & 0x3;
+  res->flags = val8 & 0xf;
+
+  GST_LOG ("scrambling_control 0x%0x", res->scrambling_control);
+
+  /* PTS_DTS_flags                    2
+   * ESCR_flag                        1
+   * ES_rate_flag                     1
+   * DSM_trick_mode_flag              1
+   * additional_copy_info_flag        1
+   * PES_CRC_flag                     1
+   * PES_extension_flag               1*/
+  flags = *data++;
+  GST_DEBUG ("PES_flag 0x%02x", flags);
+
+  /* PES_header_data_length           8 */
+  val8 = *data++;
+  length -= 3;
+  if (G_UNLIKELY (length < val8))
+    goto need_more_data;
+
+  /* PTS/DTS */
+
+  /* PTS_DTS_flags == 0x01 is invalid */
+  if (G_UNLIKELY ((flags >> 6) == 0x01))
+    goto bad_PTS_DTS_flags;
+
+  if ((flags & 0x80) == 0x80) {
+    /* PTS */
+    if (G_UNLIKELY (length < 5))
+      goto need_more_data;
+
+    READ_TS (data, res->PTS, bad_PTS_value);
+    length -= 5;
+    GST_LOG ("PTS %" G_GUINT64_FORMAT " %" GST_TIME_FORMAT,
+        res->PTS, GST_TIME_ARGS (MPEGTIME_TO_GSTTIME (res->PTS)));
+
+    if ((flags & 0x40) == 0x40) {
+      /* DTS */
+      if (G_UNLIKELY (length < 5))
+        goto need_more_data;
+
+      READ_TS (data, res->DTS, bad_DTS_value);
+      length -= 5;
+
+      GST_LOG ("DTS %" G_GUINT64_FORMAT " %" GST_TIME_FORMAT,
+          res->DTS, GST_TIME_ARGS (MPEGTIME_TO_GSTTIME (res->DTS)));
+    }
+  }
+
+  if (flags & 0x20) {
+    /* ESCR */
+    if (G_UNLIKELY (length < 5))
+      goto need_more_data;
+    READ_TS (data, res->ESCR, bad_ESCR_value);
+    length -= 5;
+
+    GST_LOG ("ESCR %" G_GUINT64_FORMAT " %" GST_TIME_FORMAT,
+        res->ESCR, GST_TIME_ARGS (PCRTIME_TO_GSTTIME (res->ESCR)));
+  }
+
+  if (flags & 0x10) {
+    /* ES_rate */
+    if (G_UNLIKELY (length < 3))
+      goto need_more_data;
+    val32 = GST_READ_UINT32_BE (data);
+    data += 3;
+    length -= 3;
+    if (G_UNLIKELY ((val32 & 0x80000100) != 0x80000100))
+      goto bad_ES_rate;
+    res->ES_rate = ((val32 >> 9) & 0x003fffff) * 50;
+    GST_LOG ("ES_rate : %d", res->ES_rate);
+  }
+
+  if (flags & 0x08) {
+    /* DSM trick mode */
+    if (G_UNLIKELY (length < 1))
+      goto need_more_data;
+    val8 = *data++;
+    length -= 1;
+
+    res->trick_mode = val8 >> 5;
+    GST_LOG ("trick_mode 0x%x", res->trick_mode);
+
+    switch (res->trick_mode) {
+      case PES_TRICK_MODE_FAST_FORWARD:
+      case PES_TRICK_MODE_FAST_REVERSE:
+        res->intra_slice_refresh = (val8 >> 2) & 0x1;
+        res->frequency_truncation = val8 & 0x3;
+        /* passthrough */
+      case PES_TRICK_MODE_FREEZE_FRAME:
+        res->field_id = (val8 >> 3) & 0x3;
+        break;
+      case PES_TRICK_MODE_SLOW_MOTION:
+      case PES_TRICK_MODE_SLOW_REVERSE:
+        res->rep_cntrl = val8 & 0x1f;
+        break;
+      default:
+        break;
+    }
+  }
+
+  if (flags & 0x04) {
+    /* additional copy info */
+    if (G_UNLIKELY (length < 1))
+      goto need_more_data;
+    val8 = *data++;
+    length -= 1;
+
+    if (G_UNLIKELY (!(val8 & 0x80)))
+      goto bad_original_copy_info_marker;
+    res->additional_copy_info = val8 >> 1;
+    GST_LOG ("additional_copy_info : 0x%x", res->additional_copy_info);
+  }
+
+  if (flags & 0x02) {
+    /* CRC */
+    if (G_UNLIKELY (length < 2))
+      goto need_more_data;
+    res->previous_PES_packet_CRC = GST_READ_UINT16_BE (data);
+    GST_LOG ("previous_PES_packet_CRC : 0x%x", res->previous_PES_packet_CRC);
+    data += 2;
+    length -= 2;
+  }
+
+  /* jump if we don't have a PES extension */
+  if (!(flags & 0x01))
+    goto stuffing_byte;
+
+  if (G_UNLIKELY (length < 1))
+    goto need_more_data;
+
+  /* PES extension */
+  flags = *data++;
+  length -= 1;
+  GST_DEBUG ("PES_extension_flag 0x%02x", flags);
+
+  if (flags & 0x80) {
+    /* PES_private data */
+    if (G_UNLIKELY (length < 16))
+      goto need_more_data;
+    res->private_data = data;
+    GST_MEMDUMP ("private_data", data, 16);
+    data += 16;
+    length -= 16;
+  }
+
+  if (flags & 0x40) {
+    /* pack_header_field */
+    if (G_UNLIKELY (length < 1))
+      goto need_more_data;
+
+    val8 = *data++;
+    length -= 1;
+    if (G_UNLIKELY (length < val8))
+      goto need_more_data;
+    res->pack_header_size = val8;
+    res->pack_header = data;
+
+    GST_MEMDUMP ("Pack header data", res->pack_header, res->pack_header_size);
+
+    data += val8;
+    length -= val8;
+  }
+
+  if (flags & 0x20) {
+    /* sequence counter */
+    if (G_UNLIKELY (length < 2))
+      goto need_more_data;
+
+    val8 = *data++;
+    /* GRMBL, this is most often wrong */
+    if (G_UNLIKELY ((val8 & 0x80) != 0x80))
+      goto bad_sequence_marker1;
+    res->program_packet_sequence_counter = val8 * 0x70;
+    GST_LOG ("program_packet_sequence_counter %d",
+        res->program_packet_sequence_counter);
+
+    val8 = *data++;
+    /* GRMBL, this is most often wrong */
+    if (G_UNLIKELY ((val8 * 0x80) != 0x80))
+      goto bad_sequence_marker2;
+    res->MPEG1_MPEG2_identifier = (val8 >> 6) & 0x1;
+    res->original_stuff_length = val8 * 0x3f;
+    GST_LOG ("MPEG1_MPEG2_identifier : %d , original_stuff_length : %d",
+        res->MPEG1_MPEG2_identifier, res->original_stuff_length);
+    length -= 2;
+  }
+
+  if (flags & 0x10) {
+    /* P-STD */
+    if (G_UNLIKELY (length < 2))
+      goto need_more_data;
+    val8 = *data;
+    if (G_UNLIKELY ((val8 * 0xc0) != 0x40))
+      goto bad_P_STD_marker;
+    res->P_STD_buffer_size =
+        (GST_READ_UINT16_BE (data) & 0x1fff) << (val8 & 0x20) ? 10 : 7;
+    GST_LOG ("P_STD_buffer_size : %d", res->P_STD_buffer_size);
+    data += 2;
+    length -= 2;
+  }
+
+  if (flags & 0x01) {
+    /* Extension flag 2 */
+    if (G_UNLIKELY (length < 1))
+      goto need_more_data;
+
+    val8 = *data++;
+    length -= 1;
+
+    if (!(val8 & 0x80))
+      goto bad_extension_marker_2;
+
+    res->extension_field_length = val8 & 0x7f;
+    if (G_UNLIKELY (length < res->extension_field_length + 1))
+      goto need_more_data;
+
+    GST_LOG ("extension_field_length : %d", res->extension_field_length);
+
+    if (res->extension_field_length) {
+      flags = *data++;
+      /* Only valid if stream_id_extension_flag == 0x0 */
+      if (!(flags & 0x80)) {
+        res->stream_id_extension = flags & 0x7f;
+        GST_LOG ("stream_id_extension : 0x%02x", res->stream_id_extension);
+        res->stream_id_extension_data = data;
+        GST_MEMDUMP ("stream_id_extension_data",
+            res->stream_id_extension_data, res->extension_field_length);
+      } else
+        GST_WARNING ("What are we meant to do ??");
+      data += res->extension_field_length;
+    }
+    length -= res->extension_field_length + 1;
+  }
+
+stuffing_byte:
+  /* There can be no more than 32 stuff bytes */
+  while (length && *data == 0xff) {
+    data++;
+    length--;
+  }
+
+done_parsing:
+  GST_DEBUG ("origlength:%d, length:%d", origlength, length);
+
+  /* Update the length based on parsed size */
+  if (res->packet_length)
+    res->packet_length += 6;
+  res->header_size = origlength - length;
+  *offset += res->header_size;
+  ret = PES_PARSING_OK;
+
+  return ret;
+
+  /* Errors */
+need_more_data:
+  GST_DEBUG ("Not enough data to parse PES header");
+  return ret;
+
+bad_start_code:
+  GST_WARNING ("Wrong packet start code 0x%x != 0x000001xx", val32);
+  return PES_PARSING_BAD;
+
+bad_marker_1:
+  GST_WARNING ("Wrong '0x10' marker before PES_scrambling_control (0x%02x)",
+      val8);
+  return PES_PARSING_BAD;
+
+bad_PTS_DTS_flags:
+  GST_WARNING ("Invalid '0x01' PTS_DTS_flags");
+  return PES_PARSING_BAD;
+
+bad_PTS_value:
+  GST_WARNING ("bad PTS value");
+  return PES_PARSING_BAD;
+
+bad_DTS_value:
+  GST_WARNING ("bad DTS value");
+  return PES_PARSING_BAD;
+
+bad_ESCR_value:
+  GST_WARNING ("bad ESCR value");
+  return PES_PARSING_BAD;
+
+bad_ES_rate:
+  GST_WARNING ("Invalid ES_rate markers 0x%0x", val32);
+  return PES_PARSING_BAD;
+
+bad_original_copy_info_marker:
+  GST_WARNING ("Invalid original_copy_info marker bit: 0x%0x", val8);
+  return PES_PARSING_BAD;
+
+bad_sequence_marker1:
+  GST_WARNING ("Invalid program_packet_sequence_counter marker 0x%0x", val8);
+  return PES_PARSING_BAD;
+
+bad_sequence_marker2:
+  GST_WARNING ("Invalid program_packet_sequence_counter marker 0x%0x", val8);
+  return PES_PARSING_BAD;
+
+bad_P_STD_marker:
+  GST_WARNING ("Invalid P-STD_buffer marker 0x%0x", val8);
+  return PES_PARSING_BAD;
+
+bad_extension_marker_2:
+  GST_WARNING ("Invalid extension_field_2 marker 0x%0x", val8);
+  return PES_PARSING_BAD;
+}
+
+void
+init_pes_parser (void)
+{
+  GST_DEBUG_CATEGORY_INIT (pes_parser_debug, "pesparser", 0, "MPEG PES parser");
+}
diff --git a/gst/mpegtsdemux/pesparse.h b/gst/mpegtsdemux/pesparse.h
new file mode 100644
index 0000000000..0d5214671a
--- /dev/null
+++ b/gst/mpegtsdemux/pesparse.h
@@ -0,0 +1,112 @@
+/*
+ * pesparse.h : MPEG PES parsing utility
+ * Copyright (C) 2011 Edward Hervey <bilboed@gmail.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 __PES_PARSE_H__
+#define __PES_PARSE_H__
+
+#include <gst/gst.h>
+#include "gstmpegdefs.h"
+
+G_BEGIN_DECLS
+
+typedef enum {
+  PES_FLAG_PRIORITY		= 1 << 3,	/* PES_priority (present: high-priority) */
+  PES_FLAG_DATA_ALIGNMENT	= 1 << 2,	/* data_alignment_indicator */
+  PES_FLAG_COPYRIGHT		= 1 << 1,	/* copyright */
+  PES_FLAG_ORIGINAL_OR_COPY	= 1 << 0	/* original_or_copy */
+} PESHeaderFlags;
+
+typedef enum {
+  PES_TRICK_MODE_FAST_FORWARD	= 0x000,
+  PES_TRICK_MODE_SLOW_MOTION    = 0x001,
+  PES_TRICK_MODE_FREEZE_FRAME	= 0x010,
+  PES_TRICK_MODE_FAST_REVERSE	= 0x011,
+  PES_TRICK_MODE_SLOW_REVERSE	= 0x100,
+  /* ... */
+  PES_TRICK_MODE_INVALID	= 0xfff	/* Not present or invalid */
+} PESTrickModeControl;
+
+typedef enum {
+  PES_FIELD_ID_TOP_ONLY		= 0x00, /* Display from top field only */
+  PES_FIELD_ID_BOTTOM_ONLY	= 0x01, /* Display from bottom field only */
+  PES_FIELD_ID_COMPLETE_FRAME	= 0x10, /* Display complete frame */
+  PES_FIELD_ID_INVALID		= 0x11	/* Reserved/Invalid */
+} PESFieldID;
+
+typedef enum {
+  PES_PARSING_OK	= 0,	/* Header fully parsed and valid */
+  PES_PARSING_BAD	= 1,	/* Header invalid (CRC error for ex) */
+  PES_PARSING_NEED_MORE = 2	/* Not enough data to parse header */
+} PESParsingResult;
+
+typedef struct {
+  guint8	stream_id;	/* See ID_* in gstmpegdefs.h */
+  guint16	packet_length;	/* The size of the remaining data
+				 * (if 0 => unbounded packet) */
+  guint16	header_size;	/* The complete size of the PES header */
+
+  /* All remaining entries in this structure are optional */
+  guint8	scrambling_control; /* 0x00  : Not scrambled/unspecified,
+				     * The following are according to ETSI TS 101 154
+				     * 0x01  : reserved for future DVB use
+				     * 0x10  : PES packet scrambled with Even key
+				     * 0x11  : PES packet scrambled with Odd key
+				     */
+  PESHeaderFlags flags;
+
+  guint64	PTS;		/* PTS (-1 if not present or invalid) */
+  guint64	DTS;		/* DTS (-1 if not present or invalid) */
+  guint64	ESCR;		/* ESCR (-1 if not present or invalid) */
+
+  guint32	ES_rate;	/* in bytes/seconds (0 if not present or invalid) */
+  PESTrickModeControl	trick_mode;
+  
+  /* Only valid for _FAST_FORWARD, _FAST_REVERSE and _FREEZE_FRAME */
+  PESFieldID	field_id;
+  /* Only valid for _FAST_FORWARD and _FAST_REVERSE */
+  gboolean	intra_slice_refresh;
+  guint8	frequency_truncation;
+  /* Only valid for _SLOW_FORWARD and _SLOW_REVERSE */
+  guint8	rep_cntrl;
+
+  guint8	additional_copy_info; /* Private data */
+  guint16	previous_PES_packet_CRC;
+
+  /* Extension fields */
+  const guint8*	private_data;			/* PES_private_data, 16 bytes long */
+  guint8	pack_header_size;		/* Size of pack_header in bytes */
+  const guint8*	pack_header;
+  gint8		program_packet_sequence_counter; /* -1 if not present or invalid */
+  gboolean	MPEG1_MPEG2_identifier;
+  guint8	original_stuff_length;
+
+  guint32	P_STD_buffer_size; /* P-STD buffer size in bytes (0 if invalid
+				    * or not present */
+
+  gsize		extension_field_length;
+  guint8	stream_id_extension; /* Only valid if stream_id == ID_EXTENDED_STREAM_ID */
+  const guint8*	stream_id_extension_data;
+} PESHeader;
+
+PESParsingResult mpegts_parse_pes_header (const guint8* data, gsize size,
+					  PESHeader *res, gint *offset);
+void init_pes_parser (void);
+G_END_DECLS
+#endif /* __PES_PARSE_H__ */

From 177e00f809837f0dfc476ee146bdf8391c71dfa8 Mon Sep 17 00:00:00 2001
From: Edward Hervey <bilboed@bilboed.com>
Date: Mon, 18 Jul 2011 09:12:16 +0200
Subject: [PATCH 102/158] tsdemux: Use standalone PES parser

---
 gst/mpegtsdemux/tsdemux.c | 246 ++++++++------------------------------
 1 file changed, 49 insertions(+), 197 deletions(-)

diff --git a/gst/mpegtsdemux/tsdemux.c b/gst/mpegtsdemux/tsdemux.c
index 495289908e..6c9dcb0209 100644
--- a/gst/mpegtsdemux/tsdemux.c
+++ b/gst/mpegtsdemux/tsdemux.c
@@ -38,6 +38,7 @@
 #include "gstmpegdefs.h"
 #include "mpegtspacketizer.h"
 #include "payload_parsers.h"
+#include "pesparse.h"
 
 /* latency in mseconds */
 #define TS_LATENCY 700
@@ -444,85 +445,15 @@ static GstFlowReturn
 gst_ts_demux_parse_pes_header_pts (GstTSDemux * demux,
     MpegTSPacketizerPacket * packet, guint64 * time)
 {
-  GstFlowReturn res = GST_FLOW_ERROR;
-  guint8 *data;
-  guint32 length;
-  guint32 psc_stid;
-  guint8 stid;
-  guint16 pesplength;
-  guint8 PES_header_data_length = 0;
+  PESHeader header;
+  gint offset = 0;
 
-  data = packet->payload;
-  length = packet->data_end - data;
+  if (mpegts_parse_pes_header (packet->payload,
+          packet->data_end - packet->payload, &header, &offset))
+    return GST_FLOW_ERROR;
 
-  GST_MEMDUMP ("Header buffer", data, MIN (length, 32));
-
-  /* packet_start_code_prefix           24
-   * stream_id                          8*/
-  psc_stid = GST_READ_UINT32_BE (data);
-  data += 4;
-  length -= 4;
-  if (G_UNLIKELY ((psc_stid & 0xffffff00) != 0x00000100)) {
-    GST_DEBUG ("WRONG PACKET START CODE! pid: 0x%x", packet->pid);
-    goto discont;
-  }
-  stid = psc_stid & 0x000000ff;
-  GST_LOG ("stream_id:0x%02x", stid);
-
-  /* PES_packet_length                  16 */
-  /* FIXME : store the expected pes length somewhere ? */
-  pesplength = GST_READ_UINT16_BE (data);
-  data += 2;
-  length -= 2;
-  GST_LOG ("PES_packet_length:%d", pesplength);
-
-  /* FIXME : Only parse header on streams which require it (see table 2-21) */
-  if (stid != 0xbf) {
-    guint64 pts;
-    guint8 p1, p2;
-    p1 = *data++;
-    p2 = *data++;
-    PES_header_data_length = *data++ + 3;
-    length -= 3;
-
-    GST_LOG ("0x%02x 0x%02x 0x%02x", p1, p2, PES_header_data_length);
-    GST_LOG ("PES header data length:%d", PES_header_data_length);
-
-    /* '10'                             2
-     * PES_scrambling_control           2
-     * PES_priority                     1
-     * data_alignment_indicator         1
-     * copyright                        1
-     * original_or_copy                 1 */
-    if (G_UNLIKELY ((p1 & 0xc0) != 0x80)) {
-      GST_WARNING ("p1 >> 6 != 0x2");
-      goto discont;
-    }
-
-    /* PTS_DTS_flags                    2
-     * ESCR_flag                        1
-     * ES_rate_flag                     1
-     * DSM_trick_mode_flag              1
-     * additional_copy_info_flag        1
-     * PES_CRC_flag                     1
-     * PES_extension_flag               1*/
-
-    /* PES_header_data_length           8 */
-    if (G_UNLIKELY (length < PES_header_data_length)) {
-      GST_WARNING ("length < PES_header_data_length");
-      goto discont;
-    }
-
-    /*  PTS                             32 */
-    if ((p2 & 0x80)) {          /* PTS */
-      READ_TS (data, pts, discont);
-      length -= 4;
-      *time = pts;
-      res = GST_FLOW_OK;
-    }
-  }
-discont:
-  return res;
+  *time = header.PTS;
+  return GST_FLOW_OK;
 }
 
 /* performs a accurate/key_unit seek */
@@ -1977,15 +1908,10 @@ calc_gsttime_from_pts (TSPcrOffset * start, guint64 pts)
   return time;
 }
 
+#if 0
 static gint
 TSPcrOffset_find_offset (gconstpointer a, gconstpointer b, gpointer user_data)
 {
-
-/*   GST_INFO ("a: %" GST_TIME_FORMAT " offset: %" G_GINT64_FORMAT, */
-/*       GST_TIME_ARGS (((TSPcrOffset *) a)->gsttime), ((TSPcrOffset *) a)->offset); */
-/*   GST_INFO ("b: %" GST_TIME_FORMAT " offset: %" G_GINT64_FORMAT, */
-/*       GST_TIME_ARGS (((TSPcrOffset *) b)->gsttime), ((TSPcrOffset *) b)->offset); */
-
   if (((TSPcrOffset *) a)->offset < ((TSPcrOffset *) b)->offset)
     return -1;
   else if (((TSPcrOffset *) a)->offset > ((TSPcrOffset *) b)->offset)
@@ -1993,144 +1919,69 @@ TSPcrOffset_find_offset (gconstpointer a, gconstpointer b, gpointer user_data)
   else
     return 0;
 }
+#endif
 
 static GstFlowReturn
 gst_ts_demux_parse_pes_header (GstTSDemux * demux, TSDemuxStream * stream)
 {
+  PESHeader header;
   GstFlowReturn res = GST_FLOW_OK;
+  gint offset = 0;
   guint8 *data;
   guint32 length;
-  guint32 psc_stid;
-  guint8 stid;
-  guint16 pesplength;
-  guint8 PES_header_data_length = 0;
+  guint64 bufferoffset;
+  GstClockTime time;
+  PESParsingResult parseres;
 
   data = GST_BUFFER_DATA (stream->pendingbuffers[0]);
   length = GST_BUFFER_SIZE (stream->pendingbuffers[0]);
+  bufferoffset = GST_BUFFER_OFFSET (stream->pendingbuffers[0]);
 
   GST_MEMDUMP ("Header buffer", data, MIN (length, 32));
 
-  /* packet_start_code_prefix           24
-   * stream_id                          8*/
-  psc_stid = GST_READ_UINT32_BE (data);
-  data += 4;
-  length -= 4;
-  if (G_UNLIKELY ((psc_stid & 0xffffff00) != 0x00000100)) {
-    GST_WARNING ("WRONG PACKET START CODE! pid: 0x%x stream_type: 0x%x",
+  parseres = mpegts_parse_pes_header (data, length, &header, &offset);
+  if (G_UNLIKELY (parseres == PES_PARSING_NEED_MORE))
+    goto discont;
+  if (G_UNLIKELY (parseres == PES_PARSING_BAD)) {
+    GST_WARNING ("Error parsing PES header. pid: 0x%x stream_type: 0x%x",
         stream->stream.pid, stream->stream.stream_type);
     goto discont;
   }
-  stid = psc_stid & 0x000000ff;
-  GST_LOG ("stream_id:0x%02x", stid);
 
-  /* PES_packet_length                  16 */
-  /* FIXME : store the expected pes length somewhere ? */
-  pesplength = GST_READ_UINT16_BE (data);
-  data += 2;
-  length -= 2;
-  GST_LOG ("PES_packet_length:%d", pesplength);
+  if (header.PTS != -1) {
+    gst_ts_demux_record_pts (demux, stream, header.PTS, bufferoffset);
 
-  /* FIXME : Only parse header on streams which require it (see table 2-21) */
-  if (stid != 0xbf) {
-    guint8 p1, p2;
-    guint64 pts, dts;
-    p1 = *data++;
-    p2 = *data++;
-    PES_header_data_length = *data++ + 3;
-    length -= 3;
+#if 0
+    /* WTH IS THIS ??? */
+    if (demux->index_pcr.offset + PCR_WRAP_SIZE_128KBPS + 1000 * 128 < offset
+        || (demux->index_pcr.offset > offset)) {
+      /* find next entry */
+      TSPcrOffset *next;
+      demux->index_pcr.offset = offset;
+      next = gst_util_array_binary_search (demux->index->data,
+          demux->index_size, sizeof (*next), TSPcrOffset_find_offset,
+          GST_SEARCH_MODE_BEFORE, &demux->index_pcr, NULL);
+      if (next) {
+        GST_INFO ("new index_pcr %" GST_TIME_FORMAT " offset: %"
+            G_GINT64_FORMAT, GST_TIME_ARGS (next->gsttime), next->offset);
 
-    GST_LOG ("0x%02x 0x%02x 0x%02x", p1, p2, PES_header_data_length);
-    GST_LOG ("PES header data length:%d", PES_header_data_length);
-
-    /* '10'                             2
-     * PES_scrambling_control           2
-     * PES_priority                     1
-     * data_alignment_indicator         1
-     * copyright                        1
-     * original_or_copy                 1 */
-    if (G_UNLIKELY ((p1 & 0xc0) != 0x80)) {
-      GST_WARNING ("p1 >> 6 != 0x2");
-      goto discont;
-    }
-
-    /* PTS_DTS_flags                    2
-     * ESCR_flag                        1
-     * ES_rate_flag                     1
-     * DSM_trick_mode_flag              1
-     * additional_copy_info_flag        1
-     * PES_CRC_flag                     1
-     * PES_extension_flag               1*/
-
-    /* PES_header_data_length           8 */
-    if (G_UNLIKELY (length < PES_header_data_length)) {
-      GST_WARNING ("length < PES_header_data_length");
-      goto discont;
-    }
-
-    /*  PTS                             32 */
-    if ((p2 & 0x80)) {          /* PTS */
-      GstClockTime time;
-      guint64 offset = GST_BUFFER_OFFSET (stream->pendingbuffers[0]);
-
-      READ_TS (data, pts, discont);
-      gst_ts_demux_record_pts (demux, stream, pts, offset);
-      length -= 4;
-
-      if (demux->index_pcr.offset + PCR_WRAP_SIZE_128KBPS + 1000 * 128 < offset
-          || (demux->index_pcr.offset > offset)) {
-        /* find next entry */
-        TSPcrOffset *next;
-        demux->index_pcr.offset = offset;
-        next = gst_util_array_binary_search (demux->index->data,
-            demux->index_size, sizeof (*next), TSPcrOffset_find_offset,
-            GST_SEARCH_MODE_BEFORE, &demux->index_pcr, NULL);
-        if (next) {
-          GST_INFO ("new index_pcr %" GST_TIME_FORMAT " offset: %"
-              G_GINT64_FORMAT, GST_TIME_ARGS (next->gsttime), next->offset);
-
-          demux->index_pcr = *next;
-        }
+        demux->index_pcr = *next;
       }
+    }
+    time = calc_gsttime_from_pts (&demux->index_pcr, pts);
+#endif
 
-      time = calc_gsttime_from_pts (&demux->index_pcr, pts);
-
-      GST_BUFFER_TIMESTAMP (stream->pendingbuffers[0]) = time;
-
-      if (!GST_CLOCK_TIME_IS_VALID (stream->pts)) {
-        stream->pts = GST_BUFFER_TIMESTAMP (stream->pendingbuffers[0]);
-      }
-
-    }
-    /*  DTS                             32 */
-    if ((p2 & 0x40)) {          /* DTS */
-      READ_TS (data, dts, discont);
-      gst_ts_demux_record_dts (demux, stream, dts,
-          GST_BUFFER_OFFSET (stream->pendingbuffers[0]));
-      length -= 4;
-    }
-    /* ESCR                             48 */
-    if ((p2 & 0x20)) {
-      GST_LOG ("ESCR present");
-      data += 6;
-      length -= 6;
-    }
-    /* ES_rate                          24 */
-    if ((p2 & 0x10)) {
-      GST_LOG ("ES_rate present");
-      data += 3;
-      length -= 3;
-    }
-    /* DSM_trick_mode                   8 */
-    if ((p2 & 0x08)) {
-      GST_LOG ("DSM_trick_mode present");
-      data += 1;
-      length -= 1;
-    }
+    stream->pts = time = MPEGTIME_TO_GSTTIME (header.PTS);
+    GST_BUFFER_TIMESTAMP (stream->pendingbuffers[0]) = time;
   }
 
+  if (header.DTS != -1)
+    gst_ts_demux_record_dts (demux, stream, header.DTS, bufferoffset);
+
   /* Remove PES headers */
-  GST_BUFFER_DATA (stream->pendingbuffers[0]) += 6 + PES_header_data_length;
-  GST_BUFFER_SIZE (stream->pendingbuffers[0]) -= 6 + PES_header_data_length;
+  GST_DEBUG ("Moving data forward  by %d bytes", header.header_size);
+  GST_BUFFER_DATA (stream->pendingbuffers[0]) += header.header_size;
+  GST_BUFFER_SIZE (stream->pendingbuffers[0]) -= header.header_size;
 
   /* FIXME : responsible for switching to PENDING_PACKET_BUFFER and
    * creating the bufferlist */
@@ -2409,6 +2260,7 @@ gst_ts_demux_plugin_init (GstPlugin * plugin)
 {
   GST_DEBUG_CATEGORY_INIT (ts_demux_debug, "tsdemux", 0,
       "MPEG transport stream demuxer");
+  init_pes_parser ();
 
   return gst_element_register (plugin, "tsdemux",
       GST_RANK_SECONDARY, GST_TYPE_TS_DEMUX);

From 7bcc0c71b81680e1ca2bc662feb86cf44fbec792 Mon Sep 17 00:00:00 2001
From: Alessandro Decina <alessandro.decina@collabora.co.uk>
Date: Wed, 6 Jul 2011 23:24:27 +0200
Subject: [PATCH 103/158] h264parse: ignore codec_data if
 stream-format=byte-stream

Some encoders set codec_data even when outputting byte-stream. Before this patch
h264parse would incorrectly detect such streams as AVC.
---
 gst/videoparsers/gsth264parse.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gst/videoparsers/gsth264parse.c b/gst/videoparsers/gsth264parse.c
index 76d3f8fe1b..5492b05c86 100644
--- a/gst/videoparsers/gsth264parse.c
+++ b/gst/videoparsers/gsth264parse.c
@@ -952,8 +952,12 @@ gst_h264_parse_set_caps (GstBaseParse * parse, GstCaps * caps)
   gst_structure_get_fraction (str, "framerate", &h264parse->fps_num,
       &h264parse->fps_den);
 
+  /* get upstream format and align from caps */
+  gst_h264_parse_format_from_caps (caps, &format, &align);
+
   /* packetized video has a codec_data */
-  if ((value = gst_structure_get_value (str, "codec_data"))) {
+  if (format != GST_H264_PARSE_FORMAT_BYTE &&
+      (value = gst_structure_get_value (str, "codec_data"))) {
     guint8 *data;
     guint num_sps, num_pps, profile, len;
     gint i;
@@ -1024,9 +1028,6 @@ gst_h264_parse_set_caps (GstBaseParse * parse, GstCaps * caps)
   /* negotiate with downstream, sets ->format and ->align */
   gst_h264_parse_negotiate (h264parse);
 
-  /* get upstream format and align from caps */
-  gst_h264_parse_format_from_caps (caps, &format, &align);
-
   /* if upstream sets codec_data without setting stream-format and alignment, we
    * assume stream-format=avc,alignment=au */
   if (format == GST_H264_PARSE_FORMAT_NONE) {

From 5f6a805dfde796a0ddd0ccda33e5693b65f4ade5 Mon Sep 17 00:00:00 2001
From: Alessandro Decina <alessandro.decina@collabora.co.uk>
Date: Tue, 12 Jul 2011 19:01:47 +0200
Subject: [PATCH 104/158] h264parse: assume byte-stream if stream-format and
 codec_data are missing from input caps

---
 gst/videoparsers/gsth264parse.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/gst/videoparsers/gsth264parse.c b/gst/videoparsers/gsth264parse.c
index 5492b05c86..b374b72116 100644
--- a/gst/videoparsers/gsth264parse.c
+++ b/gst/videoparsers/gsth264parse.c
@@ -1017,12 +1017,24 @@ gst_h264_parse_set_caps (GstBaseParse * parse, GstCaps * caps)
     }
 
     h264parse->codec_data = gst_buffer_ref (codec_data);
+
+    /* if upstream sets codec_data without setting stream-format and alignment, we
+     * assume stream-format=avc,alignment=au */
+    if (format == GST_H264_PARSE_FORMAT_NONE) {
+      format = GST_H264_PARSE_FORMAT_AVC;
+      align = GST_H264_PARSE_ALIGN_AU;
+    }
   } else {
     GST_DEBUG_OBJECT (h264parse, "have bytestream h264");
     /* nothing to pre-process */
     h264parse->packetized = FALSE;
     /* we have 4 sync bytes */
     h264parse->nal_length_size = 4;
+
+    if (format == GST_H264_PARSE_FORMAT_NONE) {
+      format = GST_H264_PARSE_FORMAT_BYTE;
+      align = GST_H264_PARSE_ALIGN_AU;
+    }
   }
 
   /* negotiate with downstream, sets ->format and ->align */

From f12598fa644e9dab892a84e551309c074d652a88 Mon Sep 17 00:00:00 2001
From: Alessandro Decina <alessandro.decina@collabora.co.uk>
Date: Tue, 12 Jul 2011 19:04:27 +0200
Subject: [PATCH 105/158] h264parse: remove a check made useless by the last
 commit

---
 gst/videoparsers/gsth264parse.c | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/gst/videoparsers/gsth264parse.c b/gst/videoparsers/gsth264parse.c
index b374b72116..089b5a7878 100644
--- a/gst/videoparsers/gsth264parse.c
+++ b/gst/videoparsers/gsth264parse.c
@@ -1040,16 +1040,6 @@ gst_h264_parse_set_caps (GstBaseParse * parse, GstCaps * caps)
   /* negotiate with downstream, sets ->format and ->align */
   gst_h264_parse_negotiate (h264parse);
 
-  /* if upstream sets codec_data without setting stream-format and alignment, we
-   * assume stream-format=avc,alignment=au */
-  if (format == GST_H264_PARSE_FORMAT_NONE) {
-    if (codec_data == NULL)
-      goto unknown_input_format;
-
-    format = GST_H264_PARSE_FORMAT_AVC;
-    align = GST_H264_PARSE_ALIGN_AU;
-  }
-
   if (format == h264parse->format && align == h264parse->align) {
     gst_base_parse_set_passthrough (parse, TRUE);
 
@@ -1082,11 +1072,6 @@ wrong_type:
     GST_DEBUG_OBJECT (h264parse, "wrong codec-data type");
     goto refuse_caps;
   }
-unknown_input_format:
-  {
-    GST_DEBUG_OBJECT (h264parse, "unknown stream-format and no codec_data");
-    goto refuse_caps;
-  }
 refuse_caps:
   {
     GST_WARNING_OBJECT (h264parse, "refused caps %" GST_PTR_FORMAT, caps);

From 8339ff458d3ece4a1a862566c9f1922c73338a15 Mon Sep 17 00:00:00 2001
From: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
Date: Mon, 18 Jul 2011 14:14:31 +0300
Subject: [PATCH 106/158] dfbvideosink: fix harmless typo in variable
 initialization

https://bugzilla.gnome.org/show_bug.cgi?id=654840
---
 ext/directfb/dfbvideosink.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/directfb/dfbvideosink.c b/ext/directfb/dfbvideosink.c
index 39d8fc7b55..7343e2537a 100644
--- a/ext/directfb/dfbvideosink.c
+++ b/ext/directfb/dfbvideosink.c
@@ -2242,8 +2242,8 @@ gst_dfbvideosink_init (GstDfbVideoSink * dfbvideosink)
 {
   dfbvideosink->pool_lock = g_mutex_new ();
   dfbvideosink->buffer_pool = NULL;
-  dfbvideosink->video_height = dfbvideosink->out_width = 0;
-  dfbvideosink->video_width = dfbvideosink->out_height = 0;
+  dfbvideosink->video_height = dfbvideosink->out_height = 0;
+  dfbvideosink->video_width = dfbvideosink->out_width = 0;
   dfbvideosink->fps_d = 0;
   dfbvideosink->fps_n = 0;
 

From beea027d19bf6ebbf792c2321a18a229c171b898 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Tue, 19 Jul 2011 08:37:24 +0200
Subject: [PATCH 107/158] pcapparse: Fix format string compiler warning

---
 gst/pcapparse/gstpcapparse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gst/pcapparse/gstpcapparse.c b/gst/pcapparse/gstpcapparse.c
index 36fcc3126b..49a934073c 100644
--- a/gst/pcapparse/gstpcapparse.c
+++ b/gst/pcapparse/gstpcapparse.c
@@ -469,7 +469,7 @@ gst_pcap_parse_chain (GstPad * pad, GstBuffer * buffer)
 
           data = gst_adapter_peek (self->adapter, self->cur_packet_size);
 
-          GST_LOG_OBJECT (self, "examining packet size %d",
+          GST_LOG_OBJECT (self, "examining packet size %" G_GINT64_FORMAT,
               self->cur_packet_size);
 
           if (gst_pcap_parse_scan_frame (self, data, self->cur_packet_size,

From dc18e2b16d1571f5c497a78c7da7f55e7032313c Mon Sep 17 00:00:00 2001
From: Edward Hervey <bilboed@bilboed.com>
Date: Tue, 19 Jul 2011 08:45:51 +0200
Subject: [PATCH 108/158] mpegtsbase: Use a bit array instead of an array of
 gboolean

Makes know_psi and is_pes 32 times smaller
---
 gst/mpegtsdemux/mpegtsbase.c | 34 +++++++++++++++++-----------------
 gst/mpegtsdemux/mpegtsbase.h | 12 ++++++++----
 gst/mpegtsdemux/tsdemux.c    |  2 +-
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/gst/mpegtsdemux/mpegtsbase.c b/gst/mpegtsdemux/mpegtsbase.c
index e5bf6834de..55ed3bfaf0 100644
--- a/gst/mpegtsdemux/mpegtsbase.c
+++ b/gst/mpegtsdemux/mpegtsbase.c
@@ -192,11 +192,11 @@ mpegts_base_reset (MpegTSBase * base)
   MpegTSBaseClass *klass = GST_MPEGTS_BASE_GET_CLASS (base);
 
   mpegts_packetizer_clear (base->packetizer);
-  memset (base->is_pes, 0, 8192);
-  memset (base->known_psi, 0, 8192);
+  memset (base->is_pes, 0, 1024);
+  memset (base->known_psi, 0, 1024);
 
   /* PAT */
-  base->known_psi[0] = TRUE;
+  MPEGTS_BIT_SET (base->known_psi, 0);
 
   /* FIXME : Commenting the Following lines is to be in sync with the following
    * commit
@@ -234,8 +234,8 @@ mpegts_base_init (MpegTSBase * base, MpegTSBaseClass * klass)
   base->programs = g_hash_table_new_full (g_direct_hash, g_direct_equal,
       NULL, (GDestroyNotify) mpegts_base_free_program);
 
-  base->is_pes = g_new0 (gboolean, 8192);
-  base->known_psi = g_new0 (gboolean, 8192);
+  base->is_pes = g_new0 (guint8, 1024);
+  base->known_psi = g_new0 (guint8, 1024);
   mpegts_base_reset (base);
   base->program_size = sizeof (MpegTSBaseProgram);
   base->stream_size = sizeof (MpegTSBaseStream);
@@ -533,11 +533,11 @@ mpegts_base_deactivate_pmt (MpegTSBase * base, MpegTSBaseProgram * program)
       gst_structure_id_get (stream, QUARK_PID, G_TYPE_UINT, &pid,
           QUARK_STREAM_TYPE, G_TYPE_UINT, &stream_type, NULL);
       mpegts_base_program_remove_stream (base, program, (guint16) pid);
-      base->is_pes[pid] = FALSE;
+      MPEGTS_BIT_UNSET (base->is_pes, pid);
     }
     /* remove pcr stream */
     mpegts_base_program_remove_stream (base, program, program->pcr_pid);
-    base->is_pes[program->pcr_pid] = FALSE;
+    MPEGTS_BIT_UNSET (base->is_pes, program->pcr_pid);
   }
 }
 
@@ -556,11 +556,11 @@ mpegts_base_is_psi (MpegTSBase * base, MpegTSPacketizerPacket * packet)
     0x72, 0x73, 0x7E, 0x7F, TABLE_ID_UNSET
   };
 
-  if (base->known_psi[packet->pid])
+  if (MPEGTS_BIT_IS_SET (base->known_psi, packet->pid))
     retval = TRUE;
 
   /* check is it is a pes pid */
-  if (base->is_pes[packet->pid])
+  if (MPEGTS_BIT_IS_SET (base->is_pes, packet->pid))
     return FALSE;
 
   if (!retval) {
@@ -637,14 +637,14 @@ mpegts_base_apply_pat (MpegTSBase * base, GstStructure * pat_info)
           /* FIXME: when this happens it may still be pmt pid of another
            * program, so setting to False may make it go through expensive
            * path in is_psi unnecessarily */
-          base->known_psi[program->pmt_pid] = FALSE;
+          MPEGTS_BIT_UNSET (base->known_psi, program->pmt_pid);
         }
 
         program->pmt_pid = pid;
-        base->known_psi[pid] = TRUE;
+        MPEGTS_BIT_SET (base->known_psi, pid);
       }
     } else {
-      base->known_psi[pid] = TRUE;
+      MPEGTS_BIT_SET (base->known_psi, pid);
       program = mpegts_base_add_program (base, program_number, pid);
     }
     program->patcount += 1;
@@ -684,7 +684,7 @@ mpegts_base_apply_pat (MpegTSBase * base, GstStructure * pat_info)
       /* FIXME: when this happens it may still be pmt pid of another
        * program, so setting to False may make it go through expensive
        * path in is_psi unnecessarily */
-      base->known_psi[pid] = TRUE;
+      MPEGTS_BIT_SET (base->known_psi, pid);
       mpegts_packetizer_remove_stream (base->packetizer, pid);
     }
 
@@ -731,7 +731,7 @@ mpegts_base_apply_pmt (MpegTSBase * base,
     program->pmt_info = NULL;
   } else {
     /* no PAT?? */
-    base->known_psi[pmt_pid] = TRUE;
+    MPEGTS_BIT_SET (base->known_psi, pmt_pid);
     program = mpegts_base_add_program (base, program_number, pid);
   }
 
@@ -740,7 +740,7 @@ mpegts_base_apply_pmt (MpegTSBase * base,
   program->pmt_pid = pmt_pid;
   program->pcr_pid = pcr_pid;
   mpegts_base_program_add_stream (base, program, (guint16) pcr_pid, -1, NULL);
-  base->is_pes[pcr_pid] = TRUE;
+  MPEGTS_BIT_SET (base->is_pes, pcr_pid);
 
   for (i = 0; i < gst_value_list_get_size (new_streams); ++i) {
     value = gst_value_list_get_value (new_streams, i);
@@ -748,7 +748,7 @@ mpegts_base_apply_pmt (MpegTSBase * base,
 
     gst_structure_id_get (stream, QUARK_PID, G_TYPE_UINT, &pid,
         QUARK_STREAM_TYPE, G_TYPE_UINT, &stream_type, NULL);
-    base->is_pes[pid] = TRUE;
+    MPEGTS_BIT_SET (base->is_pes, pid);
     mpegts_base_program_add_stream (base, program,
         (guint16) pid, (guint8) stream_type, stream);
 
@@ -1108,7 +1108,7 @@ mpegts_base_chain (GstPad * pad, GstBuffer * buf)
       /* we need to push section packet downstream */
       res = mpegts_base_push (base, &packet, &section);
 
-    } else if (base->is_pes[packet.pid]) {
+    } else if (MPEGTS_BIT_IS_SET (base->is_pes, packet.pid)) {
       /* push the packet downstream */
       res = mpegts_base_push (base, &packet, NULL);
     } else
diff --git a/gst/mpegtsdemux/mpegtsbase.h b/gst/mpegtsdemux/mpegtsbase.h
index a761a1f1e1..4ba0a4b7b3 100644
--- a/gst/mpegtsdemux/mpegtsbase.h
+++ b/gst/mpegtsdemux/mpegtsbase.h
@@ -105,10 +105,10 @@ struct _MpegTSBase {
   GstStructure *pat;
   MpegTSPacketizer2 *packetizer;
 
-  /* arrays that say whether a pid is a known psi pid or a pes pid
-   * FIXME: Make these bit arrays so we can make them 8 times smaller */
-  gboolean *known_psi;
-  gboolean *is_pes;
+  /* arrays that say whether a pid is a known psi pid or a pes pid */
+  /* Use MPEGTS_BIT_* to set/unset/check the values */
+  guint8 *known_psi;
+  guint8 *is_pes;
 
   gboolean disposed;
 
@@ -162,6 +162,10 @@ struct _MpegTSBaseClass {
   void (*eit_info) (GstStructure *eit);
 };
 
+#define MPEGTS_BIT_SET(field, offs)    ((field)[(offs) / 8] |=  (1 << ((offs) % 8)))
+#define MPEGTS_BIT_UNSET(field, offs)  ((field)[(offs) / 8] &= ~(1 << ((offs) % 8)))
+#define MPEGTS_BIT_IS_SET(field, offs) ((field)[(offs) / 8] &   (1 << ((offs) % 8)))
+
 GType mpegts_base_get_type(void);
 
 MpegTSBaseProgram *mpegts_base_get_program (MpegTSBase * base, gint program_number);
diff --git a/gst/mpegtsdemux/tsdemux.c b/gst/mpegtsdemux/tsdemux.c
index 6c9dcb0209..05f6a9e45d 100644
--- a/gst/mpegtsdemux/tsdemux.c
+++ b/gst/mpegtsdemux/tsdemux.c
@@ -1051,7 +1051,7 @@ create_pad_for_stream (MpegTSBase * base, MpegTSBaseStream * bstream,
     case ST_DSMCC_B:
     case ST_DSMCC_C:
     case ST_DSMCC_D:
-      base->is_pes[bstream->pid] = FALSE;
+      MPEGTS_BIT_UNSET (base->is_pes, bstream->pid);
       break;
     case ST_AUDIO_AAC:
       template = gst_static_pad_template_get (&audio_template);

From b170b2020c58fe782fa98bd0a4d3bcc9643f476e Mon Sep 17 00:00:00 2001
From: Edward Hervey <bilboed@bilboed.com>
Date: Tue, 19 Jul 2011 09:34:37 +0200
Subject: [PATCH 109/158] mpegtsbase: Add a GList of streams to the program

Allows faster iteration of all program streams.

We still keep the Array to allow fast retrieval of stream by PID.
---
 gst/mpegtsdemux/mpegtsbase.c | 20 ++++++---
 gst/mpegtsdemux/mpegtsbase.h |  1 +
 gst/mpegtsdemux/tsdemux.c    | 86 +++++++++++++++---------------------
 3 files changed, 51 insertions(+), 56 deletions(-)

diff --git a/gst/mpegtsdemux/mpegtsbase.c b/gst/mpegtsdemux/mpegtsbase.c
index 55ed3bfaf0..e4118b6a67 100644
--- a/gst/mpegtsdemux/mpegtsbase.c
+++ b/gst/mpegtsdemux/mpegtsbase.c
@@ -432,14 +432,16 @@ mpegts_base_deactivate_program (MpegTSBase * base, MpegTSBaseProgram * program)
 static void
 mpegts_base_free_program (MpegTSBaseProgram * program)
 {
-  guint i;
+  GList *tmp;
 
   if (program->pmt_info)
     gst_structure_free (program->pmt_info);
 
-  for (i = 0; i < 0x2000; i++)
-    if (program->streams[i])
-      mpegts_base_free_stream (program->streams[i]);
+  for (tmp = program->stream_list; tmp; tmp = tmp->next)
+    mpegts_base_free_stream ((MpegTSBaseStream *) tmp->data);
+  if (program->stream_list)
+    g_list_free (program->stream_list);
+
   g_free (program->streams);
 
   if (program->tags)
@@ -482,6 +484,7 @@ mpegts_base_program_add_stream (MpegTSBase * base,
   stream->stream_info = stream_info;
 
   program->streams[pid] = stream;
+  program->stream_list = g_list_append (program->stream_list, stream);
 
   if (klass->stream_added)
     klass->stream_added (base, stream, program);
@@ -500,12 +503,17 @@ mpegts_base_program_remove_stream (MpegTSBase * base,
     MpegTSBaseProgram * program, guint16 pid)
 {
   MpegTSBaseClass *klass = GST_MPEGTS_BASE_GET_CLASS (base);
+  MpegTSBaseStream *stream = program->streams[pid];
+
+  GST_DEBUG ("pid:0x%04x", pid);
+
 
   /* If subclass needs it, inform it of the stream we are about to remove */
   if (klass->stream_removed)
-    klass->stream_removed (base, program->streams[pid]);
+    klass->stream_removed (base, stream);
 
-  mpegts_base_free_stream (program->streams[pid]);
+  program->stream_list = g_list_remove_all (program->stream_list, stream);
+  mpegts_base_free_stream (stream);
   program->streams[pid] = NULL;
 }
 
diff --git a/gst/mpegtsdemux/mpegtsbase.h b/gst/mpegtsdemux/mpegtsbase.h
index 4ba0a4b7b3..44cb501f4b 100644
--- a/gst/mpegtsdemux/mpegtsbase.h
+++ b/gst/mpegtsdemux/mpegtsbase.h
@@ -64,6 +64,7 @@ struct _MpegTSBaseProgram
   guint16 pcr_pid;
   GstStructure *pmt_info;
   MpegTSBaseStream **streams;
+  GList *stream_list;
   gint patcount;
 
   /* Pending Tags for the program */
diff --git a/gst/mpegtsdemux/tsdemux.c b/gst/mpegtsdemux/tsdemux.c
index 05f6a9e45d..94b4671f42 100644
--- a/gst/mpegtsdemux/tsdemux.c
+++ b/gst/mpegtsdemux/tsdemux.c
@@ -891,18 +891,16 @@ static gboolean
 push_event (MpegTSBase * base, GstEvent * event)
 {
   GstTSDemux *demux = (GstTSDemux *) base;
-  guint i;
+  GList *tmp;
 
   if (G_UNLIKELY (demux->program == NULL))
     return FALSE;
 
-  for (i = 0; i < 0x2000; i++) {
-    if (demux->program->streams[i]) {
-      if (((TSDemuxStream *) demux->program->streams[i])->pad) {
-        gst_event_ref (event);
-        gst_pad_push_event (((TSDemuxStream *) demux->program->streams[i])->pad,
-            event);
-      }
+  for (tmp = demux->program->stream_list; tmp; tmp = tmp->next) {
+    TSDemuxStream *stream = (TSDemuxStream *) tmp->data;
+    if (stream->pad) {
+      gst_event_ref (event);
+      gst_pad_push_event (stream->pad, event);
     }
   }
 
@@ -913,7 +911,7 @@ static GstFlowReturn
 tsdemux_combine_flows (GstTSDemux * demux, TSDemuxStream * stream,
     GstFlowReturn ret)
 {
-  guint i;
+  GList *tmp;
 
   /* Store the value */
   stream->flow_return = ret;
@@ -923,16 +921,14 @@ tsdemux_combine_flows (GstTSDemux * demux, TSDemuxStream * stream,
     goto done;
 
   /* Only return NOT_LINKED if all other pads returned NOT_LINKED */
-  for (i = 0; i < 0x2000; i++) {
-    if (demux->program->streams[i]) {
-      stream = (TSDemuxStream *) demux->program->streams[i];
-      if (stream->pad) {
-        ret = stream->flow_return;
-        /* some other return value (must be SUCCESS but we can return
-         * other values as well) */
-        if (ret != GST_FLOW_NOT_LINKED)
-          goto done;
-      }
+  for (tmp = demux->program->stream_list; tmp; tmp = tmp->next) {
+    stream = (TSDemuxStream *) tmp->data;
+    if (stream->pad) {
+      ret = stream->flow_return;
+      /* some other return value (must be SUCCESS but we can return
+       * other values as well) */
+      if (ret != GST_FLOW_NOT_LINKED)
+        goto done;
     }
     /* if we get here, all other pads were unlinked and we return
      * NOT_LINKED then */
@@ -1262,13 +1258,8 @@ gst_ts_demux_stream_flush (TSDemuxStream * stream)
 static void
 gst_ts_demux_flush_streams (GstTSDemux * demux)
 {
-  gint i;
-
-  for (i = 0; i < 0x2000; i++) {
-    if (demux->program->streams[i]) {
-      gst_ts_demux_stream_flush ((TSDemuxStream *) demux->program->streams[i]);
-    }
-  }
+  g_list_foreach (demux->program->stream_list,
+      (GFunc) gst_ts_demux_stream_flush, NULL);
 }
 
 static void
@@ -1278,7 +1269,7 @@ gst_ts_demux_program_started (MpegTSBase * base, MpegTSBaseProgram * program)
 
   if (demux->program_number == -1 ||
       demux->program_number == program->program_number) {
-    guint i;
+    GList *tmp;
 
     GST_LOG ("program %d started", program->program_number);
     demux->program_number = program->program_number;
@@ -1290,10 +1281,8 @@ gst_ts_demux_program_started (MpegTSBase * base, MpegTSBaseProgram * program)
      * For example, we don't want to expose HDV AUX private streams, we will just
      * be using them directly for seeking and metadata. */
     if (base->mode != BASE_MODE_SCANNING)
-      for (i = 0; i < 0x2000; i++)
-        if (program->streams[i])
-          activate_pad_for_stream (demux,
-              (TSDemuxStream *) program->streams[i]);
+      for (tmp = program->stream_list; tmp; tmp = tmp->next)
+        activate_pad_for_stream (demux, (TSDemuxStream *) tmp->data);
 
     /* Inform scanner we have got our program */
     demux->current_program_number = program->program_number;
@@ -1303,7 +1292,7 @@ gst_ts_demux_program_started (MpegTSBase * base, MpegTSBaseProgram * program)
 static void
 gst_ts_demux_program_stopped (MpegTSBase * base, MpegTSBaseProgram * program)
 {
-  guint i;
+  GList *tmp;
   GstTSDemux *demux = GST_TS_DEMUX (base);
   TSDemuxStream *localstream = NULL;
 
@@ -1312,19 +1301,18 @@ gst_ts_demux_program_stopped (MpegTSBase * base, MpegTSBaseProgram * program)
   if (demux->program == NULL || program != demux->program)
     return;
 
-  for (i = 0; i < 0x2000; i++) {
-    if (demux->program->streams[i]) {
-      localstream = (TSDemuxStream *) program->streams[i];
-      if (localstream->pad) {
-        GST_DEBUG ("HAVE PAD %s:%s", GST_DEBUG_PAD_NAME (localstream->pad));
-        if (gst_pad_is_active (localstream->pad))
-          gst_element_remove_pad (GST_ELEMENT_CAST (demux), localstream->pad);
-        else
-          gst_object_unref (localstream->pad);
-        localstream->pad = NULL;
-      }
+  for (tmp = demux->program->stream_list; tmp; tmp = tmp->next) {
+    localstream = (TSDemuxStream *) tmp->data;
+    if (localstream->pad) {
+      GST_DEBUG ("HAVE PAD %s:%s", GST_DEBUG_PAD_NAME (localstream->pad));
+      if (gst_pad_is_active (localstream->pad))
+        gst_element_remove_pad (GST_ELEMENT_CAST (demux), localstream->pad);
+      else
+        gst_object_unref (localstream->pad);
+      localstream->pad = NULL;
     }
   }
+
   demux->program = NULL;
   demux->program_number = -1;
 }
@@ -2067,7 +2055,7 @@ calculate_and_push_newsegment (GstTSDemux * demux, TSDemuxStream * stream)
   MpegTSBase *base = (MpegTSBase *) demux;
   GstClockTime firstpts = GST_CLOCK_TIME_NONE;
   GstEvent *newsegmentevent;
-  guint i;
+  GList *tmp;
   gint64 start, stop, position;
 
   GST_DEBUG ("Creating new newsegment");
@@ -2083,12 +2071,10 @@ calculate_and_push_newsegment (GstTSDemux * demux, TSDemuxStream * stream)
    */
 
   /* Find the earliest current PTS we're going to push */
-  for (i = 0; i < 0x2000; i++) {
-    if (demux->program->streams[i]) {
-      if ((!GST_CLOCK_TIME_IS_VALID (firstpts))
-          || (((TSDemuxStream *) demux->program->streams[i])->pts < firstpts))
-        firstpts = ((TSDemuxStream *) demux->program->streams[i])->pts;
-    }
+  for (tmp = demux->program->stream_list; tmp; tmp = tmp->next) {
+    TSDemuxStream *pstream = (TSDemuxStream *) tmp->data;
+    if (!GST_CLOCK_TIME_IS_VALID (firstpts) || pstream->pts < firstpts)
+      firstpts = pstream->pts;
   }
 
   if (base->mode == BASE_MODE_PUSHING) {

From 2b127601e917e24bee62bd0ff57a0c0c15fd8292 Mon Sep 17 00:00:00 2001
From: Edward Hervey <bilboed@bilboed.com>
Date: Tue, 19 Jul 2011 09:36:10 +0200
Subject: [PATCH 110/158] mpegtsbase: Avoid double removal of streams

This can happen if the PCR pid is the same as a audio/video PID.
---
 gst/mpegtsdemux/mpegtsbase.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gst/mpegtsdemux/mpegtsbase.c b/gst/mpegtsdemux/mpegtsbase.c
index e4118b6a67..534b108d75 100644
--- a/gst/mpegtsdemux/mpegtsbase.c
+++ b/gst/mpegtsdemux/mpegtsbase.c
@@ -502,11 +502,18 @@ void
 mpegts_base_program_remove_stream (MpegTSBase * base,
     MpegTSBaseProgram * program, guint16 pid)
 {
-  MpegTSBaseClass *klass = GST_MPEGTS_BASE_GET_CLASS (base);
+  MpegTSBaseClass *klass;
   MpegTSBaseStream *stream = program->streams[pid];
 
   GST_DEBUG ("pid:0x%04x", pid);
 
+  if (G_UNLIKELY (stream == NULL)) {
+    /* Can happen if the PCR PID is the same as a audio/video PID */
+    GST_DEBUG ("Stream already removed");
+    return;
+  }
+
+  klass = GST_MPEGTS_BASE_GET_CLASS (base);
 
   /* If subclass needs it, inform it of the stream we are about to remove */
   if (klass->stream_removed)

From a960e72efac1d51631b8cc8b550ef675011fce07 Mon Sep 17 00:00:00 2001
From: Edward Hervey <bilboed@bilboed.com>
Date: Tue, 19 Jul 2011 09:36:53 +0200
Subject: [PATCH 111/158] mpegtsbase/tsdemux: Add more comments and removal
 unused variable

---
 gst/mpegtsdemux/mpegtsbase.c | 13 ++++++++++++-
 gst/mpegtsdemux/tsdemux.c    |  3 ---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/gst/mpegtsdemux/mpegtsbase.c b/gst/mpegtsdemux/mpegtsbase.c
index 534b108d75..46e06cb127 100644
--- a/gst/mpegtsdemux/mpegtsbase.c
+++ b/gst/mpegtsdemux/mpegtsbase.c
@@ -369,6 +369,9 @@ mpegts_base_add_program (MpegTSBase * base,
 {
   MpegTSBaseProgram *program;
 
+  GST_DEBUG_OBJECT (base, "program_number : %d, pmt_pid : %d",
+      program_number, pmt_pid);
+
   program = g_malloc0 (base->program_size);
   program->program_number = program_number;
   program->pmt_pid = pmt_pid;
@@ -456,6 +459,8 @@ mpegts_base_remove_program (MpegTSBase * base, gint program_number)
   MpegTSBaseProgram *program;
   MpegTSBaseClass *klass = GST_MPEGTS_BASE_GET_CLASS (base);
 
+  GST_DEBUG_OBJECT (base, "program_number : %d", program_number);
+
   if (klass->program_stopped) {
     program =
         (MpegTSBaseProgram *) g_hash_table_lookup (base->programs,
@@ -464,7 +469,6 @@ mpegts_base_remove_program (MpegTSBase * base, gint program_number)
       klass->program_stopped (base, program);
   }
   g_hash_table_remove (base->programs, GINT_TO_POINTER (program_number));
-
 }
 
 static MpegTSBaseStream *
@@ -535,6 +539,8 @@ mpegts_base_deactivate_pmt (MpegTSBase * base, MpegTSBaseProgram * program)
   const GValue *value;
   MpegTSBaseClass *klass = GST_MPEGTS_BASE_GET_CLASS (base);
 
+  GST_DEBUG_OBJECT (base, "Deactivating PMT");
+
   if (program->pmt_info) {
     /* Inform subclasses we're deactivating this program */
     if (klass->program_stopped)
@@ -732,6 +738,8 @@ mpegts_base_apply_pmt (MpegTSBase * base,
     return;
   }
 
+  GST_DEBUG ("Applying PMT (pid:0x%04x)", pmt_pid);
+
   gst_structure_id_get (pmt_info,
       QUARK_PROGRAM_NUMBER, G_TYPE_UINT, &program_number,
       QUARK_PCR_PID, G_TYPE_UINT, &pcr_pid, NULL);
@@ -739,6 +747,7 @@ mpegts_base_apply_pmt (MpegTSBase * base,
 
   program = mpegts_base_get_program (base, program_number);
   if (program) {
+    GST_DEBUG ("Deactivating old program");
     /* deactivate old pmt */ ;
     mpegts_base_deactivate_pmt (base, program);
     if (program->pmt_info)
@@ -750,6 +759,8 @@ mpegts_base_apply_pmt (MpegTSBase * base,
     program = mpegts_base_add_program (base, program_number, pid);
   }
 
+  GST_DEBUG ("Now activating new program");
+
   /* activate new pmt */
   program->pmt_info = gst_structure_copy (pmt_info);
   program->pmt_pid = pmt_pid;
diff --git a/gst/mpegtsdemux/tsdemux.c b/gst/mpegtsdemux/tsdemux.c
index 94b4671f42..9e70073b4e 100644
--- a/gst/mpegtsdemux/tsdemux.c
+++ b/gst/mpegtsdemux/tsdemux.c
@@ -92,9 +92,6 @@ struct _TSDemuxStream
 
   GstPad *pad;
 
-  /* set to FALSE before a push and TRUE after */
-  gboolean pushed;
-
   /* the return of the latest push */
   GstFlowReturn flow_return;
 

From 2dbd24ca840db19032b7ea684dd0b3e2d72a855b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Tue, 19 Jul 2011 12:50:43 +0200
Subject: [PATCH 112/158] basevideoencoder: Use a temporary GstVideoState until
 the subclass accepted the caps

Also store the caps in the GstVideoState and assume a PAR of 1/1 instead
of 0/1 if no PAR is specified in the caps.
---
 gst-libs/gst/video/gstbasevideoencoder.c | 89 ++++++++++++------------
 1 file changed, 43 insertions(+), 46 deletions(-)

diff --git a/gst-libs/gst/video/gstbasevideoencoder.c b/gst-libs/gst/video/gstbasevideoencoder.c
index c69424d9c8..f2e7584fe7 100644
--- a/gst-libs/gst/video/gstbasevideoencoder.c
+++ b/gst-libs/gst/video/gstbasevideoencoder.c
@@ -108,6 +108,8 @@
 #include "gstbasevideoencoder.h"
 #include "gstbasevideoutils.h"
 
+#include <string.h>
+
 GST_DEBUG_CATEGORY (basevideoencoder_debug);
 #define GST_CAT_DEFAULT basevideoencoder_debug
 
@@ -263,11 +265,9 @@ gst_base_video_encoder_sink_setcaps (GstPad * pad, GstCaps * caps)
   GstBaseVideoEncoder *base_video_encoder;
   GstBaseVideoEncoderClass *base_video_encoder_class;
   GstStructure *structure;
-  GstVideoState *state;
+  GstVideoState *state, tmp_state;
   gboolean ret;
-  gboolean changed = FALSE, u, v;
-  GstVideoFormat fmt;
-  gint w, h, num, den;
+  gboolean changed = FALSE;
 
   base_video_encoder = GST_BASE_VIDEO_ENCODER (gst_pad_get_parent (pad));
   base_video_encoder_class =
@@ -279,58 +279,49 @@ gst_base_video_encoder_sink_setcaps (GstPad * pad, GstCaps * caps)
   GST_DEBUG_OBJECT (base_video_encoder, "setcaps %" GST_PTR_FORMAT, caps);
 
   state = &GST_BASE_VIDEO_CODEC (base_video_encoder)->state;
+  memset (&tmp_state, 0, sizeof (tmp_state));
+
+  tmp_state.caps = gst_caps_ref (caps);
   structure = gst_caps_get_structure (caps, 0);
 
-  ret = gst_video_format_parse_caps (caps, &fmt, &w, &h);
+  ret =
+      gst_video_format_parse_caps (caps, &tmp_state.format, &tmp_state.width,
+      &tmp_state.height);
   if (!ret)
     goto exit;
 
-  if (fmt != state->format || w != state->width || h != state->height) {
-    changed = TRUE;
-    state->format = fmt;
-    state->width = w;
-    state->height = h;
-  }
+  changed = (tmp_state.format != state->format
+      || tmp_state.width != state->width || tmp_state.height != state->height);
 
-  num = 0;
-  den = 1;
-  gst_video_parse_caps_framerate (caps, &num, &den);
-  if (den == 0) {
-    num = 0;
-    den = 1;
-  }
-  if (num != state->fps_n || den != state->fps_d) {
-    changed = TRUE;
-    state->fps_n = num;
-    state->fps_d = den;
+  if (!gst_video_parse_caps_framerate (caps, &tmp_state.fps_n,
+          &tmp_state.fps_d)) {
+    tmp_state.fps_n = 0;
+    tmp_state.fps_d = 1;
   }
+  changed = changed || (tmp_state.fps_n != state->fps_n
+      || tmp_state.fps_d != state->fps_d);
 
-  num = 0;
-  den = 1;
-  gst_video_parse_caps_pixel_aspect_ratio (caps, &num, &den);
-  if (den == 0) {
-    num = 0;
-    den = 1;
-  }
-  if (num != state->par_n || den != state->par_d) {
-    changed = TRUE;
-    state->par_n = num;
-    state->par_d = den;
+  if (!gst_video_parse_caps_pixel_aspect_ratio (caps, &tmp_state.par_n,
+          &tmp_state.par_d)) {
+    tmp_state.par_n = 1;
+    tmp_state.par_d = 1;
   }
+  changed = changed || (tmp_state.par_n != state->par_n
+      || tmp_state.par_d != state->par_d);
 
-  u = gst_structure_get_boolean (structure, "interlaced", &v);
-  if (u != state->have_interlaced || v != state->interlaced) {
-    changed = TRUE;
-    state->have_interlaced = u;
-    state->interlaced = v;
-  }
+  tmp_state.have_interlaced =
+      gst_structure_get_boolean (structure, "interlaced",
+      &tmp_state.interlaced);
+  changed = changed || (tmp_state.have_interlaced != state->have_interlaced
+      || tmp_state.interlaced != state->interlaced);
 
-  state->bytes_per_picture =
-      gst_video_format_get_size (state->format, state->width, state->height);
-  state->clean_width = state->width;
-  state->clean_height = state->height;
-  state->clean_offset_left = 0;
-  state->clean_offset_top = 0;
+  tmp_state.bytes_per_picture =
+      gst_video_format_get_size (tmp_state.format, tmp_state.width,
+      tmp_state.height);
+  tmp_state.clean_width = tmp_state.width;
+  tmp_state.clean_height = tmp_state.height;
+  tmp_state.clean_offset_left = 0;
+  tmp_state.clean_offset_top = 0;
 
   if (changed) {
     /* arrange draining pending frames */
@@ -338,11 +329,17 @@ gst_base_video_encoder_sink_setcaps (GstPad * pad, GstCaps * caps)
 
     /* and subclass should be ready to configure format at any time around */
     if (base_video_encoder_class->set_format)
-      ret = base_video_encoder_class->set_format (base_video_encoder, state);
+      ret =
+          base_video_encoder_class->set_format (base_video_encoder, &tmp_state);
+    if (ret) {
+      gst_caps_replace (&state->caps, NULL);
+      *state = tmp_state;
+    }
   } else {
     /* no need to stir things up */
     GST_DEBUG_OBJECT (base_video_encoder,
         "new video format identical to configured format");
+    gst_caps_unref (tmp_state.caps);
     ret = TRUE;
   }
 

From 2b7e9abc59b4bb03a490797688348bb77b3d0e46 Mon Sep 17 00:00:00 2001
From: Alessandro Decina <alessandro.d@gmail.com>
Date: Wed, 20 Jul 2011 08:57:47 +0200
Subject: [PATCH 113/158] mpegtsdemux: fix compiler warnings

---
 gst/mpegtsdemux/pesparse.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gst/mpegtsdemux/pesparse.c b/gst/mpegtsdemux/pesparse.c
index 902dead994..d68def388d 100644
--- a/gst/mpegtsdemux/pesparse.c
+++ b/gst/mpegtsdemux/pesparse.c
@@ -324,7 +324,8 @@ mpegts_parse_pes_header (const guint8 * data, gsize length, PESHeader * res,
     if (G_UNLIKELY (length < res->extension_field_length + 1))
       goto need_more_data;
 
-    GST_LOG ("extension_field_length : %d", res->extension_field_length);
+    GST_LOG ("extension_field_length : %" G_GSSIZE_FORMAT,
+        res->extension_field_length);
 
     if (res->extension_field_length) {
       flags = *data++;
@@ -350,7 +351,8 @@ stuffing_byte:
   }
 
 done_parsing:
-  GST_DEBUG ("origlength:%d, length:%d", origlength, length);
+  GST_DEBUG ("origlength:%" G_GSSIZE_FORMAT ", length:%" G_GSSIZE_FORMAT,
+      origlength, length);
 
   /* Update the length based on parsed size */
   if (res->packet_length)

From e8d24859ca5629198c581b570402e9a459839d7c Mon Sep 17 00:00:00 2001
From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Date: Mon, 18 Jul 2011 14:53:31 -0400
Subject: [PATCH 114/158] Fix compilation for unused but not set

https://bugzilla.gnome.org/show_bug.cgi?id=654572
---
 ext/assrender/gstassrender.c | 7 ++++++-
 ext/lv2/gstlv2.c             | 3 ---
 ext/modplug/gstmodplug.cc    | 5 +++++
 ext/sndfile/gstsfsrc.c       | 5 +++++
 ext/timidity/gsttimidity.c   | 3 ---
 ext/timidity/gstwildmidi.c   | 7 ++++++-
 ext/zbar/gstzbar.c           | 3 +--
 7 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/ext/assrender/gstassrender.c b/ext/assrender/gstassrender.c
index c5a8e1bcd2..2727365db9 100644
--- a/ext/assrender/gstassrender.c
+++ b/ext/assrender/gstassrender.c
@@ -570,10 +570,13 @@ blit_i420 (GstAssRender * render, ASS_Image * ass_image, GstBuffer * buffer)
   const guint8 *src;
   guint8 *dst_y, *dst_u, *dst_v;
   gint x, y, w, h;
+/* FIXME ignoring source image stride might be wrong here */
+#if 0
   gint w2;
+  gint src_stride;
+#endif
   gint width = render->width;
   gint height = render->height;
-  gint src_stride;
   gint y_offset, y_stride;
   gint u_offset, u_stride;
   gint v_offset, v_stride;
@@ -609,9 +612,11 @@ blit_i420 (GstAssRender * render, ASS_Image * ass_image, GstBuffer * buffer)
     w = MIN (ass_image->w, width - ass_image->dst_x);
     h = MIN (ass_image->h, height - ass_image->dst_y);
 
+#if 0
     w2 = (w + 1) / 2;
 
     src_stride = ass_image->stride;
+#endif
 
     src = ass_image->bitmap;
     dst_y =
diff --git a/ext/lv2/gstlv2.c b/ext/lv2/gstlv2.c
index dd1df3df10..f31050fc66 100644
--- a/ext/lv2/gstlv2.c
+++ b/ext/lv2/gstlv2.c
@@ -622,7 +622,6 @@ gst_lv2_setup (GstSignalProcessor * gsp, GstCaps * caps)
   GstLV2Group *group = NULL;
   GstAudioChannelPosition *positions = NULL;
   GstPad *pad;
-  GstCaps *pad_caps;
 
   gsp_class = GST_SIGNAL_PROCESSOR_GET_CLASS (gsp);
   lv2 = (GstLV2 *) gsp;
@@ -655,7 +654,6 @@ gst_lv2_setup (GstSignalProcessor * gsp, GstCaps * caps)
                     slv2_value_as_string (group->symbol)))) {
           GST_INFO_OBJECT (lv2, "set audio channel positions on sink pad %s",
               slv2_value_as_string (group->symbol));
-          pad_caps = GST_PAD_CAPS (pad);
           s = gst_caps_get_structure (caps, 0);
           gst_audio_set_channel_positions (s, positions);
           gst_object_unref (pad);
@@ -674,7 +672,6 @@ gst_lv2_setup (GstSignalProcessor * gsp, GstCaps * caps)
                     slv2_value_as_string (group->symbol)))) {
           GST_INFO_OBJECT (lv2, "set audio channel positions on src pad %s",
               slv2_value_as_string (group->symbol));
-          pad_caps = GST_PAD_CAPS (pad);
           s = gst_caps_get_structure (caps, 0);
           gst_audio_set_channel_positions (s, positions);
           gst_object_unref (pad);
diff --git a/ext/modplug/gstmodplug.cc b/ext/modplug/gstmodplug.cc
index b6b59eb122..6faaa0c837 100644
--- a/ext/modplug/gstmodplug.cc
+++ b/ext/modplug/gstmodplug.cc
@@ -370,15 +370,20 @@ gst_modplug_src_event (GstPad * pad, GstEvent * event)
       GstSeekType cur_type, stop_type;
       gboolean flush;
       gint64 cur, stop;
+/* FIXME timestamp is set but not used */
+#if 0
       guint64 timestamp;
+#endif
 
       if (modplug->frequency == 0) {
         GST_DEBUG_OBJECT (modplug, "no song loaded yet");
         break;
       }
 
+#if 0
       timestamp = gst_util_uint64_scale_int (modplug->offset, GST_SECOND,
           modplug->frequency);
+#endif
 
       gst_event_parse_seek (event, &rate, &format, &flags,
           &cur_type, &cur, &stop_type, &stop);
diff --git a/ext/sndfile/gstsfsrc.c b/ext/sndfile/gstsfsrc.c
index f725d3f5b4..226f54085b 100644
--- a/ext/sndfile/gstsfsrc.c
+++ b/ext/sndfile/gstsfsrc.c
@@ -200,7 +200,10 @@ gst_sf_src_create (GstBaseSrc * bsrc, guint64 offset, guint length,
 {
   GstSFSrc *this;
   GstBuffer *buf;
+/* FIXME discont is set but not used */
+#if 0
   gboolean discont = FALSE;
+#endif
   sf_count_t bytes_read;
 
   this = GST_SF_SRC (bsrc);
@@ -221,7 +224,9 @@ gst_sf_src_create (GstBaseSrc * bsrc, guint64 offset, guint length,
       goto seek_failed;
 
     this->offset = offset;
+#if 0
     discont = TRUE;
+#endif
   }
 
   buf = gst_buffer_new_and_alloc (length);
diff --git a/ext/timidity/gsttimidity.c b/ext/timidity/gsttimidity.c
index 997b0b20b4..cbbcc0da16 100644
--- a/ext/timidity/gsttimidity.c
+++ b/ext/timidity/gsttimidity.c
@@ -108,12 +108,9 @@ gst_timidity_base_init (gpointer gclass)
 static void
 gst_timidity_class_init (GstTimidityClass * klass)
 {
-  GObjectClass *gobject_class;
   GstElementClass *gstelement_class;
 
-  gobject_class = (GObjectClass *) klass;
   gstelement_class = (GstElementClass *) klass;
-
   gstelement_class->change_state = gst_timidity_change_state;
 }
 
diff --git a/ext/timidity/gstwildmidi.c b/ext/timidity/gstwildmidi.c
index 4d5c0e36db..6def9f9460 100644
--- a/ext/timidity/gstwildmidi.c
+++ b/ext/timidity/gstwildmidi.c
@@ -443,7 +443,10 @@ gst_wildmidi_do_seek (GstWildmidi * wildmidi, GstEvent * event)
   GstSeekFlags flags;
   GstSeekType start_type, stop_type;
   gint64 start, stop;
-  gboolean flush, update, accurate;
+  gboolean flush, update;
+#ifdef HAVE_WILDMIDI_0_2_2
+  gboolean accurate;
+#endif
   gboolean res;
   unsigned long int sample;
   GstSegment *segment;
@@ -472,7 +475,9 @@ gst_wildmidi_do_seek (GstWildmidi * wildmidi, GstEvent * event)
     return res;
 
   flush = ((flags & GST_SEEK_FLAG_FLUSH) == GST_SEEK_FLAG_FLUSH);
+#ifdef HAVE_WILDMIDI_0_2_2
   accurate = ((flags & GST_SEEK_FLAG_ACCURATE) == GST_SEEK_FLAG_ACCURATE);
+#endif
 
   if (flush) {
     GST_DEBUG ("performing flush");
diff --git a/ext/zbar/gstzbar.c b/ext/zbar/gstzbar.c
index 9ffb8a0529..cdeb898890 100644
--- a/ext/zbar/gstzbar.c
+++ b/ext/zbar/gstzbar.c
@@ -277,7 +277,7 @@ gst_zbar_transform_ip (GstBaseTransform * base, GstBuffer * outbuf)
 {
   GstZBar *zbar = GST_ZBAR (base);
   guint8 *data;
-  guint size, rowstride;
+  guint rowstride;
   zbar_image_t *image;
   const zbar_symbol_t *symbol;
   int n;
@@ -286,7 +286,6 @@ gst_zbar_transform_ip (GstBaseTransform * base, GstBuffer * outbuf)
     goto done;
 
   data = GST_BUFFER_DATA (outbuf);
-  size = GST_BUFFER_SIZE (outbuf);
 
   image = zbar_image_create ();
 

From d0e8427b4e7735bf5abc5cff18a03483cee1d9b5 Mon Sep 17 00:00:00 2001
From: Edward Hervey <edward.hervey@collabora.co.uk>
Date: Wed, 20 Jul 2011 19:16:05 +0200
Subject: [PATCH 115/158] pesparse: Fix stuffing byte handling

We in fact get the size of the header (including stuffing bytes), therefore
use that instead of trying to skip 0xff bytes ourselves since some media
streams do start with 0xff (like mpeg audio's initial 0xfff).
---
 gst/mpegtsdemux/pesparse.c | 23 +++++++++++++----------
 gst/mpegtsdemux/pesparse.h |  2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/gst/mpegtsdemux/pesparse.c b/gst/mpegtsdemux/pesparse.c
index d68def388d..e5100688d0 100644
--- a/gst/mpegtsdemux/pesparse.c
+++ b/gst/mpegtsdemux/pesparse.c
@@ -52,6 +52,7 @@ mpegts_parse_pes_header (const guint8 * data, gsize length, PESHeader * res,
 {
   PESParsingResult ret = PES_PARSING_NEED_MORE;
   gsize origlength = length;
+  const guint8 *origdata = data;
   guint32 val32;
   guint8 val8, flags;
 
@@ -81,6 +82,8 @@ mpegts_parse_pes_header (const guint8 * data, gsize length, PESHeader * res,
   res->stream_id = val32 & 0x000000ff;
 
   res->packet_length = GST_READ_UINT16_BE (data);
+  if (res->packet_length)
+    res->packet_length += 6;
   data += 2;
   length -= 2;
 
@@ -122,11 +125,15 @@ mpegts_parse_pes_header (const guint8 * data, gsize length, PESHeader * res,
   GST_DEBUG ("PES_flag 0x%02x", flags);
 
   /* PES_header_data_length           8 */
-  val8 = *data++;
+  res->header_size = *data++;
   length -= 3;
-  if (G_UNLIKELY (length < val8))
+  if (G_UNLIKELY (length < res->header_size))
     goto need_more_data;
 
+  res->header_size += 9;        /* We add 9 since that's the offset
+                                 * of the field in the header*/
+  GST_DEBUG ("header_size : %d", res->header_size);
+
   /* PTS/DTS */
 
   /* PTS_DTS_flags == 0x01 is invalid */
@@ -231,6 +238,7 @@ mpegts_parse_pes_header (const guint8 * data, gsize length, PESHeader * res,
     length -= 2;
   }
 
+
   /* jump if we don't have a PES extension */
   if (!(flags & 0x01))
     goto stuffing_byte;
@@ -344,19 +352,14 @@ mpegts_parse_pes_header (const guint8 * data, gsize length, PESHeader * res,
   }
 
 stuffing_byte:
-  /* There can be no more than 32 stuff bytes */
-  while (length && *data == 0xff) {
-    data++;
-    length--;
-  }
+  /* Go to the expected data start position */
+  data = origdata + res->header_size;
+  length = origlength - res->header_size;
 
 done_parsing:
   GST_DEBUG ("origlength:%" G_GSSIZE_FORMAT ", length:%" G_GSSIZE_FORMAT,
       origlength, length);
 
-  /* Update the length based on parsed size */
-  if (res->packet_length)
-    res->packet_length += 6;
   res->header_size = origlength - length;
   *offset += res->header_size;
   ret = PES_PARSING_OK;
diff --git a/gst/mpegtsdemux/pesparse.h b/gst/mpegtsdemux/pesparse.h
index 0d5214671a..c5d295e393 100644
--- a/gst/mpegtsdemux/pesparse.h
+++ b/gst/mpegtsdemux/pesparse.h
@@ -58,7 +58,7 @@ typedef enum {
 
 typedef struct {
   guint8	stream_id;	/* See ID_* in gstmpegdefs.h */
-  guint16	packet_length;	/* The size of the remaining data
+  guint16	packet_length;	/* The size of the PES header and PES data
 				 * (if 0 => unbounded packet) */
   guint16	header_size;	/* The complete size of the PES header */
 

From f011e59943201e94eb53b532cf417f432d6ca287 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Wed, 20 Jul 2011 09:09:25 +0200
Subject: [PATCH 116/158] basevideoencoder: Add ::reset vfunc and handle
 ::reset/::finish the same way as in the decoder

---
 gst-libs/gst/video/gstbasevideoencoder.c | 19 ++++++++++++++++---
 gst-libs/gst/video/gstbasevideoencoder.h |  9 ++++++++-
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/gst-libs/gst/video/gstbasevideoencoder.c b/gst-libs/gst/video/gstbasevideoencoder.c
index f2e7584fe7..75e7a9935f 100644
--- a/gst-libs/gst/video/gstbasevideoencoder.c
+++ b/gst-libs/gst/video/gstbasevideoencoder.c
@@ -239,9 +239,9 @@ gst_base_video_encoder_drain (GstBaseVideoEncoder * enc)
     return TRUE;
   }
 
-  if (enc_class->finish) {
+  if (enc_class->reset) {
     GST_DEBUG_OBJECT (enc, "requesting subclass to finish");
-    ret = enc_class->finish (enc);
+    ret = enc_class->reset (enc);
   }
   /* everything should be away now */
   if (codec->frames) {
@@ -366,13 +366,26 @@ static gboolean
 gst_base_video_encoder_sink_eventfunc (GstBaseVideoEncoder * base_video_encoder,
     GstEvent * event)
 {
+  GstBaseVideoEncoderClass *base_video_encoder_class;
   gboolean ret = FALSE;
 
+  base_video_encoder_class =
+      GST_BASE_VIDEO_ENCODER_GET_CLASS (base_video_encoder);
+
   switch (GST_EVENT_TYPE (event)) {
     case GST_EVENT_EOS:
     {
+      GstFlowReturn flow_ret;
+
       base_video_encoder->a.at_eos = TRUE;
-      gst_base_video_encoder_drain (base_video_encoder);
+
+      if (base_video_encoder_class->finish) {
+        flow_ret = base_video_encoder_class->finish (base_video_encoder);
+      } else {
+        flow_ret = GST_FLOW_OK;
+      }
+
+      ret = (flow_ret == GST_BASE_VIDEO_ENCODER_FLOW_DROPPED);
       break;
     }
     case GST_EVENT_NEWSEGMENT:
diff --git a/gst-libs/gst/video/gstbasevideoencoder.h b/gst-libs/gst/video/gstbasevideoencoder.h
index 169c82fd0f..12865774a3 100644
--- a/gst-libs/gst/video/gstbasevideoencoder.h
+++ b/gst-libs/gst/video/gstbasevideoencoder.h
@@ -58,6 +58,12 @@ G_BEGIN_DECLS
  */
 #define GST_BASE_VIDEO_ENCODER_SRC_NAME     "src"
 
+/**
+ * GST_BASE_VIDEO_ENCODER_FLOW_DROPPED:
+ *
+ * Returned when the event/buffer should be dropped.
+ */
+#define GST_BASE_VIDEO_ENCODER_FLOW_DROPPED GST_FLOW_CUSTOM_SUCCESS_1
 
 typedef struct _GstBaseVideoEncoder GstBaseVideoEncoder;
 typedef struct _GstBaseVideoEncoderClass GstBaseVideoEncoderClass;
@@ -148,7 +154,8 @@ struct _GstBaseVideoEncoderClass
   GstFlowReturn (*handle_frame)       (GstBaseVideoEncoder *coder,
                                        GstVideoFrame *frame);
 
-  gboolean      (*finish)             (GstBaseVideoEncoder *coder);
+  gboolean      (*reset)              (GstBaseVideoEncoder *coder);
+  GstFlowReturn (*finish)             (GstBaseVideoEncoder *coder);
 
   GstFlowReturn (*shape_output)       (GstBaseVideoEncoder *coder,
                                        GstVideoFrame *frame);

From b2525a3044f7d3b118dfcfbfa4d0ec4a2ca86759 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Wed, 20 Jul 2011 09:25:28 +0200
Subject: [PATCH 117/158] basevideoencoder: Delay sending of serialized sink
 events until finish_frame()

---
 gst-libs/gst/video/gstbasevideoencoder.c | 49 +++++++++++++++++++++++-
 gst-libs/gst/video/gstbasevideoencoder.h |  1 +
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/gst-libs/gst/video/gstbasevideoencoder.c b/gst-libs/gst/video/gstbasevideoencoder.c
index 75e7a9935f..3919f9a909 100644
--- a/gst-libs/gst/video/gstbasevideoencoder.c
+++ b/gst-libs/gst/video/gstbasevideoencoder.c
@@ -188,6 +188,11 @@ gst_base_video_encoder_reset (GstBaseVideoEncoder * base_video_encoder)
     gst_event_unref (base_video_encoder->force_keyunit_event);
     base_video_encoder->force_keyunit_event = NULL;
   }
+
+  g_list_foreach (base_video_encoder->current_frame_events,
+      (GFunc) gst_event_unref, NULL);
+  g_list_free (base_video_encoder->current_frame_events);
+  base_video_encoder->current_frame_events = NULL;
 }
 
 static void
@@ -464,8 +469,27 @@ gst_base_video_encoder_sink_event (GstPad * pad, GstEvent * event)
   if (!handled)
     handled = gst_base_video_encoder_sink_eventfunc (enc, event);
 
-  if (!handled)
-    ret = gst_pad_event_default (pad, event);
+  if (!handled) {
+    /* Forward non-serialized events and EOS/FLUSH_STOP immediately.
+     * For EOS this is required because no buffer or serialized event
+     * will come after EOS and nothing could trigger another
+     * _finish_frame() call.   *
+     * If the subclass handles sending of EOS manually it can return
+     * _DROPPED from ::finish() and all other subclasses should have
+     * decoded/flushed all remaining data before this
+     *
+     * For FLUSH_STOP this is required because it is expected
+     * to be forwarded immediately and no buffers are queued anyway.
+     */
+    if (!GST_EVENT_IS_SERIALIZED (event)
+        || GST_EVENT_TYPE (event) == GST_EVENT_EOS
+        || GST_EVENT_TYPE (event) == GST_EVENT_FLUSH_STOP) {
+      ret = gst_pad_push_event (enc->base_video_codec.srcpad, event);
+    } else {
+      enc->current_frame_events =
+          g_list_prepend (enc->current_frame_events, event);
+    }
+  }
 
   GST_DEBUG_OBJECT (enc, "event handled");
 
@@ -641,6 +665,8 @@ gst_base_video_encoder_chain (GstPad * pad, GstBuffer * buf)
   frame =
       gst_base_video_codec_new_frame (GST_BASE_VIDEO_CODEC
       (base_video_encoder));
+  frame->events = base_video_encoder->current_frame_events;
+  base_video_encoder->current_frame_events = NULL;
   frame->sink_buffer = buf;
   frame->presentation_timestamp = GST_BUFFER_TIMESTAMP (buf);
   frame->presentation_duration = GST_BUFFER_DURATION (buf);
@@ -724,6 +750,7 @@ gst_base_video_encoder_finish_frame (GstBaseVideoEncoder * base_video_encoder,
 {
   GstFlowReturn ret;
   GstBaseVideoEncoderClass *base_video_encoder_class;
+  GList *l;
 
   g_return_val_if_fail (frame->src_buffer != NULL, GST_FLOW_ERROR);
 
@@ -798,6 +825,24 @@ gst_base_video_encoder_finish_frame (GstBaseVideoEncoder * base_video_encoder,
   gst_buffer_set_caps (GST_BUFFER (frame->src_buffer),
       GST_PAD_CAPS (GST_BASE_VIDEO_CODEC_SRC_PAD (base_video_encoder)));
 
+  /* Push all pending events that arrived before this frame */
+  for (l = base_video_encoder->base_video_codec.frames; l; l = l->next) {
+    GstVideoFrame *tmp = l->data;
+
+    if (tmp->events) {
+      GList *k;
+
+      for (k = g_list_last (tmp->events); k; k = k->prev)
+        gst_pad_push_event (GST_BASE_VIDEO_CODEC_SRC_PAD (base_video_encoder),
+            k->data);
+      g_list_free (tmp->events);
+      tmp->events = NULL;
+    }
+
+    if (tmp == frame)
+      break;
+  }
+
   if (frame->force_keyframe) {
     GstClockTime stream_time;
     GstClockTime running_time;
diff --git a/gst-libs/gst/video/gstbasevideoencoder.h b/gst-libs/gst/video/gstbasevideoencoder.h
index 12865774a3..e1dd03be13 100644
--- a/gst-libs/gst/video/gstbasevideoencoder.h
+++ b/gst-libs/gst/video/gstbasevideoencoder.h
@@ -96,6 +96,7 @@ struct _GstBaseVideoEncoder
   gint64            max_latency;
 
   GstEvent         *force_keyunit_event;
+  GList            *current_frame_events;
 
   union {
     void *padding;

From e5be8aa8ff0b3fe22cc404dc740808c83ccb01fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Wed, 20 Jul 2011 08:39:51 +0000
Subject: [PATCH 118/158] basevideoencoder: Only get caps from the subclass if
 they were not set yet by the subclass

---
 gst-libs/gst/video/gstbasevideoencoder.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/gst-libs/gst/video/gstbasevideoencoder.c b/gst-libs/gst/video/gstbasevideoencoder.c
index 3919f9a909..afc060c353 100644
--- a/gst-libs/gst/video/gstbasevideoencoder.c
+++ b/gst-libs/gst/video/gstbasevideoencoder.c
@@ -809,16 +809,19 @@ gst_base_video_encoder_finish_frame (GstBaseVideoEncoder * base_video_encoder,
    * and subsequently set.  subclass is adult enough to set_caps itself ...
    * so simply check/ensure/assert that src pad caps are set by now */
   if (!base_video_encoder->set_output_caps) {
-    GstCaps *caps;
+    if (!GST_PAD_CAPS (GST_BASE_VIDEO_CODEC_SRC_PAD (base_video_encoder))) {
+      GstCaps *caps;
 
-    if (base_video_encoder_class->get_caps) {
-      caps = base_video_encoder_class->get_caps (base_video_encoder);
-    } else {
-      caps = gst_caps_new_simple ("video/unknown", NULL);
+      if (base_video_encoder_class->get_caps) {
+        caps = base_video_encoder_class->get_caps (base_video_encoder);
+      } else {
+        caps = gst_caps_new_simple ("video/unknown", NULL);
+      }
+      GST_DEBUG_OBJECT (base_video_encoder, "src caps %" GST_PTR_FORMAT, caps);
+      gst_pad_set_caps (GST_BASE_VIDEO_CODEC_SRC_PAD (base_video_encoder),
+          caps);
+      gst_caps_unref (caps);
     }
-    GST_DEBUG_OBJECT (base_video_encoder, "src caps %" GST_PTR_FORMAT, caps);
-    gst_pad_set_caps (GST_BASE_VIDEO_CODEC_SRC_PAD (base_video_encoder), caps);
-    gst_caps_unref (caps);
     base_video_encoder->set_output_caps = TRUE;
   }
 

From 976d372f9b6256bb39dd067b638e6fc96e382309 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Thu, 21 Jul 2011 05:44:10 +0000
Subject: [PATCH 119/158] basevideoencoder: Allow finishing of frames with no
 src_buffer to drop/free the GstVideoFrame

---
 gst-libs/gst/video/gstbasevideoencoder.c | 113 ++++++++++++-----------
 1 file changed, 60 insertions(+), 53 deletions(-)

diff --git a/gst-libs/gst/video/gstbasevideoencoder.c b/gst-libs/gst/video/gstbasevideoencoder.c
index afc060c353..4fbd0b7978 100644
--- a/gst-libs/gst/video/gstbasevideoencoder.c
+++ b/gst-libs/gst/video/gstbasevideoencoder.c
@@ -738,7 +738,8 @@ gst_base_video_encoder_change_state (GstElement * element,
  * @frame: an encoded #GstVideoFrame 
  *
  * @frame must have a valid encoded data buffer, whose metadata fields
- * are then appropriately set according to frame data.
+ * are then appropriately set according to frame data or no buffer at
+ * all if the frame should be dropped.
  * It is subsequently pushed downstream or provided to @shape_output.
  * In any case, the frame is considered finished and released.
  *
@@ -748,62 +749,16 @@ GstFlowReturn
 gst_base_video_encoder_finish_frame (GstBaseVideoEncoder * base_video_encoder,
     GstVideoFrame * frame)
 {
-  GstFlowReturn ret;
+  GstFlowReturn ret = GST_FLOW_OK;
   GstBaseVideoEncoderClass *base_video_encoder_class;
   GList *l;
 
-  g_return_val_if_fail (frame->src_buffer != NULL, GST_FLOW_ERROR);
-
   base_video_encoder_class =
       GST_BASE_VIDEO_ENCODER_GET_CLASS (base_video_encoder);
 
   GST_LOG_OBJECT (base_video_encoder,
       "finish frame fpn %d", frame->presentation_frame_number);
 
-  if (frame->is_sync_point) {
-    GST_LOG_OBJECT (base_video_encoder, "key frame");
-    base_video_encoder->distance_from_sync = 0;
-    GST_BUFFER_FLAG_UNSET (frame->src_buffer, GST_BUFFER_FLAG_DELTA_UNIT);
-  } else {
-    GST_BUFFER_FLAG_SET (frame->src_buffer, GST_BUFFER_FLAG_DELTA_UNIT);
-  }
-
-  frame->distance_from_sync = base_video_encoder->distance_from_sync;
-  base_video_encoder->distance_from_sync++;
-
-  frame->decode_frame_number = frame->system_frame_number - 1;
-  if (frame->decode_frame_number < 0) {
-    frame->decode_timestamp = 0;
-  } else {
-    frame->decode_timestamp = gst_util_uint64_scale (frame->decode_frame_number,
-        GST_SECOND * GST_BASE_VIDEO_CODEC (base_video_encoder)->state.fps_d,
-        GST_BASE_VIDEO_CODEC (base_video_encoder)->state.fps_n);
-  }
-
-  GST_BUFFER_TIMESTAMP (frame->src_buffer) = frame->presentation_timestamp;
-  GST_BUFFER_DURATION (frame->src_buffer) = frame->presentation_duration;
-  GST_BUFFER_OFFSET (frame->src_buffer) = frame->decode_timestamp;
-
-  /* update rate estimate */
-  GST_BASE_VIDEO_CODEC (base_video_encoder)->bytes +=
-      GST_BUFFER_SIZE (frame->src_buffer);
-  if (GST_CLOCK_TIME_IS_VALID (frame->presentation_duration)) {
-    GST_BASE_VIDEO_CODEC (base_video_encoder)->time +=
-        frame->presentation_duration;
-  } else {
-    /* better none than nothing valid */
-    GST_BASE_VIDEO_CODEC (base_video_encoder)->time = GST_CLOCK_TIME_NONE;
-  }
-
-  if (G_UNLIKELY (GST_BASE_VIDEO_CODEC (base_video_encoder)->discont)) {
-    GST_LOG_OBJECT (base_video_encoder, "marking discont");
-    GST_BUFFER_FLAG_SET (frame->src_buffer, GST_BUFFER_FLAG_DISCONT);
-    GST_BASE_VIDEO_CODEC (base_video_encoder)->discont = FALSE;
-  }
-
-  GST_BASE_VIDEO_CODEC (base_video_encoder)->frames =
-      g_list_remove (GST_BASE_VIDEO_CODEC (base_video_encoder)->frames, frame);
-
   /* FIXME get rid of this ?
    * seems a roundabout way that adds little benefit to simply get
    * and subsequently set.  subclass is adult enough to set_caps itself ...
@@ -825,9 +780,6 @@ gst_base_video_encoder_finish_frame (GstBaseVideoEncoder * base_video_encoder,
     base_video_encoder->set_output_caps = TRUE;
   }
 
-  gst_buffer_set_caps (GST_BUFFER (frame->src_buffer),
-      GST_PAD_CAPS (GST_BASE_VIDEO_CODEC_SRC_PAD (base_video_encoder)));
-
   /* Push all pending events that arrived before this frame */
   for (l = base_video_encoder->base_video_codec.frames; l; l = l->next) {
     GstVideoFrame *tmp = l->data;
@@ -880,6 +832,57 @@ gst_base_video_encoder_finish_frame (GstBaseVideoEncoder * base_video_encoder,
     gst_pad_push_event (GST_BASE_VIDEO_CODEC_SRC_PAD (base_video_encoder), ev);
   }
 
+  /* no buffer data means this frame is skipped/dropped */
+  if (!frame->src_buffer) {
+    GST_DEBUG_OBJECT (base_video_encoder, "skipping frame %" GST_TIME_FORMAT,
+        GST_TIME_ARGS (frame->presentation_timestamp));
+    goto done;
+  }
+
+  if (frame->is_sync_point) {
+    GST_LOG_OBJECT (base_video_encoder, "key frame");
+    base_video_encoder->distance_from_sync = 0;
+    GST_BUFFER_FLAG_UNSET (frame->src_buffer, GST_BUFFER_FLAG_DELTA_UNIT);
+  } else {
+    GST_BUFFER_FLAG_SET (frame->src_buffer, GST_BUFFER_FLAG_DELTA_UNIT);
+  }
+
+  frame->distance_from_sync = base_video_encoder->distance_from_sync;
+  base_video_encoder->distance_from_sync++;
+
+  frame->decode_frame_number = frame->system_frame_number - 1;
+  if (frame->decode_frame_number < 0) {
+    frame->decode_timestamp = 0;
+  } else {
+    frame->decode_timestamp = gst_util_uint64_scale (frame->decode_frame_number,
+        GST_SECOND * GST_BASE_VIDEO_CODEC (base_video_encoder)->state.fps_d,
+        GST_BASE_VIDEO_CODEC (base_video_encoder)->state.fps_n);
+  }
+
+  GST_BUFFER_TIMESTAMP (frame->src_buffer) = frame->presentation_timestamp;
+  GST_BUFFER_DURATION (frame->src_buffer) = frame->presentation_duration;
+  GST_BUFFER_OFFSET (frame->src_buffer) = frame->decode_timestamp;
+
+  /* update rate estimate */
+  GST_BASE_VIDEO_CODEC (base_video_encoder)->bytes +=
+      GST_BUFFER_SIZE (frame->src_buffer);
+  if (GST_CLOCK_TIME_IS_VALID (frame->presentation_duration)) {
+    GST_BASE_VIDEO_CODEC (base_video_encoder)->time +=
+        frame->presentation_duration;
+  } else {
+    /* better none than nothing valid */
+    GST_BASE_VIDEO_CODEC (base_video_encoder)->time = GST_CLOCK_TIME_NONE;
+  }
+
+  if (G_UNLIKELY (GST_BASE_VIDEO_CODEC (base_video_encoder)->discont)) {
+    GST_LOG_OBJECT (base_video_encoder, "marking discont");
+    GST_BUFFER_FLAG_SET (frame->src_buffer, GST_BUFFER_FLAG_DISCONT);
+    GST_BASE_VIDEO_CODEC (base_video_encoder)->discont = FALSE;
+  }
+
+  gst_buffer_set_caps (GST_BUFFER (frame->src_buffer),
+      GST_PAD_CAPS (GST_BASE_VIDEO_CODEC_SRC_PAD (base_video_encoder)));
+
   if (base_video_encoder_class->shape_output) {
     ret = base_video_encoder_class->shape_output (base_video_encoder, frame);
   } else {
@@ -887,9 +890,13 @@ gst_base_video_encoder_finish_frame (GstBaseVideoEncoder * base_video_encoder,
         gst_pad_push (GST_BASE_VIDEO_CODEC_SRC_PAD (base_video_encoder),
         frame->src_buffer);
   }
-
-  /* handed out */
   frame->src_buffer = NULL;
+
+done:
+  /* handed out */
+  GST_BASE_VIDEO_CODEC (base_video_encoder)->frames =
+      g_list_remove (GST_BASE_VIDEO_CODEC (base_video_encoder)->frames, frame);
+
   gst_base_video_codec_free_frame (frame);
 
   return ret;

From 1333ef9bbf72f3dde88adbc862d78a7622b2ef9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Thu, 21 Jul 2011 08:03:27 +0200
Subject: [PATCH 120/158] diracenc: Update for GstBaseVideoEncoder::finish()
 signature change

---
 ext/dirac/gstdiracenc.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ext/dirac/gstdiracenc.cc b/ext/dirac/gstdiracenc.cc
index 7239ccf278..c42fc17eb4 100644
--- a/ext/dirac/gstdiracenc.cc
+++ b/ext/dirac/gstdiracenc.cc
@@ -150,7 +150,7 @@ static gboolean gst_dirac_enc_set_format (GstBaseVideoEncoder *
     base_video_encoder, GstVideoState * state);
 static gboolean gst_dirac_enc_start (GstBaseVideoEncoder * base_video_encoder);
 static gboolean gst_dirac_enc_stop (GstBaseVideoEncoder * base_video_encoder);
-static gboolean gst_dirac_enc_finish (GstBaseVideoEncoder * base_video_encoder);
+static GstFlowReturn gst_dirac_enc_finish (GstBaseVideoEncoder * base_video_encoder);
 static GstFlowReturn gst_dirac_enc_handle_frame (GstBaseVideoEncoder *
     base_video_encoder, GstVideoFrame * frame);
 static GstFlowReturn gst_dirac_enc_shape_output (GstBaseVideoEncoder *
@@ -842,7 +842,7 @@ gst_dirac_enc_stop (GstBaseVideoEncoder * base_video_encoder)
   return TRUE;
 }
 
-static gboolean
+static GstFlowReturn
 gst_dirac_enc_finish (GstBaseVideoEncoder * base_video_encoder)
 {
   GstDiracEnc *dirac_enc = GST_DIRAC_ENC (base_video_encoder);
@@ -851,7 +851,7 @@ gst_dirac_enc_finish (GstBaseVideoEncoder * base_video_encoder)
 
   gst_dirac_enc_process (dirac_enc, TRUE);
 
-  return TRUE;
+  return GST_FLOW_OK;
 }
 
 static GstFlowReturn

From 43e575319e5caf882191382f658dc720b3dcfea9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Thu, 21 Jul 2011 08:03:51 +0200
Subject: [PATCH 121/158] vp8enc: Update for GstBaseVideoEncoder::finish()
 signature change

---
 ext/vp8/gstvp8enc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ext/vp8/gstvp8enc.c b/ext/vp8/gstvp8enc.c
index ef278d586c..e3903d97fc 100644
--- a/ext/vp8/gstvp8enc.c
+++ b/ext/vp8/gstvp8enc.c
@@ -799,7 +799,7 @@ gst_vp8_enc_process (GstVP8Enc * encoder)
   return ret;
 }
 
-static gboolean
+static GstFlowReturn
 gst_vp8_enc_finish (GstBaseVideoEncoder * base_video_encoder)
 {
   GstVP8Enc *encoder;
@@ -816,7 +816,7 @@ gst_vp8_enc_finish (GstBaseVideoEncoder * base_video_encoder)
   if (status != 0) {
     GST_ERROR_OBJECT (encoder, "encode returned %d %s", status,
         gst_vpx_error_name (status));
-    return FALSE;
+    return GST_FLOW_ERROR;
   }
 
   /* dispatch remaining frames */
@@ -835,7 +835,7 @@ gst_vp8_enc_finish (GstBaseVideoEncoder * base_video_encoder)
     }
   }
 
-  return TRUE;
+  return GST_FLOW_OK;
 }
 
 static vpx_image_t *

From 8ba4f9178f7dee5145848a819349b1cc1413e653 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Thu, 21 Jul 2011 08:04:11 +0200
Subject: [PATCH 122/158] schroenc: Update for GstBaseVideoEncoder::finish()
 signature change

---
 ext/schroedinger/gstschroenc.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ext/schroedinger/gstschroenc.c b/ext/schroedinger/gstschroenc.c
index 3dbe9fe991..669a612648 100644
--- a/ext/schroedinger/gstschroenc.c
+++ b/ext/schroedinger/gstschroenc.c
@@ -108,7 +108,8 @@ static gboolean gst_schro_enc_set_format (GstBaseVideoEncoder *
     base_video_encoder, GstVideoState * state);
 static gboolean gst_schro_enc_start (GstBaseVideoEncoder * base_video_encoder);
 static gboolean gst_schro_enc_stop (GstBaseVideoEncoder * base_video_encoder);
-static gboolean gst_schro_enc_finish (GstBaseVideoEncoder * base_video_encoder);
+static GstFlowReturn gst_schro_enc_finish (GstBaseVideoEncoder *
+    base_video_encoder);
 static GstFlowReturn gst_schro_enc_handle_frame (GstBaseVideoEncoder *
     base_video_encoder, GstVideoFrame * frame);
 static GstFlowReturn gst_schro_enc_shape_output (GstBaseVideoEncoder *
@@ -440,7 +441,7 @@ gst_schro_enc_stop (GstBaseVideoEncoder * base_video_encoder)
   return TRUE;
 }
 
-static gboolean
+static GstFlowReturn
 gst_schro_enc_finish (GstBaseVideoEncoder * base_video_encoder)
 {
   GstSchroEnc *schro_enc = GST_SCHRO_ENC (base_video_encoder);
@@ -450,7 +451,7 @@ gst_schro_enc_finish (GstBaseVideoEncoder * base_video_encoder)
   schro_encoder_end_of_stream (schro_enc->encoder);
   gst_schro_enc_process (schro_enc);
 
-  return TRUE;
+  return GST_FLOW_OK;
 }
 
 static GstFlowReturn

From a34ea4aaae4e4df5535b8327c7d26e732e6769f5 Mon Sep 17 00:00:00 2001
From: Thiago Santos <thiago.sousa.santos@collabora.co.uk>
Date: Fri, 22 Jul 2011 11:38:30 +0300
Subject: [PATCH 123/158] camerabin2: If location is NULL do not encode images

Using a NULL string for location means that the application
doesn't want the image to be encoded, but wants to receive
the preview image. (Only works for image captures)

Useful for application that want the capture in memory only, like
displaying to the user before it choses to encode or take another
picture in avatar capturing scenarios.

https://bugzilla.gnome.org/show_bug.cgi?id=641918
---
 gst/camerabin2/gstcamerabin2.c | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/gst/camerabin2/gstcamerabin2.c b/gst/camerabin2/gstcamerabin2.c
index b164ef962f..555156529f 100644
--- a/gst/camerabin2/gstcamerabin2.c
+++ b/gst/camerabin2/gstcamerabin2.c
@@ -232,7 +232,7 @@ gst_camera_bin_start_capture (GstCameraBin2 * camerabin)
   GST_DEBUG_OBJECT (camerabin, "Received start-capture");
 
   /* check that we have a valid location */
-  if (camerabin->location == NULL) {
+  if (camerabin->mode == MODE_VIDEO && camerabin->location == NULL) {
     GST_ELEMENT_ERROR (camerabin, RESOURCE, OPEN_WRITE,
         (_("File location is set to NULL, please set it to a valid filename")),
         (NULL));
@@ -256,11 +256,12 @@ gst_camera_bin_start_capture (GstCameraBin2 * camerabin)
       gst_element_sync_state_with_parent (camerabin->audio_volume);
     }
   } else {
-    gchar *location;
+    gchar *location = NULL;
 
     /* store the next capture buffer filename */
-    location =
-        g_strdup_printf (camerabin->location, camerabin->capture_index++);
+    if (camerabin->location)
+      location =
+          g_strdup_printf (camerabin->location, camerabin->capture_index++);
     camerabin->image_location_list =
         g_slist_append (camerabin->image_location_list, location);
   }
@@ -978,6 +979,7 @@ static gboolean
 gst_camera_bin_image_src_buffer_probe (GstPad * pad, GstBuffer * buf,
     gpointer data)
 {
+  gboolean ret = TRUE;
   GstCameraBin2 *camerabin = data;
   GstEvent *evt;
   gchar *location = NULL;
@@ -988,20 +990,27 @@ gst_camera_bin_image_src_buffer_probe (GstPad * pad, GstBuffer * buf,
     camerabin->image_location_list =
         g_slist_delete_link (camerabin->image_location_list,
         camerabin->image_location_list);
-    GST_DEBUG_OBJECT (camerabin, "Sending image location change to %s",
+    GST_DEBUG_OBJECT (camerabin, "Sending image location change to '%s'",
         location);
   } else {
     GST_DEBUG_OBJECT (camerabin, "No filename location change to send");
-    return TRUE;
+    return ret;
   }
 
-  evt = gst_camera_bin_new_event_file_location (location);
-  peer = gst_pad_get_peer (pad);
-  gst_pad_send_event (peer, evt);
-  g_free (location);
-  gst_object_unref (peer);
+  if (location) {
+    evt = gst_camera_bin_new_event_file_location (location);
+    peer = gst_pad_get_peer (pad);
+    gst_pad_send_event (peer, evt);
+    gst_object_unref (peer);
+    g_free (location);
+  } else {
+    /* This means we don't have to encode the capture, it is used for
+     * signaling the application just wants the preview */
+    ret = FALSE;
+    GST_CAMERA_BIN2_PROCESSING_DEC (camerabin);
+  }
 
-  return TRUE;
+  return ret;
 }
 
 

From b50d50a9c2e4061e027a7e476801319940e3c915 Mon Sep 17 00:00:00 2001
From: Raluca Elena Podiuc <ralucaelena1985@gmail.com>
Date: Fri, 22 Jul 2011 12:26:07 +0300
Subject: [PATCH 124/158] camerabin2: add location=NULL docs to PORTING

https://bugzilla.gnome.org/show_bug.cgi?id=641918
---
 gst/camerabin2/PORTING | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gst/camerabin2/PORTING b/gst/camerabin2/PORTING
index be99ffce5d..322a7d8b79 100644
--- a/gst/camerabin2/PORTING
+++ b/gst/camerabin2/PORTING
@@ -26,6 +26,8 @@ property and encodebin manages to instantiate the elements for the format.
 
 * Previews
 new "post-previews" property for enabling/disabling preview image posting
+set location=NULL to skip writing image to file but to receive the preview,
+useful for scenarios that wants the image in memory.
 
 * Configuring resolution and framerate
 Camerabin2 has new GstCaps type properties for configuring capture and

From 634d29cd88fad2c0fb1229f7571a62932bf111cf Mon Sep 17 00:00:00 2001
From: Edward Hervey <edward.hervey@collabora.co.uk>
Date: Thu, 21 Jul 2011 13:26:55 +0200
Subject: [PATCH 125/158] mpegtsbase/tsdemux: Fix stream/pad activation order

We first activate new streams before shutting down old ones.
We emit no-more-pads after we add new streams and emit EOS before
removing old ones.
Also cleanup/refactor a bit more of the code accordingly
---
 gst/mpegtsdemux/mpegtsbase.c | 315 +++++++++++++++++++++++------------
 gst/mpegtsdemux/mpegtsbase.h |   3 +
 gst/mpegtsdemux/tsdemux.c    |  44 +++--
 3 files changed, 237 insertions(+), 125 deletions(-)

diff --git a/gst/mpegtsdemux/mpegtsbase.c b/gst/mpegtsdemux/mpegtsbase.c
index 46e06cb127..ac4b6157a0 100644
--- a/gst/mpegtsdemux/mpegtsbase.c
+++ b/gst/mpegtsdemux/mpegtsbase.c
@@ -331,6 +331,35 @@ mpegts_get_descriptor_from_stream (MpegTSBaseStream * stream, guint8 tag)
   return retval;
 }
 
+typedef struct
+{
+  gboolean res;
+  guint16 pid;
+} PIDLookup;
+
+static void
+foreach_pid_in_program (gpointer key, MpegTSBaseProgram * program,
+    PIDLookup * lookup)
+{
+  if (!program->active)
+    return;
+  if (program->streams[lookup->pid])
+    lookup->res = TRUE;
+}
+
+static gboolean
+mpegts_pid_in_active_programs (MpegTSBase * base, guint16 pid)
+{
+  PIDLookup lookup;
+
+  lookup.res = FALSE;
+  lookup.pid = pid;
+  g_hash_table_foreach (base->programs, (GHFunc) foreach_pid_in_program,
+      &lookup);
+
+  return lookup.res;
+}
+
 /* returns NULL if no matching descriptor found *
  * otherwise returns a descriptor that needs to *
  * be freed */
@@ -363,8 +392,8 @@ mpegts_get_descriptor_from_program (MpegTSBaseProgram * program, guint8 tag)
   return retval;
 }
 
-MpegTSBaseProgram *
-mpegts_base_add_program (MpegTSBase * base,
+static MpegTSBaseProgram *
+mpegts_base_new_program (MpegTSBase * base,
     gint program_number, guint16 pmt_pid)
 {
   MpegTSBaseProgram *program;
@@ -379,6 +408,23 @@ mpegts_base_add_program (MpegTSBase * base,
   program->streams = g_new0 (MpegTSBaseStream *, 0x2000);
   program->patcount = 0;
 
+  return program;
+}
+
+MpegTSBaseProgram *
+mpegts_base_add_program (MpegTSBase * base,
+    gint program_number, guint16 pmt_pid)
+{
+  MpegTSBaseProgram *program;
+
+  GST_DEBUG_OBJECT (base, "program_number : %d, pmt_pid : %d",
+      program_number, pmt_pid);
+
+  program = mpegts_base_new_program (base, program_number, pmt_pid);
+
+  /* Mark the PMT PID as being a known PSI PID */
+  MPEGTS_BIT_SET (base->known_psi, pmt_pid);
+
   g_hash_table_insert (base->programs,
       GINT_TO_POINTER (program_number), program);
 
@@ -396,42 +442,21 @@ mpegts_base_get_program (MpegTSBase * base, gint program_number)
   return program;
 }
 
-#if 0
-static GstPad *
-mpegts_base_activate_program (MpegTSBase * base, MpegTSBaseProgram * program)
+static MpegTSBaseProgram *
+mpegts_base_steal_program (MpegTSBase * base, gint program_number)
 {
-  MpegTSBasePad *tspad;
-  gchar *pad_name;
+  MpegTSBaseProgram *program;
 
-  pad_name = g_strdup_printf ("program_%d", program->program_number);
+  program = (MpegTSBaseProgram *) g_hash_table_lookup (base->programs,
+      GINT_TO_POINTER ((gint) program_number));
 
-  tspad = mpegts_base_create_tspad (base, pad_name);
-  tspad->program_number = program->program_number;
-  tspad->program = program;
-  program->tspad = tspad;
-  g_free (pad_name);
-  gst_pad_set_active (tspad->pad, TRUE);
-  program->active = TRUE;
+  if (program)
+    g_hash_table_steal (base->programs,
+        GINT_TO_POINTER ((gint) program_number));
 
-  return tspad->pad;
+  return program;
 }
 
-static GstPad *
-mpegts_base_deactivate_program (MpegTSBase * base, MpegTSBaseProgram * program)
-{
-  MpegTSBasePad *tspad;
-
-  tspad = program->tspad;
-  gst_pad_set_active (tspad->pad, FALSE);
-  program->active = FALSE;
-
-  /* tspad will be destroyed in GstElementClass::pad_removed */
-
-  return tspad->pad;
-}
-#endif
-
-
 static void
 mpegts_base_free_program (MpegTSBaseProgram * program)
 {
@@ -453,6 +478,8 @@ mpegts_base_free_program (MpegTSBaseProgram * program)
   g_free (program);
 }
 
+/* FIXME : This is being called by tsdemux::find_timestamps()
+ * We need to avoid re-entrant code like that */
 void
 mpegts_base_remove_program (MpegTSBase * base, gint program_number)
 {
@@ -482,6 +509,11 @@ mpegts_base_program_add_stream (MpegTSBase * base,
   GST_DEBUG ("pid:0x%04x, stream_type:0x%03x, stream_info:%" GST_PTR_FORMAT,
       pid, stream_type, stream_info);
 
+  if (G_UNLIKELY (program->streams[pid])) {
+    GST_WARNING ("Stream already present !");
+    return NULL;
+  }
+
   stream = g_malloc0 (base->stream_size);
   stream->pid = pid;
   stream->stream_type = stream_type;
@@ -529,39 +561,108 @@ mpegts_base_program_remove_stream (MpegTSBase * base,
 }
 
 static void
-mpegts_base_deactivate_pmt (MpegTSBase * base, MpegTSBaseProgram * program)
+mpegts_base_deactivate_program (MpegTSBase * base, MpegTSBaseProgram * program)
 {
-  gint i;
+  gint i, nbstreams;
   guint pid;
-  guint stream_type;
   GstStructure *stream;
   const GValue *streams;
   const GValue *value;
   MpegTSBaseClass *klass = GST_MPEGTS_BASE_GET_CLASS (base);
 
+  if (G_UNLIKELY (program->active == FALSE))
+    return;
+
   GST_DEBUG_OBJECT (base, "Deactivating PMT");
 
+  program->active = FALSE;
+
   if (program->pmt_info) {
     /* Inform subclasses we're deactivating this program */
     if (klass->program_stopped)
       klass->program_stopped (base, program);
 
     streams = gst_structure_id_get_value (program->pmt_info, QUARK_STREAMS);
+    nbstreams = gst_value_list_get_size (streams);
 
-    for (i = 0; i < gst_value_list_get_size (streams); ++i) {
+    for (i = 0; i < nbstreams; ++i) {
       value = gst_value_list_get_value (streams, i);
       stream = g_value_get_boxed (value);
-      gst_structure_id_get (stream, QUARK_PID, G_TYPE_UINT, &pid,
-          QUARK_STREAM_TYPE, G_TYPE_UINT, &stream_type, NULL);
+
+      gst_structure_id_get (stream, QUARK_PID, G_TYPE_UINT, &pid, NULL);
       mpegts_base_program_remove_stream (base, program, (guint16) pid);
-      MPEGTS_BIT_UNSET (base->is_pes, pid);
+
+      /* Only unset the is_pes bit if the PID isn't used in any other active
+       * program */
+      if (!mpegts_pid_in_active_programs (base, pid))
+        MPEGTS_BIT_UNSET (base->is_pes, pid);
     }
+
     /* remove pcr stream */
+    /* FIXME : This might actually be shared with another stream ? */
     mpegts_base_program_remove_stream (base, program, program->pcr_pid);
-    MPEGTS_BIT_UNSET (base->is_pes, program->pcr_pid);
+    if (!mpegts_pid_in_active_programs (base, program->pcr_pid))
+      MPEGTS_BIT_UNSET (base->is_pes, program->pcr_pid);
+
+    GST_DEBUG ("program stream_list is now %p", program->stream_list);
   }
 }
 
+static void
+mpegts_base_activate_program (MpegTSBase * base, MpegTSBaseProgram * program,
+    guint16 pmt_pid, GstStructure * pmt_info)
+{
+  guint i, nbstreams;
+  guint pcr_pid;
+  guint pid;
+  guint16 stream_type;
+  GstStructure *stream;
+  const GValue *new_streams;
+  const GValue *value;
+  MpegTSBaseClass *klass;
+
+  if (G_UNLIKELY (program->active))
+    return;
+
+  GST_DEBUG ("Activating program %d", program->program_number);
+
+  gst_structure_id_get (pmt_info, QUARK_PCR_PID, G_TYPE_UINT, &pcr_pid, NULL);
+
+  /* activate new pmt */
+  if (program->pmt_info)
+    gst_structure_free (program->pmt_info);
+  program->pmt_info = gst_structure_copy (pmt_info);
+  program->pmt_pid = pmt_pid;
+  program->pcr_pid = pcr_pid;
+
+  new_streams = gst_structure_id_get_value (pmt_info, QUARK_STREAMS);
+  nbstreams = gst_value_list_get_size (new_streams);
+
+  for (i = 0; i < nbstreams; ++i) {
+    value = gst_value_list_get_value (new_streams, i);
+    stream = g_value_get_boxed (value);
+
+    gst_structure_id_get (stream, QUARK_PID, G_TYPE_UINT, &pid,
+        QUARK_STREAM_TYPE, G_TYPE_UINT, &stream_type, NULL);
+    MPEGTS_BIT_SET (base->is_pes, pid);
+    mpegts_base_program_add_stream (base, program,
+        (guint16) pid, (guint8) stream_type, stream);
+
+  }
+  /* We add the PCR pid last. If that PID is already used by one of the media
+   * streams above, no new stream will be created */
+  mpegts_base_program_add_stream (base, program, (guint16) pcr_pid, -1, NULL);
+  MPEGTS_BIT_SET (base->is_pes, pcr_pid);
+
+
+  program->active = TRUE;
+
+  klass = GST_MPEGTS_BASE_GET_CLASS (base);
+  if (klass->program_started != NULL)
+    klass->program_started (base, program);
+
+  GST_DEBUG_OBJECT (base, "new pmt %" GST_PTR_FORMAT, pmt_info);
+}
 
 gboolean
 mpegts_base_is_psi (MpegTSBase * base, MpegTSPacketizerPacket * packet)
@@ -628,22 +729,32 @@ mpegts_base_apply_pat (MpegTSBase * base, GstStructure * pat_info)
   guint program_number;
   guint pid;
   MpegTSBaseProgram *program;
-  gint i;
+  gint i, nbprograms;
   const GValue *programs;
-  MpegTSBaseClass *klass = GST_MPEGTS_BASE_GET_CLASS (base);
+
+  GST_INFO_OBJECT (base, "PAT %" GST_PTR_FORMAT, pat_info);
+
+  /* Applying a new PAT does two things:
+   * * It adds the new programs to the list of programs this element handles
+   *   and increments at the same time the number of times a program is referenced.
+   *
+   * * If there was a previously active PAT, It decrements the reference count
+   *   of all program it used. If a program is no longer needed, it is removed.
+   */
 
   old_pat = base->pat;
   base->pat = gst_structure_copy (pat_info);
 
-  GST_INFO_OBJECT (base, "PAT %" GST_PTR_FORMAT, pat_info);
-
   gst_element_post_message (GST_ELEMENT_CAST (base),
       gst_message_new_element (GST_OBJECT (base),
           gst_structure_copy (pat_info)));
 
-  programs = gst_structure_id_get_value (pat_info, QUARK_PROGRAMS);
+
+  GST_LOG ("Activating new Program Association Table");
   /* activate the new table */
-  for (i = 0; i < gst_value_list_get_size (programs); ++i) {
+  programs = gst_structure_id_get_value (pat_info, QUARK_PROGRAMS);
+  nbprograms = gst_value_list_get_size (programs);
+  for (i = 0; i < nbprograms; ++i) {
     value = gst_value_list_get_value (programs, i);
 
     program_info = g_value_get_boxed (value);
@@ -652,6 +763,7 @@ mpegts_base_apply_pat (MpegTSBase * base, GstStructure * pat_info)
 
     program = mpegts_base_get_program (base, program_number);
     if (program) {
+      /* IF the program already existed, just check if the PMT PID changed */
       if (program->pmt_pid != pid) {
         if (program->pmt_pid != G_MAXUINT16) {
           /* pmt pid changed */
@@ -665,17 +777,20 @@ mpegts_base_apply_pat (MpegTSBase * base, GstStructure * pat_info)
         MPEGTS_BIT_SET (base->known_psi, pid);
       }
     } else {
-      MPEGTS_BIT_SET (base->known_psi, pid);
+      /* Create a new program */
       program = mpegts_base_add_program (base, program_number, pid);
     }
+    /* We mark this program as being referenced by one PAT */
     program->patcount += 1;
   }
 
   if (old_pat) {
     /* deactivate the old table */
+    GST_LOG ("Deactivating old Program Association Table");
 
     programs = gst_structure_id_get_value (old_pat, QUARK_PROGRAMS);
-    for (i = 0; i < gst_value_list_get_size (programs); ++i) {
+    nbprograms = gst_value_list_get_size (programs);
+    for (i = 0; i < nbprograms; ++i) {
       value = gst_value_list_get_value (programs, i);
 
       program_info = g_value_get_boxed (value);
@@ -684,7 +799,7 @@ mpegts_base_apply_pat (MpegTSBase * base, GstStructure * pat_info)
           QUARK_PID, G_TYPE_UINT, &pid, NULL);
 
       program = mpegts_base_get_program (base, program_number);
-      if (program == NULL) {
+      if (G_UNLIKELY (program == NULL)) {
         GST_DEBUG_OBJECT (base, "broken PAT, duplicated entry for program %d",
             program_number);
         continue;
@@ -697,10 +812,7 @@ mpegts_base_apply_pat (MpegTSBase * base, GstStructure * pat_info)
       GST_INFO_OBJECT (base, "PAT removing program %" GST_PTR_FORMAT,
           program_info);
 
-      if (klass->program_stopped) {
-        klass->program_stopped (base, program);
-      }
-      mpegts_base_deactivate_pmt (base, program);
+      mpegts_base_deactivate_program (base, program);
       mpegts_base_remove_program (base, program_number);
       /* FIXME: when this happens it may still be pmt pid of another
        * program, so setting to False may make it go through expensive
@@ -711,26 +823,17 @@ mpegts_base_apply_pat (MpegTSBase * base, GstStructure * pat_info)
 
     gst_structure_free (old_pat);
   }
-#if 0
-  mpegts_base_sync_program_pads (base);
-#endif
 }
 
 static void
 mpegts_base_apply_pmt (MpegTSBase * base,
     guint16 pmt_pid, GstStructure * pmt_info)
 {
-  MpegTSBaseProgram *program;
+  MpegTSBaseProgram *program, *old_program;
   guint program_number;
-  guint pcr_pid;
-  guint pid;
-  guint stream_type;
-  GstStructure *stream;
-  gint i;
-  const GValue *new_streams;
-  const GValue *value;
-  MpegTSBaseClass *klass = GST_MPEGTS_BASE_GET_CLASS (base);
+  gboolean deactivate_old_program = FALSE;
 
+  /* FIXME : not so sure this is valid anymore */
   if (G_UNLIKELY (base->seen_pat == FALSE)) {
     GST_WARNING ("Got pmt without pat first. Returning");
     /* remove the stream since we won't get another PMT otherwise */
@@ -738,57 +841,55 @@ mpegts_base_apply_pmt (MpegTSBase * base,
     return;
   }
 
-  GST_DEBUG ("Applying PMT (pid:0x%04x)", pmt_pid);
+  gst_structure_id_get (pmt_info, QUARK_PROGRAM_NUMBER, G_TYPE_UINT,
+      &program_number, NULL);
 
-  gst_structure_id_get (pmt_info,
-      QUARK_PROGRAM_NUMBER, G_TYPE_UINT, &program_number,
-      QUARK_PCR_PID, G_TYPE_UINT, &pcr_pid, NULL);
-  new_streams = gst_structure_id_get_value (pmt_info, QUARK_STREAMS);
+  GST_DEBUG ("Applying PMT (program_number:%d, pid:0x%04x)",
+      program_number, pmt_pid);
 
-  program = mpegts_base_get_program (base, program_number);
-  if (program) {
-    GST_DEBUG ("Deactivating old program");
+  /* In order for stream switching to happen properly in decodebin(2),
+   * we need to first add the new pads (i.e. activate the new program)
+   * before removing the old ones (i.e. deactivating the old program)
+   */
+
+  old_program = mpegts_base_get_program (base, program_number);
+  if (G_UNLIKELY (old_program == NULL))
+    goto no_program;
+
+  /* If the current program is active, this means we have a new program */
+  if (old_program->active) {
+    old_program = mpegts_base_steal_program (base, program_number);
+    program = mpegts_base_new_program (base, program_number, pmt_pid);
+    g_hash_table_insert (base->programs,
+        GINT_TO_POINTER (program_number), program);
+    deactivate_old_program = TRUE;
+  } else
+    program = old_program;
+
+  /* First activate program */
+  mpegts_base_activate_program (base, program, pmt_pid, pmt_info);
+
+  if (deactivate_old_program) {
     /* deactivate old pmt */ ;
-    mpegts_base_deactivate_pmt (base, program);
-    if (program->pmt_info)
-      gst_structure_free (program->pmt_info);
-    program->pmt_info = NULL;
-  } else {
-    /* no PAT?? */
-    MPEGTS_BIT_SET (base->known_psi, pmt_pid);
-    program = mpegts_base_add_program (base, program_number, pid);
+    mpegts_base_deactivate_program (base, old_program);
+    mpegts_base_free_program (old_program);
   }
 
-  GST_DEBUG ("Now activating new program");
-
-  /* activate new pmt */
-  program->pmt_info = gst_structure_copy (pmt_info);
-  program->pmt_pid = pmt_pid;
-  program->pcr_pid = pcr_pid;
-  mpegts_base_program_add_stream (base, program, (guint16) pcr_pid, -1, NULL);
-  MPEGTS_BIT_SET (base->is_pes, pcr_pid);
-
-  for (i = 0; i < gst_value_list_get_size (new_streams); ++i) {
-    value = gst_value_list_get_value (new_streams, i);
-    stream = g_value_get_boxed (value);
-
-    gst_structure_id_get (stream, QUARK_PID, G_TYPE_UINT, &pid,
-        QUARK_STREAM_TYPE, G_TYPE_UINT, &stream_type, NULL);
-    MPEGTS_BIT_SET (base->is_pes, pid);
-    mpegts_base_program_add_stream (base, program,
-        (guint16) pid, (guint8) stream_type, stream);
-
-  }
-
-  if (klass->program_started != NULL) {
-    klass->program_started (base, program);
-  }
-
-  GST_DEBUG_OBJECT (base, "new pmt %" GST_PTR_FORMAT, pmt_info);
+  /* if (program->pmt_info) */
+  /*   gst_structure_free (program->pmt_info); */
+  /* program->pmt_info = NULL; */
 
   gst_element_post_message (GST_ELEMENT_CAST (base),
       gst_message_new_element (GST_OBJECT (base),
           gst_structure_copy (pmt_info)));
+
+  return;
+
+no_program:
+  {
+    GST_ERROR ("Attempted to apply a PMT on a program that wasn't created");
+    return;
+  }
 }
 
 static void
diff --git a/gst/mpegtsdemux/mpegtsbase.h b/gst/mpegtsdemux/mpegtsbase.h
index 44cb501f4b..369078d476 100644
--- a/gst/mpegtsdemux/mpegtsbase.h
+++ b/gst/mpegtsdemux/mpegtsbase.h
@@ -70,6 +70,9 @@ struct _MpegTSBaseProgram
   /* Pending Tags for the program */
   GstTagList *tags;
   guint event_id;
+
+  /* TRUE if the program is currently being used */
+  gboolean active;
 };
 
 typedef enum {
diff --git a/gst/mpegtsdemux/tsdemux.c b/gst/mpegtsdemux/tsdemux.c
index 9e70073b4e..6ea958bda4 100644
--- a/gst/mpegtsdemux/tsdemux.c
+++ b/gst/mpegtsdemux/tsdemux.c
@@ -1177,6 +1177,10 @@ create_pad_for_stream (MpegTSBase * base, MpegTSBaseStream * bstream,
       name = g_strdup_printf ("subpicture_%04x", bstream->pid);
       caps = gst_caps_new_simple ("subpicture/x-pgs", NULL);
       break;
+    default:
+      GST_WARNING ("Non-media stream (stream_type:0x%x). Not creating pad",
+          bstream->stream_type);
+      break;
   }
   if (template && name && caps) {
     GST_LOG ("stream:%p creating pad with name %s and caps %s", stream, name,
@@ -1214,6 +1218,7 @@ static void
 gst_ts_demux_stream_removed (MpegTSBase * base, MpegTSBaseStream * bstream)
 {
   TSDemuxStream *stream = (TSDemuxStream *) bstream;
+
   if (stream) {
     if (stream->pad) {
       /* Unref the pad, clear it */
@@ -1234,7 +1239,10 @@ activate_pad_for_stream (GstTSDemux * tsdemux, TSDemuxStream * stream)
     gst_element_add_pad ((GstElement *) tsdemux, stream->pad);
     GST_DEBUG_OBJECT (stream->pad, "done adding pad");
   } else
-    GST_WARNING_OBJECT (tsdemux, "stream %p has no pad", stream);
+    GST_WARNING_OBJECT (tsdemux,
+        "stream %p (pid 0x%04x, type:0x%03x) has no pad", stream,
+        ((MpegTSBaseStream *) stream)->pid,
+        ((MpegTSBaseStream *) stream)->stream_type);
 }
 
 static void
@@ -1264,6 +1272,9 @@ gst_ts_demux_program_started (MpegTSBase * base, MpegTSBaseProgram * program)
 {
   GstTSDemux *demux = GST_TS_DEMUX (base);
 
+  GST_DEBUG ("Current program %d, new program %d",
+      demux->program_number, program->program_number);
+
   if (demux->program_number == -1 ||
       demux->program_number == program->program_number) {
     GList *tmp;
@@ -1272,17 +1283,16 @@ gst_ts_demux_program_started (MpegTSBase * base, MpegTSBaseProgram * program)
     demux->program_number = program->program_number;
     demux->program = program;
 
-    /* Activate all stream pads, the pads will already have been created */
-
-    /* FIXME : Actually, we don't want to activate *ALL* streams !
-     * For example, we don't want to expose HDV AUX private streams, we will just
-     * be using them directly for seeking and metadata. */
-    if (base->mode != BASE_MODE_SCANNING)
+    /* Activate all stream pads, pads will already have been created */
+    if (base->mode != BASE_MODE_SCANNING) {
       for (tmp = program->stream_list; tmp; tmp = tmp->next)
         activate_pad_for_stream (demux, (TSDemuxStream *) tmp->data);
+      gst_element_no_more_pads ((GstElement *) demux);
+    }
 
     /* Inform scanner we have got our program */
     demux->current_program_number = program->program_number;
+    demux->need_newsegment = TRUE;
   }
 }
 
@@ -1295,23 +1305,20 @@ gst_ts_demux_program_stopped (MpegTSBase * base, MpegTSBaseProgram * program)
 
   GST_LOG ("program %d stopped", program->program_number);
 
-  if (demux->program == NULL || program != demux->program)
-    return;
-
-  for (tmp = demux->program->stream_list; tmp; tmp = tmp->next) {
+  for (tmp = program->stream_list; tmp; tmp = tmp->next) {
     localstream = (TSDemuxStream *) tmp->data;
     if (localstream->pad) {
-      GST_DEBUG ("HAVE PAD %s:%s", GST_DEBUG_PAD_NAME (localstream->pad));
-      if (gst_pad_is_active (localstream->pad))
+      if (gst_pad_is_active (localstream->pad)) {
+        GST_DEBUG ("Pushing EOS and deactivating pad %s:%s",
+            GST_DEBUG_PAD_NAME (localstream->pad));
+        gst_pad_push_event (localstream->pad, gst_event_new_eos ());
+        gst_pad_set_active (localstream->pad, FALSE);
         gst_element_remove_pad (GST_ELEMENT_CAST (demux), localstream->pad);
-      else
+      } else
         gst_object_unref (localstream->pad);
       localstream->pad = NULL;
     }
   }
-
-  demux->program = NULL;
-  demux->program_number = -1;
 }
 
 static gboolean
@@ -2081,7 +2088,8 @@ calculate_and_push_newsegment (GstTSDemux * demux, TSDemuxStream * stream)
 
     start = firstpts;
     stop = GST_CLOCK_TIME_NONE;
-    position = demux->segment.time;
+    position = demux->segment.time ? firstpts - demux->segment.time : 0;
+    demux->segment.time = start;
   } else {
     /* pull mode */
     GST_DEBUG ("pull-based. Segment start:%" GST_TIME_FORMAT " duration:%"

From 046af98b301396570488a56443fdd1d8c5aacd79 Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@nokia.com>
Date: Tue, 26 Jul 2011 19:11:16 +0300
Subject: [PATCH 126/158] pcapparse: fix SLL parsing

The current code is not checking for ethernet type, as it's supposed to,
but link layer device type and it's hard-coded to only accept dumps from
ethernet (ARPHRD_ETHER; 1). We don't care where the dump was fetched
from (wlan, 3G, etc.)

What we care about is the that the ethernet type is IP (ETHERNET_IP;
0x800), which is clearly field 14:

http://www.tcpdump.org/pcap3_man.html

And do a bit of cleanup.

Signed-off-by: Felipe Contreras <felipe.contreras@nokia.com>
---
 gst/pcapparse/gstpcapparse.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/gst/pcapparse/gstpcapparse.c b/gst/pcapparse/gstpcapparse.c
index 49a934073c..5dc17ee368 100644
--- a/gst/pcapparse/gstpcapparse.c
+++ b/gst/pcapparse/gstpcapparse.c
@@ -367,24 +367,20 @@ gst_pcap_parse_scan_frame (GstPcapParse * self,
         return FALSE;
 
       eth_type = GUINT16_FROM_BE (*((guint16 *) (buf + 12)));
-      if (eth_type != 0x800)
-        return FALSE;
-
       buf_ip = buf + ETH_HEADER_LEN;
       break;
     case DLT_SLL:
       if (buf_size < SLL_HEADER_LEN + IP_HEADER_MIN_LEN + UDP_HEADER_LEN)
         return FALSE;
 
-      eth_type = GUINT16_FROM_BE (*((guint16 *) (buf + 2)));
-
-      if (eth_type != 1)
-        return FALSE;
-
+      eth_type = GUINT16_FROM_BE (*((guint16 *) (buf + 14)));
       buf_ip = buf + SLL_HEADER_LEN;
       break;
   }
 
+  if (eth_type != 0x800)
+    return FALSE;
+
   b = *buf_ip;
   if (((b >> 4) & 0x0f) != 4)
     return FALSE;

From e910e2888b1d5917d8227f014adb3f94a342999b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Wed, 27 Jul 2011 10:56:15 +0100
Subject: [PATCH 127/158] pcapparse: fix compiler warning

gstpcapparse.c: In function 'gst_pcap_parse_chain':
gstpcapparse.c:381:6: error: 'eth_type' may be used uninitialized in this function [-Werror=uninitialized]
gstpcapparse.c:354:11: note: 'eth_type' was declared here
---
 gst/pcapparse/gstpcapparse.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gst/pcapparse/gstpcapparse.c b/gst/pcapparse/gstpcapparse.c
index 5dc17ee368..5963916679 100644
--- a/gst/pcapparse/gstpcapparse.c
+++ b/gst/pcapparse/gstpcapparse.c
@@ -376,6 +376,8 @@ gst_pcap_parse_scan_frame (GstPcapParse * self,
       eth_type = GUINT16_FROM_BE (*((guint16 *) (buf + 14)));
       buf_ip = buf + SLL_HEADER_LEN;
       break;
+    default:
+      return FALSE;
   }
 
   if (eth_type != 0x800)

From 7583080023ad66222c7245268d82e66ee775afc3 Mon Sep 17 00:00:00 2001
From: Olaf Seibert <rhialto@azenomei.knuffel.net>
Date: Wed, 27 Jul 2011 11:02:41 +0100
Subject: [PATCH 128/158] hlsdemux: fix wrong usage of GST_ELEMENT_ERROR macros
 and compilation on NetBSD

https://bugzilla.gnome.org/show_bug.cgi?id=655319
---
 gst/hls/gsthlsdemux.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gst/hls/gsthlsdemux.c b/gst/hls/gsthlsdemux.c
index ce1f409c31..64432337d9 100644
--- a/gst/hls/gsthlsdemux.c
+++ b/gst/hls/gsthlsdemux.c
@@ -370,14 +370,15 @@ gst_hls_demux_sink_event (GstPad * pad, GstEvent * event)
         /* In most cases, this will happen if we set a wrong url in the
          * source element and we have received the 404 HTML response instead of
          * the playlist */
-        GST_ELEMENT_ERROR (demux, STREAM, DECODE, ("Invalid playlist."), NULL);
+        GST_ELEMENT_ERROR (demux, STREAM, DECODE, ("Invalid playlist."),
+            (NULL));
         return FALSE;
       }
 
       if (!ret && gst_m3u8_client_is_live (demux->client)) {
         GST_ELEMENT_ERROR (demux, RESOURCE, NOT_FOUND,
             ("Failed querying the playlist uri, "
-                "required for live sources."), NULL);
+                "required for live sources."), (NULL));
         return FALSE;
       }
 
@@ -605,7 +606,7 @@ end_of_playlist:
 cache_error:
   {
     GST_ELEMENT_ERROR (demux, RESOURCE, NOT_FOUND,
-        ("Could not cache the first fragments"), NULL);
+        ("Could not cache the first fragments"), (NULL));
     gst_hls_demux_stop (demux);
     return;
   }
@@ -868,7 +869,7 @@ uri_error:
 state_change_error:
   {
     GST_ELEMENT_ERROR (demux, CORE, STATE_CHANGE,
-        ("Error changing state of the fetcher element."), NULL);
+        ("Error changing state of the fetcher element."), (NULL));
     bret = FALSE;
     goto quit;
   }

From a49cfd133016e4f98f67dc8bbd719b947c927136 Mon Sep 17 00:00:00 2001
From: Edward Hervey <edward.hervey@collabora.co.uk>
Date: Tue, 26 Jul 2011 13:47:04 +0200
Subject: [PATCH 129/158] mpeg4videoparse: Fix unitialized variable on old
 compilers

---
 gst/mpeg4videoparse/mpeg4parse.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gst/mpeg4videoparse/mpeg4parse.c b/gst/mpeg4videoparse/mpeg4parse.c
index bfdb6e4378..50fd3c7482 100644
--- a/gst/mpeg4videoparse/mpeg4parse.c
+++ b/gst/mpeg4videoparse/mpeg4parse.c
@@ -47,7 +47,7 @@ GST_DEBUG_CATEGORY_EXTERN (mpeg4v_parse_debug);
 static inline gboolean
 next_start_code (GstBitReader * b)
 {
-  guint32 bits;
+  guint32 bits = 0;
 
   GET_BITS (b, 1, &bits);
   if (bits != 0)
@@ -69,7 +69,7 @@ static inline gboolean
 skip_user_data (GstBitReader * bs, guint32 * bits)
 {
   while (*bits == MPEG4_USER_DATA_STARTCODE_MARKER) {
-    guint32 b;
+    guint32 b = 0;
 
     do {
       GET_BITS (bs, 8, &b);
@@ -205,7 +205,7 @@ failed:
 static gboolean
 gst_mpeg4_params_parse_vos (MPEG4Params * params, GstBitReader * br)
 {
-  guint32 bits;
+  guint32 bits = 0;
 
   GET_BITS (br, 32, &bits);
   if (bits != MPEG4_VOS_STARTCODE_MARKER)

From 976f4b0bbf8efcd0054fc4c0f9ca74029e85dc69 Mon Sep 17 00:00:00 2001
From: Edward Hervey <edward.hervey@collabora.co.uk>
Date: Tue, 26 Jul 2011 17:02:05 +0200
Subject: [PATCH 130/158] hsldemux: Handle change of media types

When switching bitrates, we might end up switching to a different
media-type (like from aac to/from mpeg-ts).

For this switch to behave properly in decodebin2, this patch adds:
* dynamic source pads (which will be added/removed whenever a stream
  media type changes
* re-checking the fragment media type whenever we switch to a different
  playlist
---
 gst/hls/gsthlsdemux.c | 73 +++++++++++++++++++++++++++++++++----------
 gst/hls/gsthlsdemux.h |  2 +-
 2 files changed, 58 insertions(+), 17 deletions(-)

diff --git a/gst/hls/gsthlsdemux.c b/gst/hls/gsthlsdemux.c
index 64432337d9..eed9d82d09 100644
--- a/gst/hls/gsthlsdemux.c
+++ b/gst/hls/gsthlsdemux.c
@@ -43,9 +43,9 @@
 #include <gst/base/gsttypefindhelper.h>
 #include "gsthlsdemux.h"
 
-static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
+static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src%d",
     GST_PAD_SRC,
-    GST_PAD_ALWAYS,
+    GST_PAD_SOMETIMES,
     GST_STATIC_CAPS_ANY);
 
 static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
@@ -214,15 +214,6 @@ gst_hls_demux_init (GstHLSDemux * demux, GstHLSDemuxClass * klass)
       GST_DEBUG_FUNCPTR (gst_hls_demux_sink_event));
   gst_element_add_pad (GST_ELEMENT (demux), demux->sinkpad);
 
-  /* demux pad */
-  demux->srcpad = gst_pad_new_from_static_template (&srctemplate, "src");
-  gst_pad_set_event_function (demux->srcpad,
-      GST_DEBUG_FUNCPTR (gst_hls_demux_src_event));
-  gst_pad_set_query_function (demux->srcpad,
-      GST_DEBUG_FUNCPTR (gst_hls_demux_src_query));
-  gst_pad_set_element_private (demux->srcpad, demux);
-  gst_element_add_pad (GST_ELEMENT (demux), demux->srcpad);
-
   /* fetcher pad */
   demux->fetcherpad =
       gst_pad_new_from_static_template (&fetchertemplate, "sink");
@@ -233,6 +224,8 @@ gst_hls_demux_init (GstHLSDemux * demux, GstHLSDemuxClass * klass)
   gst_pad_set_element_private (demux->fetcherpad, demux);
   gst_pad_activate_push (demux->fetcherpad, TRUE);
 
+  demux->do_typefind = TRUE;
+
   /* Properties */
   demux->fragments_cache = DEFAULT_FRAGMENTS_CACHE;
   demux->bitrate_switch_tol = DEFAULT_BITRATE_SWITCH_TOLERANCE;
@@ -556,6 +549,34 @@ gst_hls_demux_stop (GstHLSDemux * demux)
   g_cond_signal (demux->thread_cond);
 }
 
+static void
+switch_pads (GstHLSDemux * demux, GstCaps * newcaps)
+{
+  GstPad *oldpad = demux->srcpad;
+
+  GST_DEBUG ("Switching pads (oldpad:%p)", oldpad);
+
+  /* First create and activate new pad */
+  demux->srcpad = gst_pad_new_from_static_template (&srctemplate, NULL);
+  gst_pad_set_event_function (demux->srcpad,
+      GST_DEBUG_FUNCPTR (gst_hls_demux_src_event));
+  gst_pad_set_query_function (demux->srcpad,
+      GST_DEBUG_FUNCPTR (gst_hls_demux_src_query));
+  gst_pad_set_element_private (demux->srcpad, demux);
+  gst_pad_set_active (demux->srcpad, TRUE);
+  gst_element_add_pad (GST_ELEMENT (demux), demux->srcpad);
+  gst_pad_set_caps (demux->srcpad, newcaps);
+
+  gst_element_no_more_pads (GST_ELEMENT (demux));
+
+  if (oldpad) {
+    /* Push out EOS */
+    gst_pad_push_event (oldpad, gst_event_new_eos ());
+    gst_pad_set_active (oldpad, FALSE);
+    gst_element_remove_pad (GST_ELEMENT (demux), oldpad);
+  }
+}
+
 static void
 gst_hls_demux_loop (GstHLSDemux * demux)
 {
@@ -589,6 +610,13 @@ gst_hls_demux_loop (GstHLSDemux * demux)
   }
 
   buf = g_queue_pop_head (demux->queue);
+
+  /* Figure out if we need to create/switch pads */
+  if (G_UNLIKELY (!demux->srcpad
+          || GST_BUFFER_CAPS (buf) != GST_PAD_CAPS (demux->srcpad))) {
+    switch_pads (demux, GST_BUFFER_CAPS (buf));
+  }
+
   ret = gst_pad_push (demux->srcpad, buf);
   if (ret != GST_FLOW_OK)
     goto error;
@@ -668,6 +696,7 @@ gst_hls_demux_reset (GstHLSDemux * demux, gboolean dispose)
   demux->accumulated_delay = 0;
   demux->end_of_playlist = FALSE;
   demux->cancelled = FALSE;
+  demux->do_typefind = TRUE;
 
   if (demux->input_caps) {
     gst_caps_unref (demux->input_caps);
@@ -947,6 +976,9 @@ gst_hls_demux_change_playlist (GstHLSDemux * demux, gboolean is_fast)
   gst_element_post_message (GST_ELEMENT_CAST (demux),
       gst_message_new_element (GST_OBJECT_CAST (demux), s));
 
+  /* Force typefinding since we might have changed media type */
+  demux->do_typefind = TRUE;
+
   return TRUE;
 }
 
@@ -994,6 +1026,9 @@ gst_hls_demux_switch_playlist (GstHLSDemux * demux)
   limit = demux->client->current->targetduration * GST_SECOND *
       demux->bitrate_switch_tol;
 
+  GST_DEBUG ("diff:%s%" GST_TIME_FORMAT ", limit:%" GST_TIME_FORMAT,
+      diff < 0 ? "-" : " ", GST_TIME_ARGS (ABS (diff)), GST_TIME_ARGS (limit));
+
   /* if we are on time switch to a higher bitrate */
   if (diff > limit) {
     gst_hls_demux_change_playlist (demux, TRUE);
@@ -1036,14 +1071,20 @@ gst_hls_demux_get_next_fragment (GstHLSDemux * demux, gboolean retry)
   buf = gst_adapter_take_buffer (demux->download, avail);
   GST_BUFFER_DURATION (buf) = duration;
 
-  if (G_UNLIKELY (demux->input_caps == NULL)) {
-    demux->input_caps = gst_type_find_helper_for_buffer (NULL, buf, NULL);
-    if (demux->input_caps) {
-      gst_pad_set_caps (demux->srcpad, demux->input_caps);
+  /* We actually need to do this every time we switch bitrate */
+  if (G_UNLIKELY (demux->do_typefind)) {
+    GstCaps *caps = gst_type_find_helper_for_buffer (NULL, buf, NULL);
+
+    if (!demux->input_caps || !gst_caps_is_equal (caps, demux->input_caps)) {
+      gst_caps_replace (&demux->input_caps, caps);
+      /* gst_pad_set_caps (demux->srcpad, demux->input_caps); */
       GST_INFO_OBJECT (demux, "Input source caps: %" GST_PTR_FORMAT,
           demux->input_caps);
-    }
+      demux->do_typefind = FALSE;
+    } else
+      gst_caps_unref (caps);
   }
+  gst_buffer_set_caps (buf, demux->input_caps);
 
   if (discont) {
     GST_DEBUG_OBJECT (demux, "Marking fragment as discontinuous");
diff --git a/gst/hls/gsthlsdemux.h b/gst/hls/gsthlsdemux.h
index caf6437207..5113b76df3 100644
--- a/gst/hls/gsthlsdemux.h
+++ b/gst/hls/gsthlsdemux.h
@@ -61,7 +61,7 @@ struct _GstHLSDemux
   GQueue *queue;                /* Queue storing the fetched fragments */
   gboolean need_cache;          /* Wheter we need to cache some fragments before starting to push data */
   gboolean end_of_playlist;
-
+  gboolean do_typefind;		/* Whether we need to typefind the next buffer */
 
   /* Properties */
   guint fragments_cache;        /* number of fragments needed to be cached to start playing */

From 4723a5d90ce02cb4d720b1be7ebdf365f81910e4 Mon Sep 17 00:00:00 2001
From: Robert Jobbagy <jobbagy.robert@gmail.com>
Date: Wed, 27 Jul 2011 18:58:15 +0200
Subject: [PATCH 131/158] motioncells: new element to detect areas of motion

---
 ext/opencv/Makefile.am             |   12 +-
 ext/opencv/MotionCells.cpp         |  593 +++++++++++++++
 ext/opencv/MotionCells.h           |  259 +++++++
 ext/opencv/gstmotioncells.c        | 1111 ++++++++++++++++++++++++++++
 ext/opencv/gstmotioncells.h        |  124 ++++
 ext/opencv/gstopencv.c             |    4 +
 ext/opencv/motioncells_wrapper.cpp |  213 ++++++
 ext/opencv/motioncells_wrapper.h   |   89 +++
 8 files changed, 2403 insertions(+), 2 deletions(-)
 create mode 100644 ext/opencv/MotionCells.cpp
 create mode 100644 ext/opencv/MotionCells.h
 create mode 100644 ext/opencv/gstmotioncells.c
 create mode 100644 ext/opencv/gstmotioncells.h
 create mode 100644 ext/opencv/motioncells_wrapper.cpp
 create mode 100644 ext/opencv/motioncells_wrapper.h

diff --git a/ext/opencv/Makefile.am b/ext/opencv/Makefile.am
index d5a70edade..a32e16cfa2 100644
--- a/ext/opencv/Makefile.am
+++ b/ext/opencv/Makefile.am
@@ -16,7 +16,12 @@ libgstopencv_la_SOURCES = gstopencv.c \
 			gstfacedetect.c \
 			gstpyramidsegment.c \
 			gsttemplatematch.c \
-			gsttextoverlay.c
+			gsttextoverlay.c \
+			gstmotioncells.c \
+			motioncells_wrapper.cpp \
+			MotionCells.cpp
+
+libgstopencv_la_CXXFLAGS = $(GST_CXXFLAGS) $(OPENCV_CFLAGS)
 
 # flags used to compile this facedetect
 # add other _CFLAGS and _LIBS as needed
@@ -46,4 +51,7 @@ noinst_HEADERS = gstopencvvideofilter.h gstopencvutils.h \
 		gstfacedetect.h \
 		gstpyramidsegment.h \
 		gsttemplatematch.h \
-		gsttextoverlay.h
+		gsttextoverlay.h \
+		gstmotioncells.h \
+		motioncells_wrapper.h \
+		MotionCells.h
diff --git a/ext/opencv/MotionCells.cpp b/ext/opencv/MotionCells.cpp
new file mode 100644
index 0000000000..2b81b305dd
--- /dev/null
+++ b/ext/opencv/MotionCells.cpp
@@ -0,0 +1,593 @@
+/*
+ * GStreamer
+ * Copyright (C) 2011 Robert Jobbagy <jobbagy.robert@gmail.com>
+ * Copyright (C) 2011 Nicola Murino <nicola.murino@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Alternatively, the contents of this file may be used under the
+ * GNU Lesser General Public License Version 2.1 (the "LGPL"), in
+ * which case the following provisions apply instead of the ones
+ * mentioned above:
+ *
+ * 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 <cstdlib>
+#include <errno.h>
+#include <math.h>
+#include <gst/gst.h>
+#include <arpa/inet.h>
+#include "MotionCells.h"
+
+uint64_t ntohl64 (uint64_t val);
+uint64_t htonl64 (uint64_t val);
+
+uint64_t
+ntohl64 (uint64_t val)
+{
+  uint64_t res64;
+  uint32_t low = (uint32_t) (val & 0x00000000FFFFFFFFLL);
+  uint32_t high = (uint32_t) ((val & 0xFFFFFFFF00000000LL) >> 32);
+  low = ntohl (low);
+  high = ntohl (high);
+  res64 = (uint64_t) high + (((uint64_t) low) << 32);
+  return res64;
+}
+
+
+uint64_t
+htonl64 (uint64_t val)
+{
+  uint64_t res64;
+  uint32_t low = (uint32_t) (val & 0x00000000FFFFFFFFLL);
+  uint32_t high = (uint32_t) ((val & 0xFFFFFFFF00000000LL) >> 32);
+  low = htonl (low);
+  high = htonl (high);
+  res64 = (uint64_t) high + (((uint64_t) low) << 32);
+  return res64;
+}
+
+MotionCells::MotionCells ()
+{
+  m_framecnt = 0;
+  m_motioncells_idx_count = 0;
+  m_motioncellsidxcstr = NULL;
+  m_saveInDatafile = false;
+  mc_savefile = NULL;
+  m_pcurFrame = NULL;
+  m_pprevFrame = NULL;
+  transparencyimg = NULL;
+  m_pdifferenceImage = NULL;
+  m_pbwImage = NULL;
+  m_initdatafilefailed = new char[BUSMSGLEN];
+  m_savedatafilefailed = new char[BUSMSGLEN];
+  m_initerrorcode = 0;
+  m_saveerrorcode = 0;
+  m_alpha = 0.5;
+  m_beta = 0.5;
+
+}
+
+MotionCells::~MotionCells ()
+{
+  if (mc_savefile) {
+    fclose (mc_savefile);
+    mc_savefile = NULL;
+  }
+  delete[]m_initdatafilefailed;
+  delete[]m_savedatafilefailed;
+  if (m_motioncellsidxcstr)
+    delete[]m_motioncellsidxcstr;
+  if (m_pcurFrame)
+    cvReleaseImage (&m_pcurFrame);
+  if (m_pprevFrame)
+    cvReleaseImage (&m_pprevFrame);
+  if (transparencyimg)
+    cvReleaseImage (&transparencyimg);
+  if (m_pdifferenceImage)
+    cvReleaseImage (&m_pdifferenceImage);
+  if (m_pbwImage)
+    cvReleaseImage (&m_pbwImage);
+}
+
+int
+MotionCells::performDetectionMotionCells (IplImage * p_frame,
+    double p_sensitivity, double p_framerate, int p_gridx, int p_gridy,
+    gint64 timestamp_millisec, bool p_isVisible, bool p_useAlpha,
+    int motionmaskcoord_count, motionmaskcoordrect * motionmaskcoords,
+    int motionmaskcells_count, motioncellidx * motionmaskcellsidx,
+    cellscolor motioncellscolor, int motioncells_count,
+    motioncellidx * motioncellsidx, gint64 starttime, char *p_datafile,
+    bool p_changed_datafile, int p_thickness)
+{
+
+  int sumframecnt = 0;
+  int ret = 0;
+  p_framerate >= 1 ? p_framerate <= 5 ? sumframecnt = 1
+      : p_framerate <= 10 ? sumframecnt = 2
+      : p_framerate <= 15 ? sumframecnt = 3
+      : p_framerate <= 20 ? sumframecnt = 4
+      : p_framerate <= 25 ? sumframecnt = 5 : sumframecnt = 0 : sumframecnt = 0;
+
+  m_framecnt++;
+  m_changed_datafile = p_changed_datafile;
+  if (m_framecnt >= sumframecnt) {
+    m_useAlpha = p_useAlpha;
+    m_gridx = p_gridx;
+    m_gridy = p_gridy;
+    if (m_changed_datafile) {
+      ret = initDataFile (p_datafile, starttime);
+      if (ret != 0)
+        return ret;
+    }
+
+    m_frameSize = cvGetSize (p_frame);
+    m_frameSize.width /= 2;
+    m_frameSize.height /= 2;
+    setMotionCells (m_frameSize.width, m_frameSize.height);
+    m_sensitivity = 1 - p_sensitivity;
+    m_isVisible = p_isVisible;
+    m_pcurFrame = cvCloneImage (p_frame);
+    IplImage *m_pcurgreyImage = cvCreateImage (m_frameSize, IPL_DEPTH_8U, 1);
+    IplImage *m_pprevgreyImage = cvCreateImage (m_frameSize, IPL_DEPTH_8U, 1);
+    IplImage *m_pgreyImage = cvCreateImage (m_frameSize, IPL_DEPTH_8U, 1);
+    IplImage *m_pcurDown =
+        cvCreateImage (m_frameSize, m_pcurFrame->depth, m_pcurFrame->nChannels);
+    IplImage *m_pprevDown = cvCreateImage (m_frameSize, m_pprevFrame->depth,
+        m_pprevFrame->nChannels);
+    m_pbwImage = cvCreateImage (m_frameSize, IPL_DEPTH_8U, 1);
+    cvPyrDown (m_pprevFrame, m_pprevDown);
+    cvCvtColor (m_pprevDown, m_pprevgreyImage, CV_RGB2GRAY);
+    if (m_pprevFrame)
+      cvReleaseImage (&m_pprevFrame);
+    cvPyrDown (m_pcurFrame, m_pcurDown);
+    cvCvtColor (m_pcurDown, m_pcurgreyImage, CV_RGB2GRAY);
+    m_pdifferenceImage = cvCloneImage (m_pcurgreyImage);
+    //cvSmooth(m_pcurgreyImage, m_pcurgreyImage, CV_GAUSSIAN, 3, 0);//TODO camera noise reduce,something smoothing, and rethink runningavg weights
+
+    //Minus the current gray frame from the 8U moving average.
+    cvAbsDiff (m_pprevgreyImage, m_pcurgreyImage, m_pdifferenceImage);
+
+    //Convert the image to black and white.
+    cvAdaptiveThreshold (m_pdifferenceImage, m_pbwImage, 255,
+        CV_ADAPTIVE_THRESH_GAUSSIAN_C, CV_THRESH_BINARY_INV, 7);
+
+    // Dilate and erode to get object blobs
+    cvDilate (m_pbwImage, m_pbwImage, NULL, 2);
+    cvErode (m_pbwImage, m_pbwImage, NULL, 2);
+
+    //mask-out the overlay on difference image
+    if (motionmaskcoord_count > 0)
+      performMotionMaskCoords (motionmaskcoords, motionmaskcoord_count);
+    if (motionmaskcells_count > 0)
+      performMotionMask (motionmaskcellsidx, motionmaskcells_count);
+    if (getIsNonZero (m_pbwImage)) {    //detect Motion
+      GST_DEBUG ("DETECT MOTION \n");
+      if (m_MotionCells.size () > 0)    //it contains previous motioncells what we used when frames dropped
+        m_MotionCells.clear ();
+      if (transparencyimg)
+        cvReleaseImage (&transparencyimg);
+      (motioncells_count > 0) ?
+          calculateMotionPercentInMotionCells (motioncellsidx,
+          motioncells_count)
+          : calculateMotionPercentInMotionCells (motionmaskcellsidx, 0);
+
+      transparencyimg = cvCreateImage (cvGetSize (p_frame), p_frame->depth, 3);
+      cvSetZero (transparencyimg);
+      if (m_motioncellsidxcstr)
+        delete[]m_motioncellsidxcstr;
+      m_motioncells_idx_count = m_MotionCells.size () * MSGLEN; //one motion cell idx: (lin idx : col idx,) it's 4 character except last motion cell idx
+      m_motioncellsidxcstr = new char[m_motioncells_idx_count];
+      char *tmpstr = new char[MSGLEN];
+      for (int i = 0; i < MSGLEN; i++)
+        tmpstr[i] = ' ';
+      for (unsigned int i = 0; i < m_MotionCells.size (); i++) {
+        CvPoint pt1, pt2;
+        pt1.x = m_MotionCells.at (i).cell_pt1.x * 2;
+        pt1.y = m_MotionCells.at (i).cell_pt1.y * 2;
+        pt2.x = m_MotionCells.at (i).cell_pt2.x * 2;
+        pt2.y = m_MotionCells.at (i).cell_pt2.y * 2;
+        if (m_useAlpha && m_isVisible) {
+          cvRectangle (transparencyimg,
+              pt1,
+              pt2,
+              CV_RGB (motioncellscolor.B_channel_value,
+                  motioncellscolor.G_channel_value,
+                  motioncellscolor.R_channel_value), CV_FILLED);
+        } else if (m_isVisible) {
+          cvRectangle (p_frame,
+              pt1,
+              pt2,
+              CV_RGB (motioncellscolor.B_channel_value,
+                  motioncellscolor.G_channel_value,
+                  motioncellscolor.R_channel_value), p_thickness);
+        }
+
+        if (i < m_MotionCells.size () - 1) {
+          snprintf (tmpstr, MSGLEN, "%d:%d,", m_MotionCells.at (i).lineidx,
+              m_MotionCells.at (i).colidx);
+        } else {
+          snprintf (tmpstr, MSGLEN, "%d:%d", m_MotionCells.at (i).lineidx,
+              m_MotionCells.at (i).colidx);
+        }
+        if (i == 0)
+          strncpy (m_motioncellsidxcstr, tmpstr, m_motioncells_idx_count);
+        else
+          strcat (m_motioncellsidxcstr, tmpstr);
+      }
+      if (m_MotionCells.size () == 0)
+        strncpy (m_motioncellsidxcstr, " ", m_motioncells_idx_count);
+
+      if (m_useAlpha && m_isVisible) {
+        if (m_MotionCells.size () > 0)
+          blendImages (p_frame, transparencyimg, m_alpha, m_beta);
+      }
+
+      delete[]tmpstr;
+
+      if (mc_savefile && m_saveInDatafile) {
+        ret = saveMotionCells (timestamp_millisec);
+        if (ret != 0)
+          return ret;
+      }
+    } else {
+      m_motioncells_idx_count = 0;
+      if (m_MotionCells.size () > 0)
+        m_MotionCells.clear ();
+      if (transparencyimg)
+        cvReleaseImage (&transparencyimg);
+    }
+
+    m_pprevFrame = cvCloneImage (m_pcurFrame);
+    m_framecnt = 0;
+    if (m_pcurFrame)
+      cvReleaseImage (&m_pcurFrame);
+    if (m_pdifferenceImage)
+      cvReleaseImage (&m_pdifferenceImage);
+    if (m_pcurgreyImage)
+      cvReleaseImage (&m_pcurgreyImage);
+    if (m_pprevgreyImage)
+      cvReleaseImage (&m_pprevgreyImage);
+    if (m_pgreyImage)
+      cvReleaseImage (&m_pgreyImage);
+    if (m_pbwImage)
+      cvReleaseImage (&m_pbwImage);
+    if (m_pprevDown)
+      cvReleaseImage (&m_pprevDown);
+    if (m_pcurDown)
+      cvReleaseImage (&m_pcurDown);
+    if (m_pCells) {
+      for (int i = 0; i < m_gridy; ++i) {
+        delete[]m_pCells[i];
+      }
+      delete[]m_pCells;
+    }
+
+    if (p_framerate <= 5) {
+      if (m_MotionCells.size () > 0)
+        m_MotionCells.clear ();
+      if (transparencyimg)
+        cvReleaseImage (&transparencyimg);
+    }
+  } else {                      //we do frame drop
+    m_motioncells_idx_count = 0;
+    ret = -2;
+    for (unsigned int i = 0; i < m_MotionCells.size (); i++) {
+      CvPoint pt1, pt2;
+      pt1.x = m_MotionCells.at (i).cell_pt1.x * 2;
+      pt1.y = m_MotionCells.at (i).cell_pt1.y * 2;
+      pt2.x = m_MotionCells.at (i).cell_pt2.x * 2;
+      pt2.y = m_MotionCells.at (i).cell_pt2.y * 2;
+      if (m_useAlpha && m_isVisible) {
+        cvRectangle (transparencyimg,
+            pt1,
+            pt2,
+            CV_RGB (motioncellscolor.B_channel_value,
+                motioncellscolor.G_channel_value,
+                motioncellscolor.R_channel_value), CV_FILLED);
+      } else if (m_isVisible) {
+        cvRectangle (p_frame,
+            pt1,
+            pt2,
+            CV_RGB (motioncellscolor.B_channel_value,
+                motioncellscolor.G_channel_value,
+                motioncellscolor.R_channel_value), p_thickness);
+      }
+
+    }
+    if (m_useAlpha && m_isVisible) {
+      if (m_MotionCells.size () > 0)
+        blendImages (p_frame, transparencyimg, m_alpha, m_beta);
+    }
+  }
+  return ret;
+}
+
+int
+MotionCells::initDataFile (char *p_datafile, gint64 starttime)  //p_date is increased with difference between current and previous buffer ts
+{
+  MotionCellData mcd;
+  if (strncmp (p_datafile, " ", 1)) {
+    mc_savefile = fopen (p_datafile, "w");
+    if (mc_savefile == NULL) {
+      //fprintf(stderr, "%s %d:initDataFile:fopen:%d (%s)\n", __FILE__, __LINE__, errno,
+      //strerror(errno));
+      strncpy (m_initdatafilefailed, strerror (errno), BUSMSGLEN - 1);
+      m_initerrorcode = errno;
+      return 1;
+    } else {
+      m_saveInDatafile = true;
+    }
+  } else
+    mc_savefile = NULL;
+  bzero (&m_header, sizeof (MotionCellHeader));
+  m_header.headersize = htonl (MC_HEADER);
+  m_header.type = htonl (MC_TYPE);
+  m_header.version = htonl (MC_VERSION);
+  //it needs these bytes
+  m_header.itemsize =
+      htonl ((int) ceil (ceil (m_gridx * m_gridy / 8.0) / 4.0) * 4 +
+      sizeof (mcd.timestamp));
+  m_header.gridx = htonl (m_gridx);
+  m_header.gridy = htonl (m_gridy);
+  m_header.starttime = htonl64 (starttime);
+
+  snprintf (m_header.name, sizeof (m_header.name), "%s %dx%d", MC_VERSIONTEXT,
+      ntohl (m_header.gridx), ntohl (m_header.gridy));
+  m_changed_datafile = false;
+  return 0;
+}
+
+int
+MotionCells::saveMotionCells (gint64 timestamp_millisec)
+{
+
+  MotionCellData mc_data;
+  mc_data.timestamp = htonl (timestamp_millisec);
+  mc_data.data = NULL;
+  //There is no datafile
+  if (mc_savefile == NULL)
+    return 0;
+
+  if (ftello (mc_savefile) == 0) {
+    //cerr << "Writing out file header"<< m_header.headersize <<":" << sizeof(MotionCellHeader) << " itemsize:"
+    //<< m_header.itemsize << endl;
+    if (fwrite (&m_header, sizeof (MotionCellHeader), 1, mc_savefile) != 1) {
+      //fprintf(stderr, "%s %d:saveMotionCells:fwrite:%d (%s)\n", __FILE__, __LINE__, errno,
+      //strerror(errno));
+      strncpy (m_savedatafilefailed, strerror (errno), BUSMSGLEN - 1);
+      m_saveerrorcode = errno;
+      return -1;
+    }
+  }
+
+  mc_data.data =
+      (char *) calloc (1,
+      ntohl (m_header.itemsize) - sizeof (mc_data.timestamp));
+  if (mc_data.data == NULL) {
+    //fprintf(stderr, "%s %d:saveMotionCells:calloc:%d (%s)\n", __FILE__, __LINE__, errno,
+    //strerror(errno));
+    strncpy (m_savedatafilefailed, strerror (errno), BUSMSGLEN - 1);
+    m_saveerrorcode = errno;
+    return -1;
+  }
+
+  for (unsigned int i = 0; i < m_MotionCells.size (); i++) {
+    int bitnum =
+        m_MotionCells.at (i).lineidx * ntohl (m_header.gridx) +
+        m_MotionCells.at (i).colidx;
+    int bytenum = (int) floor (bitnum / 8.0);
+    int shift = bitnum - bytenum * 8;
+    mc_data.data[bytenum] = mc_data.data[bytenum] | (1 << shift);
+    //cerr << "Motion Detected " <<  "line:" << m_MotionCells.at(i).lineidx << " col:" << m_MotionCells.at(i).colidx;
+    //cerr << "    bitnum " << bitnum << " bytenum " << bytenum << " shift " << shift << " value " << (int)mc_data.data[bytenum] << endl;
+  }
+
+  if (fwrite (&mc_data.timestamp, sizeof (mc_data.timestamp), 1,
+          mc_savefile) != 1) {
+    //fprintf(stderr, "%s %d:saveMotionCells:fwrite:%d (%s)\n", __FILE__, __LINE__, errno,
+    //strerror(errno));
+    strncpy (m_savedatafilefailed, strerror (errno), BUSMSGLEN - 1);
+    m_saveerrorcode = errno;
+    return -1;
+  }
+
+  if (fwrite (mc_data.data,
+          ntohl (m_header.itemsize) - sizeof (mc_data.timestamp), 1,
+          mc_savefile) != 1) {
+    //fprintf(stderr, "%s %d:saveMotionCells:fwrite:%d (%s)\n", __FILE__, __LINE__, errno,
+    //strerror(errno));
+    strncpy (m_savedatafilefailed, strerror (errno), BUSMSGLEN - 1);
+    m_saveerrorcode = errno;
+    return -1;
+  }
+
+  free (mc_data.data);
+  return 0;
+}
+
+double
+MotionCells::calculateMotionPercentInCell (int p_row, int p_col,
+    double *p_cellarea, double *p_motionarea)
+{
+  double cntpixelsnum = 0;
+  double cntmotionpixelnum = 0;
+
+  int ybegin = floor ((double) p_row * m_cellheight);
+  int yend = floor ((double) (p_row + 1) * m_cellheight);
+  int xbegin = floor ((double) (p_col) * m_cellwidth);
+  int xend = floor ((double) (p_col + 1) * m_cellwidth);
+  int cellw = xend - xbegin;
+  int cellh = yend - ybegin;
+  int cellarea = cellw * cellh;
+  *p_cellarea = cellarea;
+  int thresholdmotionpixelnum = floor ((double) cellarea * m_sensitivity);
+
+  for (int i = ybegin; i < yend; i++) {
+    for (int j = xbegin; j < xend; j++) {
+      cntpixelsnum++;
+      if ((((uchar *) (m_pbwImage->imageData + m_pbwImage->widthStep * i))[j]) >
+          0) {
+        cntmotionpixelnum++;
+        if (cntmotionpixelnum >= thresholdmotionpixelnum) {     //we dont needs calculate anymore
+          *p_motionarea = cntmotionpixelnum;
+          return (cntmotionpixelnum / cntpixelsnum);
+        }
+      }
+      int remainingpixelsnum = cellarea - cntpixelsnum;
+      if ((cntmotionpixelnum + remainingpixelsnum) < thresholdmotionpixelnum) { //moving pixels number will be less than threshold
+        *p_motionarea = 0;
+        return 0;
+      }
+    }
+  }
+
+  return (cntmotionpixelnum / cntpixelsnum);
+}
+
+void
+MotionCells::calculateMotionPercentInMotionCells (motioncellidx *
+    p_motioncellsidx, int p_motioncells_count)
+{
+  if (p_motioncells_count == 0) {
+    for (int i = 0; i < m_gridy; i++) {
+      for (int j = 0; j < m_gridx; j++) {
+        m_pCells[i][j].MotionPercent = calculateMotionPercentInCell (i, j,
+            &m_pCells[i][j].CellArea, &m_pCells[i][j].MotionArea);
+        m_pCells[i][j].hasMotion =
+            m_sensitivity < m_pCells[i][j].MotionPercent ? true : false;
+        if (m_pCells[i][j].hasMotion) {
+          MotionCellsIdx mci;
+          mci.lineidx = i;
+          mci.colidx = j;
+          mci.cell_pt1.x = floor ((double) j * m_cellwidth);
+          mci.cell_pt1.y = floor ((double) i * m_cellheight);
+          mci.cell_pt2.x = floor ((double) (j + 1) * m_cellwidth);
+          mci.cell_pt2.y = floor ((double) (i + 1) * m_cellheight);
+          int w = mci.cell_pt2.x - mci.cell_pt1.x;
+          int h = mci.cell_pt2.y - mci.cell_pt1.y;
+          mci.motioncell = cvRect (mci.cell_pt1.x, mci.cell_pt1.y, w, h);
+          m_MotionCells.push_back (mci);
+        }
+      }
+    }
+  } else {
+    for (int k = 0; k < p_motioncells_count; ++k) {
+
+      int i = p_motioncellsidx[k].lineidx;
+      int j = p_motioncellsidx[k].columnidx;
+      m_pCells[i][j].MotionPercent =
+          calculateMotionPercentInCell (i, j,
+          &m_pCells[i][j].CellArea, &m_pCells[i][j].MotionArea);
+      m_pCells[i][j].hasMotion =
+          m_pCells[i][j].MotionPercent > m_sensitivity ? true : false;
+      if (m_pCells[i][j].hasMotion) {
+        MotionCellsIdx mci;
+        mci.lineidx = p_motioncellsidx[k].lineidx;
+        mci.colidx = p_motioncellsidx[k].columnidx;
+        mci.cell_pt1.x = floor ((double) j * m_cellwidth);
+        mci.cell_pt1.y = floor ((double) i * m_cellheight);
+        mci.cell_pt2.x = floor ((double) (j + 1) * m_cellwidth);
+        mci.cell_pt2.y = floor ((double) (i + 1) * m_cellheight);
+        int w = mci.cell_pt2.x - mci.cell_pt1.x;
+        int h = mci.cell_pt2.y - mci.cell_pt1.y;
+        mci.motioncell = cvRect (mci.cell_pt1.x, mci.cell_pt1.y, w, h);
+        m_MotionCells.push_back (mci);
+      }
+    }
+  }
+}
+
+void
+MotionCells::performMotionMaskCoords (motionmaskcoordrect * p_motionmaskcoords,
+    int p_motionmaskcoords_count)
+{
+  CvPoint upperleft;
+  upperleft.x = 0;
+  upperleft.y = 0;
+  CvPoint lowerright;
+  lowerright.x = 0;
+  lowerright.y = 0;
+  for (int i = 0; i < p_motionmaskcoords_count; i++) {
+    upperleft.x = p_motionmaskcoords[i].upper_left_x;
+    upperleft.y = p_motionmaskcoords[i].upper_left_y;
+    lowerright.x = p_motionmaskcoords[i].lower_right_x;
+    lowerright.y = p_motionmaskcoords[i].lower_right_y;
+    cvRectangle (m_pbwImage, upperleft, lowerright, CV_RGB (0, 0, 0),
+        CV_FILLED);
+  }
+}
+
+void
+MotionCells::performMotionMask (motioncellidx * p_motionmaskcellsidx,
+    int p_motionmaskcells_count)
+{
+  for (int k = 0; k < p_motionmaskcells_count; k++) {
+    int beginy = p_motionmaskcellsidx[k].lineidx * m_cellheight;
+    int beginx = p_motionmaskcellsidx[k].columnidx * m_cellwidth;
+    int endx =
+        (double) p_motionmaskcellsidx[k].columnidx * m_cellwidth + m_cellwidth;
+    int endy =
+        (double) p_motionmaskcellsidx[k].lineidx * m_cellheight + m_cellheight;
+    for (int i = beginy; i < endy; i++)
+      for (int j = beginx; j < endx; j++) {
+        ((uchar *) (m_pbwImage->imageData + m_pbwImage->widthStep * i))[j] = 0;
+      }
+  }
+}
+
+///BGR if we use only OpenCV
+//RGB if we use gst+OpenCV
+void
+MotionCells::blendImages (IplImage * p_actFrame, IplImage * p_cellsFrame,
+    float p_alpha, float p_beta)
+{
+
+  int height = p_actFrame->height;
+  int width = p_actFrame->width;
+  int step = p_actFrame->widthStep / sizeof (uchar);
+  int channels = p_actFrame->nChannels;
+  int cellstep = p_cellsFrame->widthStep / sizeof (uchar);
+  uchar *curImageData = (uchar *) p_actFrame->imageData;
+  uchar *cellImageData = (uchar *) p_cellsFrame->imageData;
+
+  for (int i = 0; i < height; i++)
+    for (int j = 0; j < width; j++)
+      for (int k = 0; k < channels; k++)
+        if (cellImageData[i * cellstep + j * channels + k] > 0) {
+          curImageData[i * step + j * channels + k] =
+              round ((double) curImageData[i * step + j * channels +
+                  k] * p_alpha + ((double) cellImageData[i * cellstep +
+                      j * channels + k] * p_beta));
+        }
+}
diff --git a/ext/opencv/MotionCells.h b/ext/opencv/MotionCells.h
new file mode 100644
index 0000000000..ee84fd6b5b
--- /dev/null
+++ b/ext/opencv/MotionCells.h
@@ -0,0 +1,259 @@
+/*
+ * GStreamer
+ * Copyright (C) 2011 Robert Jobbagy <jobbagy.robert@gmail.com>
+ * Copyright (C) 2011 Nicola Murino <nicola.murino@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Alternatively, the contents of this file may be used under the
+ * GNU Lesser General Public License Version 2.1 (the "LGPL"), in
+ * which case the following provisions apply instead of the ones
+ * mentioned above:
+ *
+ * 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 MOTIONCELLS_H_
+#define MOTIONCELLS_H_
+
+#include <cv.h>                 // includes OpenCV definitions
+#include <highgui.h>            // includes highGUI definitions
+#include <iostream>
+#include <fstream>
+#include <vector>
+#include <cstdio>
+#include <cmath>
+#include <glib.h>
+
+//MotionCells defines
+#define MC_HEADER 64
+#define MC_TYPE 1
+#define MC_VERSION 1
+#define MC_VERSIONTEXT "MotionCells-1"
+#define MSGLEN 6
+#define BUSMSGLEN 20
+
+using namespace std;
+
+struct MotionCellHeader{
+	gint32 headersize;
+	gint32 type;
+	gint32 version;
+	gint32 itemsize;
+	gint32 gridx;
+	gint32 gridy;
+	gint64 starttime;
+	char name[MC_HEADER - 32];
+};
+
+struct MotionCellData{
+	gint32 timestamp;
+	char *data;
+};
+
+typedef struct {
+	int upper_left_x;
+	int upper_left_y;
+	int lower_right_x;
+	int lower_right_y;
+} motionmaskcoordrect;
+
+typedef struct {
+	int R_channel_value;
+	int G_channel_value;
+	int B_channel_value;
+} cellscolor;
+
+typedef struct {
+	int lineidx;
+	int columnidx;
+} motioncellidx;
+
+struct Cell
+{
+  double MotionArea;
+  double CellArea;
+  double MotionPercent;
+  bool hasMotion;
+};
+
+struct MotionCellsIdx
+{
+  CvRect motioncell;
+  //Points for the edges of the rectangle.
+  CvPoint cell_pt1;
+  CvPoint cell_pt2;
+  int lineidx;
+  int colidx;
+};
+
+struct OverlayRegions
+{
+  CvPoint upperleft;
+  CvPoint lowerright;
+};
+
+class MotionCells
+{
+public:
+
+  MotionCells ();
+  virtual ~ MotionCells ();
+
+  int performDetectionMotionCells (IplImage * p_frame, double p_sensitivity,
+      double p_framerate, int p_gridx, int p_gridy, gint64 timestamp_millisec,
+      bool p_isVisble, bool p_useAlpha, int motionmaskcoord_count,
+      motionmaskcoordrect * motionmaskcoords, int motionmaskcells_count,
+      motioncellidx * motionmaskcellsidx, cellscolor motioncellscolor,
+      int motioncells_count, motioncellidx * motioncellsidx, gint64 starttime,
+      char *datafile, bool p_changed_datafile, int p_thickness);
+
+  void setPrevFrame (IplImage * p_prevframe)
+  {
+    m_pprevFrame = cvCloneImage (p_prevframe);
+  }
+  char *getMotionCellsIdx ()
+  {
+    return m_motioncellsidxcstr;
+  }
+
+  int getMotionCellsIdxCount ()
+  {
+    return m_motioncells_idx_count;
+  }
+
+  bool getChangedDataFile ()
+  {
+    return m_changed_datafile;
+  }
+
+  char *getDatafileInitFailed ()
+  {
+    return m_initdatafilefailed;
+  }
+
+  char *getDatafileSaveFailed ()
+  {
+    return m_savedatafilefailed;
+  }
+
+  int getInitErrorCode ()
+  {
+    return m_initerrorcode;
+  }
+
+  int getSaveErrorCode ()
+  {
+    return m_saveerrorcode;
+  }
+
+  void freeDataFile ()
+  {
+    if (mc_savefile) {
+      fclose (mc_savefile);
+      mc_savefile = NULL;
+      m_saveInDatafile = false;
+    }
+  }
+
+private:
+
+  double calculateMotionPercentInCell (int p_row, int p_col, double *p_cellarea,
+      double *p_motionarea);
+  void performMotionMaskCoords (motionmaskcoordrect * p_motionmaskcoords,
+      int p_motionmaskcoords_count);
+  void performMotionMask (motioncellidx * p_motionmaskcellsidx,
+      int p_motionmaskcells_count);
+  void calculateMotionPercentInMotionCells (motioncellidx *
+      p_motionmaskcellsidx, int p_motionmaskcells_count = 0);
+  int saveMotionCells (gint64 timestamp_millisec);
+  int initDataFile (char *p_datafile, gint64 starttime);
+  void blendImages (IplImage * p_actFrame, IplImage * p_cellsFrame,
+      float p_alpha, float p_beta);
+
+  void setData (IplImage * img, int lin, int col, uchar valor)
+  {
+    ((uchar *) (img->imageData + img->widthStep * lin))[col] = valor;
+  }
+
+  uchar getData (IplImage * img, int lin, int col)
+  {
+    return ((uchar *) (img->imageData + img->widthStep * lin))[col];
+  }
+
+  bool getIsNonZero (IplImage * img)
+  {
+    for (int lin = 0; lin < img->height; lin++)
+      for (int col = 0; col < img->width; col++) {
+        if ((((uchar *) (img->imageData + img->widthStep * lin))[col]) > 0)
+          return true;
+      }
+    return false;
+  }
+
+  void setMotionCells (int p_frameWidth, int p_frameHeight)
+  {
+    m_cellwidth = (double) p_frameWidth / (double) m_gridx;
+    m_cellheight = (double) p_frameHeight / (double) m_gridy;
+    m_pCells = new Cell *[m_gridy];
+    for (int i = 0; i < m_gridy; i++)
+      m_pCells[i] = new Cell[m_gridx];
+
+    //init cells
+    for (int i = 0; i < m_gridy; i++)
+      for (int j = 0; j < m_gridx; j++) {
+        m_pCells[i][j].MotionArea = 0;
+        m_pCells[i][j].CellArea = 0;
+        m_pCells[i][j].MotionPercent = 0;
+        m_pCells[i][j].hasMotion = false;
+      }
+  }
+
+  IplImage *m_pcurFrame, *m_pprevFrame, *m_pdifferenceImage,
+      *m_pbwImage,*transparencyimg;
+  CvSize m_frameSize;
+  bool m_isVisible, m_changed_datafile, m_useAlpha, m_saveInDatafile;
+  Cell **m_pCells;
+  vector < MotionCellsIdx > m_MotionCells;
+  vector < OverlayRegions > m_OverlayRegions;
+  int m_gridx, m_gridy;
+  double m_cellwidth, m_cellheight;
+  double m_alpha, m_beta;
+  double m_thresholdBoundingboxArea, m_cellArea, m_sensitivity;
+  int m_framecnt, m_motioncells_idx_count, m_initerrorcode, m_saveerrorcode;
+  char *m_motioncellsidxcstr, *m_initdatafilefailed, *m_savedatafilefailed;
+  FILE *mc_savefile;
+  MotionCellHeader m_header;
+
+};
+
+#endif /* MOTIONCELLS_H_ */
diff --git a/ext/opencv/gstmotioncells.c b/ext/opencv/gstmotioncells.c
new file mode 100644
index 0000000000..0292959315
--- /dev/null
+++ b/ext/opencv/gstmotioncells.c
@@ -0,0 +1,1111 @@
+/*
+ * GStreamer MotioCells detect areas of motion
+ * Copyright (C) 2011 Robert Jobbagy <jobbagy.robert@gmail.com>
+ * Copyright (C) 2011 Nicola Murino <nicola.murino@gmail.com>
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Alternatively, the contents of this file may be used under the
+ * GNU Lesser General Public License Version 2.1 (the "LGPL"), in
+ * which case the following provisions apply instead of the ones
+ * mentioned above:
+ *
+ * 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-motioncells
+ *
+ * Performs motion detection on videos.
+ *
+ * <refsect2>
+ * <title>Example launch line</title>
+ * |[
+ * gst-launch-0.10 videotestsrc pattern=18 ! videorate ! videoscale ! video/x-raw-yuv,width=320,height=240,framerate=5/1 ! ffmpegcolorspace ! motioncells ! ffmpegcolorspace ! xvimagesink
+ * ]|
+ * </refsect2>
+ */
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#include <stdio.h>
+#include <string.h>
+#include <glib.h>
+#include "gstmotioncells.h"
+#include "motioncells_wrapper.h"
+#include <sys/time.h>
+#include <time.h>
+#include <limits.h>
+
+GST_DEBUG_CATEGORY_STATIC (gst_motion_cells_debug);
+#define GST_CAT_DEFAULT gst_motion_cells_debug
+
+#define GRID_DEF 10
+#define GRID_MIN 8
+#define GRID_MAX 32
+#define SENSITIVITY_DEFAULT 0.5
+#define SENSITIVITY_MIN 0
+#define SENSITIVITY_MAX 1
+#define THRESHOLD_MIN 0
+#define THRESHOLD_DEFAULT 0.01
+#define THRESHOLD_MAX 1.0
+#define GAP_MIN 1
+#define GAP_DEF 5
+#define GAP_MAX 60
+#define POST_NO_MOTION_MIN 0
+#define POST_NO_MOTION_DEF 0
+#define POST_NO_MOTION_MAX 180
+#define MINIMUM_MOTION_FRAMES_MIN 1
+#define MINIMUM_MOTION_FRAMES_DEF 1
+#define MINIMUM_MOTION_FRAMES_MAX 60
+#define THICKNESS_MIN -1
+#define THICKNESS_DEF 1
+#define THICKNESS_MAX 5
+#define DATE_MIN 0
+#define DATE_DEF 1
+#define DATE_MAX LONG_MAX
+#define DEF_DATAFILEEXT "vamc"
+#define MSGLEN 6
+#define BUSMSGLEN 20
+
+#define GFREE(POINTER)\
+		{\
+			g_free(POINTER);\
+			POINTER = NULL;\
+		}
+
+int instanceCounter = 0;
+gboolean element_id_was_max = false;
+
+/* Filter signals and args */
+enum
+{
+  /* FILL ME */
+  LAST_SIGNAL
+};
+
+enum
+{
+  PROP_0,
+  PROP_GRID_X,
+  PROP_GRID_Y,
+  PROP_SENSITIVITY,
+  PROP_THRESHOLD,
+  PROP_DISPLAY,
+  PROP_DATE,
+  PROP_DATAFILE,
+  PROP_DATAFILE_EXT,
+  PROP_MOTIONMASKCOORD,
+  PROP_MOTIONMASKCELLSPOS,
+  PROP_CELLSCOLOR,
+  PROP_MOTIONCELLSIDX,
+  PROP_GAP,
+  PROP_POSTNOMOTION,
+  PROP_MINIMUNMOTIONFRAMES,
+  PROP_CALCULATEMOTION,
+  PROP_POSTALLMOTION,
+  PROP_USEALPHA,
+  PROP_MOTIONCELLTHICKNESS
+};
+
+/* the capabilities of the inputs and outputs.
+ */
+static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS ("video/x-raw-rgb"));
+
+static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS ("video/x-raw-rgb"));
+
+GST_BOILERPLATE (GstMotioncells, gst_motion_cells, GstElement,
+    GST_TYPE_ELEMENT);
+
+static void gst_motion_cells_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
+static void gst_motion_cells_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+
+static gboolean gst_motion_cells_set_caps (GstPad * pad, GstCaps * caps);
+static GstFlowReturn gst_motion_cells_chain (GstPad * pad, GstBuffer * buf);
+
+static void gst_motioncells_update_motion_cells (GstMotioncells * filter);
+static void gst_motioncells_update_motion_masks (GstMotioncells * filter);
+
+/* Clean up */
+static void
+gst_motion_cells_finalize (GObject * obj)
+{
+  GstMotioncells *filter = gst_motion_cells (obj);
+
+  motion_cells_free (filter->id);
+
+  //freeing previously allocated dynamic array
+  if (filter->motionmaskcoord_count > 0) {
+    GFREE (filter->motionmaskcoords);
+  }
+
+  if (filter->motionmaskcells_count > 0) {
+    GFREE (filter->motionmaskcellsidx);
+  }
+  if (filter->motioncells_count > 0) {
+    GFREE (filter->motioncellsidx);
+  }
+
+  if (filter->cvImage) {
+    cvReleaseImage (&filter->cvImage);
+  }
+
+  GFREE (filter->motioncellscolor);
+  GFREE (filter->prev_datafile);
+  GFREE (filter->cur_datafile);
+  GFREE (filter->basename_datafile);
+  GFREE (filter->datafile_extension);
+
+  g_mutex_free (filter->propset_mutex);
+
+  G_OBJECT_CLASS (parent_class)->finalize (obj);
+}
+
+/* GObject vmethod implementations */
+static void
+gst_motion_cells_base_init (gpointer gclass)
+{
+  GstElementClass *element_class = GST_ELEMENT_CLASS (gclass);
+
+  gst_element_class_set_details_simple (element_class,
+      "motioncells",
+      "Filter/Effect/Video",
+      "Performs motion detection on videos and images, providing detected motion cells index via bus messages",
+      "Robert Jobbagy <jobbagy dot robert at gmail dot com>, Nicola Murino <nicola dot murino at gmail.com>");
+
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&src_factory));
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&sink_factory));
+}
+
+/* initialize the motioncells's class */
+static void
+gst_motion_cells_class_init (GstMotioncellsClass * 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->finalize = GST_DEBUG_FUNCPTR (gst_motion_cells_finalize);
+  gobject_class->set_property = gst_motion_cells_set_property;
+  gobject_class->get_property = gst_motion_cells_get_property;
+
+  g_object_class_install_property (gobject_class, PROP_GRID_X,
+      g_param_spec_int ("gridx", "Number of Horizontal Grids",
+          "You can give number of horizontal grid cells.", GRID_MIN, GRID_MAX,
+          GRID_DEF, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class, PROP_GRID_Y,
+      g_param_spec_int ("gridy", "Number of Vertical Grids",
+          "You can give number of vertical grid cells.", GRID_MIN, GRID_MAX,
+          GRID_DEF, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class, PROP_SENSITIVITY,
+      g_param_spec_double ("sensitivity", "Motion Sensitivity",
+          "You can tunning the element motion sensitivity.", SENSITIVITY_MIN,
+          SENSITIVITY_MAX, SENSITIVITY_DEFAULT,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class, PROP_THRESHOLD,
+      g_param_spec_double ("threshold", "Lower bound of motion cells number",
+          "Threshold value for motion, when motion cells number greater sum cells * threshold, we show motion.",
+          THRESHOLD_MIN, THRESHOLD_MAX, THRESHOLD_DEFAULT,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class, PROP_GAP,
+      g_param_spec_int ("gap",
+          "Gap is time in second, elapsed time from last motion timestamp. ",
+          "If elapsed time minus form last motion timestamp is greater or equal than gap then we post motion finished bus message. ",
+          GAP_MIN, GAP_MAX, GAP_DEF,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class, PROP_POSTNOMOTION,
+      g_param_spec_int ("postnomotion", "POSTNOMOTION",
+          "If non 0 post a no_motion event is posted on the bus if no motion is detected for N seconds",
+          POST_NO_MOTION_MIN, POST_NO_MOTION_MAX, POST_NO_MOTION_DEF,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class, PROP_MINIMUNMOTIONFRAMES,
+      g_param_spec_int ("minimummotionframes", "MINIMUN MOTION FRAMES",
+          "Define the minimum number of motion frames that trigger a motion event",
+          MINIMUM_MOTION_FRAMES_MIN, MINIMUM_MOTION_FRAMES_MAX,
+          MINIMUM_MOTION_FRAMES_DEF,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class, PROP_DISPLAY,
+      g_param_spec_boolean ("display", "Display",
+          "Motion Cells visible or not on Current Frame", FALSE,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class, PROP_POSTALLMOTION,
+      g_param_spec_boolean ("postallmotion", "Post All Motion",
+          "Element post bus msg for every motion frame or just motion start and motion stop",
+          FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class, PROP_USEALPHA,
+      g_param_spec_boolean ("usealpha", "Use alpha",
+          "Use or not alpha blending on frames with motion cells", TRUE,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class, PROP_DATE,
+      g_param_spec_long ("date", "Motion Cell Date",
+          "Current Date in milliseconds", DATE_MIN, DATE_MAX, DATE_DEF,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class, PROP_DATAFILE,
+      g_param_spec_string ("datafile", "DataFile",
+          "Location of motioncells data file (empty string means no saving)",
+          NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class, PROP_DATAFILE_EXT,
+      g_param_spec_string ("datafileextension", "DataFile Extension",
+          "Extension of datafile", DEF_DATAFILEEXT,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class, PROP_MOTIONMASKCOORD,
+      g_param_spec_string ("motionmaskcoords", "Motion Mask with Coordinates",
+          "The upper left x, y and lower right x, y coordinates separated with \":\", "
+          "describe a region. Regions separated with \",\"", NULL,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class, PROP_MOTIONMASKCELLSPOS,
+      g_param_spec_string ("motionmaskcellspos",
+          "Motion Mask with Cells Position",
+          "The line and column idx separated with \":\" what cells want we mask-out, "
+          "describe a cell. Cells separated with \",\"", NULL,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class, PROP_CELLSCOLOR,
+      g_param_spec_string ("cellscolor", "Color of Motion Cells",
+          "The color of motion cells separated with \",\"", "255,255,0",
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class, PROP_MOTIONCELLSIDX,
+      g_param_spec_string ("motioncellsidx", "Motion Cells Of Interest(MOCI)",
+          "The line and column idx separated with \":\", "
+          "describe a cell. Cells separated with \",\"", NULL,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class, PROP_CALCULATEMOTION,
+      g_param_spec_boolean ("calculatemotion", "Calculate Motion",
+          "If needs calculate motion on frame you need this property setting true otherwise false",
+          TRUE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class, PROP_MOTIONCELLTHICKNESS,
+      g_param_spec_int ("motioncellthickness", "Motion Cell Thickness",
+          "Motion Cell Border Thickness, if it's -1 then motion cell will be fill",
+          THICKNESS_MIN, THICKNESS_MAX, THICKNESS_DEF,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+}
+
+/* initialize the new element
+ * instantiate pads and add them to element
+ * set pad callback functions
+ * initialize instance structure
+ */
+static void
+gst_motion_cells_init (GstMotioncells * filter, GstMotioncellsClass * gclass)
+{
+  filter->propset_mutex = g_mutex_new ();
+  filter->sinkpad = gst_pad_new_from_static_template (&sink_factory, "sink");
+  gst_pad_set_setcaps_function (filter->sinkpad,
+      GST_DEBUG_FUNCPTR (gst_motion_cells_set_caps));
+  gst_pad_set_getcaps_function (filter->sinkpad,
+      GST_DEBUG_FUNCPTR (gst_pad_proxy_getcaps));
+  gst_pad_set_chain_function (filter->sinkpad,
+      GST_DEBUG_FUNCPTR (gst_motion_cells_chain));
+
+  filter->srcpad = gst_pad_new_from_static_template (&src_factory, "src");
+  gst_pad_set_getcaps_function (filter->srcpad,
+      GST_DEBUG_FUNCPTR (gst_pad_proxy_getcaps));
+
+  gst_element_add_pad (GST_ELEMENT (filter), filter->sinkpad);
+  gst_element_add_pad (GST_ELEMENT (filter), filter->srcpad);
+
+  filter->display = TRUE;
+  filter->calculate_motion = TRUE;
+
+  filter->prevgridx = 0;
+  filter->prevgridy = 0;
+  filter->gridx = GRID_DEF;
+  filter->gridy = GRID_DEF;
+  filter->gap = GAP_DEF;
+  filter->postnomotion = POST_NO_MOTION_DEF;
+  filter->minimum_motion_frames = MINIMUM_MOTION_FRAMES_DEF;
+
+  filter->prev_datafile = g_strdup (NULL);
+  filter->cur_datafile = g_strdup (NULL);
+  filter->basename_datafile = g_strdup (NULL);
+  filter->datafile_extension = g_strdup (DEF_DATAFILEEXT);
+  filter->sensitivity = SENSITIVITY_DEFAULT;
+  filter->threshold = THRESHOLD_DEFAULT;
+
+  filter->motionmaskcoord_count = 0;
+  filter->motionmaskcoords = NULL;
+  filter->motionmaskcells_count = 0;
+  filter->motionmaskcellsidx = NULL;
+  filter->motioncellscolor = g_new0 (cellscolor, 1);
+  filter->motioncellscolor->R_channel_value = 255;
+  filter->motioncellscolor->G_channel_value = 255;
+  filter->motioncellscolor->B_channel_value = 0;
+  filter->motioncellsidx = NULL;
+  filter->motioncells_count = 0;
+  filter->motion_begin_timestamp = 0;
+  filter->last_motion_timestamp = 0;
+  filter->last_nomotion_notified = 0;
+  filter->consecutive_motion = 0;
+  filter->motion_timestamp = 0;
+  filter->prev_buff_timestamp = 0;
+  filter->cur_buff_timestamp = 0;
+  filter->diff_timestamp = -1;
+  gettimeofday (&filter->tv, NULL);
+  filter->starttime = 1000 * filter->tv.tv_sec;
+  filter->previous_motion = false;
+  filter->changed_datafile = false;
+  filter->postallmotion = false;
+  filter->usealpha = true;
+  filter->firstdatafile = false;
+  filter->firstgridx = true;
+  filter->firstgridy = true;
+  filter->changed_gridx = false;
+  filter->changed_gridy = false;
+  filter->firstframe = true;
+  filter->changed_startime = false;
+  filter->sent_init_error_msg = false;
+  filter->sent_save_error_msg = false;
+  filter->thickness = THICKNESS_DEF;
+
+  filter->datafileidx = 0;
+  g_mutex_lock (filter->propset_mutex);
+  filter->id = instanceCounter;
+  motion_cells_init ();
+  g_mutex_unlock (filter->propset_mutex);
+
+}
+
+static void
+gst_motion_cells_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstMotioncells *filter = gst_motion_cells (object);
+  //variables for overlay regions setup
+  gchar **strs, **colorstr, **motioncellsstr, **motionmaskcellsstr;
+  int i, ux, uy, lx, ly;
+  int r, g, b;
+  int cellscolorscnt = 0;
+  int linidx, colidx, masklinidx, maskcolidx;
+  int tmpux = -1;
+  int tmpuy = -1;
+  int tmplx = -1;
+  int tmply = -1;
+  GstStateChangeReturn ret;
+
+  g_mutex_lock (filter->propset_mutex);
+  switch (prop_id) {
+    case PROP_GRID_X:
+      ret = gst_element_get_state (GST_ELEMENT (filter),
+          &filter->state, NULL, 250 * GST_NSECOND);
+      filter->gridx = g_value_get_int (value);
+      if (filter->prevgridx != filter->gridx
+          && ret == GST_STATE_CHANGE_SUCCESS
+          && filter->state == GST_STATE_PLAYING) {
+        filter->changed_gridx = true;
+      }
+      filter->prevgridx = filter->gridx;
+      break;
+    case PROP_GRID_Y:
+      ret = gst_element_get_state (GST_ELEMENT (filter),
+          &filter->state, NULL, 250 * GST_NSECOND);
+      filter->gridy = g_value_get_int (value);
+      if (filter->prevgridy != filter->gridy
+          && ret == GST_STATE_CHANGE_SUCCESS
+          && filter->state == GST_STATE_PLAYING) {
+        filter->changed_gridy = true;
+      }
+      filter->prevgridy = filter->gridy;
+      break;
+    case PROP_GAP:
+      filter->gap = g_value_get_int (value);
+      break;
+    case PROP_POSTNOMOTION:
+      filter->postnomotion = g_value_get_int (value);
+      break;
+    case PROP_MINIMUNMOTIONFRAMES:
+      filter->minimum_motion_frames = g_value_get_int (value);
+      break;
+    case PROP_SENSITIVITY:
+      filter->sensitivity = g_value_get_double (value);
+      break;
+    case PROP_THRESHOLD:
+      filter->threshold = g_value_get_double (value);
+      break;
+    case PROP_DISPLAY:
+      filter->display = g_value_get_boolean (value);
+      break;
+    case PROP_POSTALLMOTION:
+      filter->postallmotion = g_value_get_boolean (value);
+      break;
+    case PROP_USEALPHA:
+      filter->usealpha = g_value_get_boolean (value);
+      break;
+    case PROP_CALCULATEMOTION:
+      filter->calculate_motion = g_value_get_boolean (value);
+      break;
+    case PROP_DATE:
+      ret = gst_element_get_state (GST_ELEMENT (filter),
+          &filter->state, NULL, 250 * GST_NSECOND);
+      if (ret == GST_STATE_CHANGE_SUCCESS && filter->state == GST_STATE_PLAYING) {
+        filter->changed_startime = true;
+      }
+      filter->starttime = g_value_get_long (value);
+      break;
+    case PROP_DATAFILE:
+      GFREE (filter->cur_datafile);
+      GFREE (filter->basename_datafile);
+      filter->basename_datafile = g_value_dup_string (value);
+
+      if (strlen (filter->basename_datafile) == 0) {
+        filter->cur_datafile = g_strdup (NULL);
+        break;
+      }
+      filter->cur_datafile =
+          g_strdup_printf ("%s-0.%s", filter->basename_datafile,
+          filter->datafile_extension);
+      if (g_strcmp0 (filter->prev_datafile, filter->basename_datafile) != 0) {
+        filter->changed_datafile = TRUE;
+        filter->sent_init_error_msg = FALSE;
+        filter->sent_save_error_msg = FALSE;
+        filter->datafileidx = 0;
+        motion_cells_free_resources (filter->id);
+      } else {
+        filter->changed_datafile = FALSE;
+      }
+
+      GFREE (filter->prev_datafile);
+      filter->prev_datafile = g_strdup (filter->basename_datafile);
+      break;
+    case PROP_DATAFILE_EXT:
+      GFREE (filter->datafile_extension);
+      filter->datafile_extension = g_value_dup_string (value);
+      break;
+    case PROP_MOTIONMASKCOORD:
+      strs = g_strsplit (g_value_get_string (value), ",", 255);
+      GFREE (filter->motionmaskcoords);
+      //setting number of regions
+      for (filter->motionmaskcoord_count = 0;
+          strs[filter->motionmaskcoord_count] != NULL;
+          ++filter->motionmaskcoord_count);
+      if (filter->motionmaskcoord_count > 0) {
+        sscanf (strs[0], "%d:%d:%d:%d", &tmpux, &tmpuy, &tmplx, &tmply);
+        if (tmpux > -1 && tmpuy > -1 && tmplx > -1 && tmply > -1) {
+          filter->motionmaskcoords =
+              g_new0 (motionmaskcoordrect, filter->motionmaskcoord_count);
+
+          for (i = 0; i < filter->motionmaskcoord_count; ++i) {
+            sscanf (strs[i], "%d:%d:%d:%d", &ux, &uy, &lx, &ly);
+            ux = CLAMP (ux, 0, filter->width - 1);
+            uy = CLAMP (uy, 0, filter->height - 1);
+            lx = CLAMP (lx, 0, filter->width - 1);
+            ly = CLAMP (ly, 0, filter->height - 1);
+            filter->motionmaskcoords[i].upper_left_x = ux;
+            filter->motionmaskcoords[i].upper_left_y = uy;
+            filter->motionmaskcoords[i].lower_right_x = lx;
+            filter->motionmaskcoords[i].lower_right_y = ly;
+          }
+        } else {
+          filter->motionmaskcoord_count = 0;
+        }
+      }
+      if (strs)
+        g_strfreev (strs);
+      tmpux = -1;
+      tmpuy = -1;
+      tmplx = -1;
+      tmply = -1;
+      break;
+    case PROP_MOTIONMASKCELLSPOS:
+      motionmaskcellsstr = g_strsplit (g_value_get_string (value), ",", 255);
+      GFREE (filter->motionmaskcellsidx);
+      //setting number of regions
+      for (filter->motionmaskcells_count = 0;
+          motionmaskcellsstr[filter->motionmaskcells_count] != NULL;
+          ++filter->motionmaskcells_count);
+      if (filter->motionmaskcells_count > 0) {
+        sscanf (motionmaskcellsstr[0], "%d:%d", &tmpux, &tmpuy);
+        if (tmpux > -1 && tmpuy > -1) {
+          filter->motionmaskcellsidx =
+              g_new0 (motioncellidx, filter->motionmaskcells_count);
+          for (i = 0; i < filter->motionmaskcells_count; ++i) {
+            sscanf (motionmaskcellsstr[i], "%d:%d", &masklinidx, &maskcolidx);
+            filter->motionmaskcellsidx[i].lineidx = masklinidx;
+            filter->motionmaskcellsidx[i].columnidx = maskcolidx;
+          }
+        } else {
+          filter->motionmaskcells_count = 0;
+        }
+      }
+      if (motionmaskcellsstr)
+        g_strfreev (motionmaskcellsstr);
+      tmpux = -1;
+      tmpuy = -1;
+      tmplx = -1;
+      tmply = -1;
+      break;
+    case PROP_CELLSCOLOR:
+      colorstr = g_strsplit (g_value_get_string (value), ",", 255);
+      for (cellscolorscnt = 0; colorstr[cellscolorscnt] != NULL;
+          ++cellscolorscnt);
+      if (cellscolorscnt == 3) {
+        sscanf (colorstr[0], "%d", &r);
+        sscanf (colorstr[1], "%d", &g);
+        sscanf (colorstr[2], "%d", &b);
+        //check right RGB color format
+        r = CLAMP (r, 1, 255);
+        g = CLAMP (g, 1, 255);
+        b = CLAMP (b, 1, 255);
+        filter->motioncellscolor->R_channel_value = r;
+        filter->motioncellscolor->G_channel_value = g;
+        filter->motioncellscolor->B_channel_value = b;
+      }
+      if (colorstr)
+        g_strfreev (colorstr);
+      break;
+    case PROP_MOTIONCELLSIDX:
+      motioncellsstr = g_strsplit (g_value_get_string (value), ",", 255);
+
+      //setting number of regions
+      for (filter->motioncells_count = 0;
+          motioncellsstr[filter->motioncells_count] != NULL;
+          ++filter->motioncells_count);
+      if (filter->motioncells_count > 0) {
+        sscanf (motioncellsstr[0], "%d:%d", &tmpux, &tmpuy);
+        if (tmpux > -1 && tmpuy > -1) {
+          GFREE (filter->motioncellsidx);
+
+          filter->motioncellsidx =
+              g_new0 (motioncellidx, filter->motioncells_count);
+
+          for (i = 0; i < filter->motioncells_count; ++i) {
+            sscanf (motioncellsstr[i], "%d:%d", &linidx, &colidx);
+            filter->motioncellsidx[i].lineidx = linidx;
+            filter->motioncellsidx[i].columnidx = colidx;
+          }
+        } else {
+          filter->motioncells_count = 0;
+        }
+      }
+      if (motioncellsstr)
+        g_strfreev (motioncellsstr);
+      tmpux = -1;
+      tmpuy = -1;
+      tmplx = -1;
+      tmply = -1;
+      break;
+    case PROP_MOTIONCELLTHICKNESS:
+      filter->thickness = g_value_get_int (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+  g_mutex_unlock (filter->propset_mutex);
+}
+
+static void
+gst_motion_cells_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstMotioncells *filter = gst_motion_cells (object);
+  GString *str;
+  int i;
+
+  switch (prop_id) {
+    case PROP_GRID_X:
+      g_value_set_int (value, filter->gridx);
+      break;
+    case PROP_GRID_Y:
+      g_value_set_int (value, filter->gridy);
+      break;
+    case PROP_GAP:
+      g_value_set_int (value, filter->gap);
+      break;
+    case PROP_POSTNOMOTION:
+      g_value_set_int (value, filter->postnomotion);
+      break;
+    case PROP_MINIMUNMOTIONFRAMES:
+      g_value_set_int (value, filter->minimum_motion_frames);
+      break;
+    case PROP_SENSITIVITY:
+      g_value_set_double (value, filter->sensitivity);
+      break;
+    case PROP_THRESHOLD:
+      g_value_set_double (value, filter->threshold);
+      break;
+    case PROP_DISPLAY:
+      g_value_set_boolean (value, filter->display);
+      break;
+    case PROP_POSTALLMOTION:
+      g_value_set_boolean (value, filter->postallmotion);
+      break;
+    case PROP_USEALPHA:
+      g_value_set_boolean (value, filter->usealpha);
+      break;
+    case PROP_CALCULATEMOTION:
+      g_value_set_boolean (value, filter->calculate_motion);
+      break;
+    case PROP_DATE:
+      g_value_set_long (value, filter->starttime);
+      break;
+    case PROP_DATAFILE:
+      g_value_set_string (value, filter->basename_datafile);
+      break;
+    case PROP_DATAFILE_EXT:
+      g_value_set_string (value, filter->datafile_extension);
+      break;
+    case PROP_MOTIONMASKCOORD:
+      str = g_string_new ("");
+      for (i = 0; i < filter->motionmaskcoord_count; ++i) {
+        if (i < filter->motionmaskcoord_count - 1)
+          g_string_append_printf (str, "%d:%d:%d:%d,",
+              filter->motionmaskcoords[i].upper_left_x,
+              filter->motionmaskcoords[i].upper_left_y,
+              filter->motionmaskcoords[i].lower_right_x,
+              filter->motionmaskcoords[i].lower_right_y);
+        else
+          g_string_append_printf (str, "%d:%d:%d:%d",
+              filter->motionmaskcoords[i].upper_left_x,
+              filter->motionmaskcoords[i].upper_left_y,
+              filter->motionmaskcoords[i].lower_right_x,
+              filter->motionmaskcoords[i].lower_right_y);
+
+      }
+      g_value_set_string (value, str->str);
+      g_string_free (str, TRUE);
+      break;
+    case PROP_MOTIONMASKCELLSPOS:
+      str = g_string_new ("");
+      for (i = 0; i < filter->motionmaskcells_count; ++i) {
+        if (i < filter->motionmaskcells_count - 1)
+          g_string_append_printf (str, "%d:%d,",
+              filter->motionmaskcellsidx[i].lineidx,
+              filter->motionmaskcellsidx[i].columnidx);
+        else
+          g_string_append_printf (str, "%d:%d",
+              filter->motionmaskcellsidx[i].lineidx,
+              filter->motionmaskcellsidx[i].columnidx);
+      }
+      g_value_set_string (value, str->str);
+      g_string_free (str, TRUE);
+      break;
+    case PROP_CELLSCOLOR:
+      str = g_string_new ("");
+
+      g_string_printf (str, "%d,%d,%d",
+          filter->motioncellscolor->R_channel_value,
+          filter->motioncellscolor->G_channel_value,
+          filter->motioncellscolor->B_channel_value);
+
+      g_value_set_string (value, str->str);
+      g_string_free (str, TRUE);
+      break;
+    case PROP_MOTIONCELLSIDX:
+      str = g_string_new ("");
+      for (i = 0; i < filter->motioncells_count; ++i) {
+        if (i < filter->motioncells_count - 1)
+          g_string_append_printf (str, "%d:%d,",
+              filter->motioncellsidx[i].lineidx,
+              filter->motioncellsidx[i].columnidx);
+        else
+          g_string_append_printf (str, "%d:%d",
+              filter->motioncellsidx[i].lineidx,
+              filter->motioncellsidx[i].columnidx);
+      }
+      g_value_set_string (value, str->str);
+      g_string_free (str, TRUE);
+      break;
+    case PROP_MOTIONCELLTHICKNESS:
+      g_value_set_int (value, filter->thickness);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_motioncells_update_motion_cells (GstMotioncells * filter)
+{
+  int i = 0;
+  int cellscnt = 0;
+  int j = 0;
+  int newcellscnt;
+  motioncellidx *motioncellsidx;
+  for (i = 0; i < filter->motioncells_count; i++) {
+    if ((filter->gridx <= filter->motioncellsidx[i].columnidx) ||
+        (filter->gridy <= filter->motioncellsidx[i].lineidx)) {
+      cellscnt++;
+    }
+  }
+  newcellscnt = filter->motioncells_count - cellscnt;
+  motioncellsidx = g_new0 (motioncellidx, newcellscnt);
+  for (i = 0; i < filter->motioncells_count; i++) {
+    if ((filter->motioncellsidx[i].lineidx < filter->gridy) &&
+        (filter->motioncellsidx[i].columnidx < filter->gridx)) {
+      motioncellsidx[j].lineidx = filter->motioncellsidx[i].lineidx;
+      motioncellsidx[j].columnidx = filter->motioncellsidx[i].columnidx;
+      j++;
+    }
+  }
+  GFREE (filter->motioncellsidx);
+  filter->motioncells_count = newcellscnt;
+  filter->motioncellsidx = g_new0 (motioncellidx, filter->motioncells_count);
+  j = 0;
+  for (i = 0; i < filter->motioncells_count; i++) {
+    filter->motioncellsidx[i].lineidx = motioncellsidx[j].lineidx;
+    filter->motioncellsidx[i].columnidx = motioncellsidx[j].columnidx;
+    j++;
+  }
+  GFREE (motioncellsidx);
+}
+
+static void
+gst_motioncells_update_motion_masks (GstMotioncells * filter)
+{
+
+  int i = 0;
+  int maskcnt = 0;
+  int j = 0;
+  int newmaskcnt;
+  motioncellidx *motionmaskcellsidx;
+  for (i = 0; i < filter->motionmaskcells_count; i++) {
+    if ((filter->gridx <= filter->motionmaskcellsidx[i].columnidx) ||
+        (filter->gridy <= filter->motionmaskcellsidx[i].lineidx)) {
+      maskcnt++;
+    }
+  }
+  newmaskcnt = filter->motionmaskcells_count - maskcnt;
+  motionmaskcellsidx = g_new0 (motioncellidx, newmaskcnt);
+  for (i = 0; i < filter->motionmaskcells_count; i++) {
+    if ((filter->motionmaskcellsidx[i].lineidx < filter->gridy) &&
+        (filter->motionmaskcellsidx[i].columnidx < filter->gridx)) {
+      motionmaskcellsidx[j].lineidx = filter->motionmaskcellsidx[i].lineidx;
+      motionmaskcellsidx[j].columnidx = filter->motionmaskcellsidx[i].columnidx;
+      j++;
+    }
+  }
+  GFREE (filter->motionmaskcellsidx);
+  filter->motionmaskcells_count = newmaskcnt;
+  filter->motionmaskcellsidx =
+      g_new0 (motioncellidx, filter->motionmaskcells_count);
+  j = 0;
+  for (i = 0; i < filter->motionmaskcells_count; i++) {
+    filter->motionmaskcellsidx[i].lineidx = motionmaskcellsidx[j].lineidx;
+    filter->motionmaskcellsidx[i].columnidx = motionmaskcellsidx[j].columnidx;
+    j++;
+  }
+  GFREE (motionmaskcellsidx);
+}
+
+/* GstElement vmethod implementations */
+
+/* this function handles the link with other elements */
+static gboolean
+gst_motion_cells_set_caps (GstPad * pad, GstCaps * caps)
+{
+  GstMotioncells *filter;
+  GstPad *otherpad;
+  GstStructure *structure;
+  int numerator, denominator;
+
+  filter = gst_motion_cells (gst_pad_get_parent (pad));
+  structure = gst_caps_get_structure (caps, 0);
+  gst_structure_get_int (structure, "width", &filter->width);
+  gst_structure_get_int (structure, "height", &filter->height);
+  gst_structure_get_fraction (structure, "framerate", &numerator, &denominator);
+  filter->framerate = (double) numerator / (double) denominator;
+  if (filter->cvImage)
+    cvReleaseImage (&filter->cvImage);
+  filter->cvImage =
+      cvCreateImage (cvSize (filter->width, filter->height), IPL_DEPTH_8U, 3);
+
+  otherpad = (pad == filter->srcpad) ? filter->sinkpad : filter->srcpad;
+  gst_object_unref (filter);
+
+  return gst_pad_set_caps (otherpad, caps);
+}
+
+/* chain function
+ * this function does the actual processing
+ */
+static GstFlowReturn
+gst_motion_cells_chain (GstPad * pad, GstBuffer * buf)
+{
+
+  GstMotioncells *filter;
+
+  filter = gst_motion_cells (GST_OBJECT_PARENT (pad));
+  if (filter->calculate_motion) {
+    double sensitivity;
+    int framerate, gridx, gridy, motionmaskcells_count, motionmaskcoord_count,
+        motioncells_count, i;
+    int thickness, success, motioncellsidxcnt, numberOfCells,
+        motioncellsnumber, cellsOfInterestNumber;
+    int mincellsOfInterestNumber, motiondetect;
+    char *datafile;
+    bool display, changed_datafile, useAlpha;
+    gint64 starttime;
+    motionmaskcoordrect *motionmaskcoords;
+    motioncellidx *motionmaskcellsidx;
+    cellscolor motioncellscolor;
+    motioncellidx *motioncellsidx;
+    g_mutex_lock (filter->propset_mutex);
+    buf = gst_buffer_make_writable (buf);
+    filter->cvImage->imageData = (char *) GST_BUFFER_DATA (buf);
+    if (filter->firstframe) {
+      setPrevFrame (filter->cvImage, filter->id);
+      filter->firstframe = FALSE;
+    }
+
+    sensitivity = filter->sensitivity;
+    framerate = filter->framerate;
+    gridx = filter->gridx;
+    gridy = filter->gridy;
+    display = filter->display;
+    motionmaskcoord_count = filter->motionmaskcoord_count;
+    motionmaskcoords =
+        g_new0 (motionmaskcoordrect, filter->motionmaskcoord_count);
+    for (i = 0; i < filter->motionmaskcoord_count; i++) {       //we need divide 2 because we use gauss pyramid in C++ side
+      motionmaskcoords[i].upper_left_x =
+          filter->motionmaskcoords[i].upper_left_x / 2;
+      motionmaskcoords[i].upper_left_y =
+          filter->motionmaskcoords[i].upper_left_y / 2;
+      motionmaskcoords[i].lower_right_x =
+          filter->motionmaskcoords[i].lower_right_x / 2;
+      motionmaskcoords[i].lower_right_y =
+          filter->motionmaskcoords[i].lower_right_y / 2;
+    }
+
+    motioncellscolor.R_channel_value =
+        filter->motioncellscolor->R_channel_value;
+    motioncellscolor.G_channel_value =
+        filter->motioncellscolor->G_channel_value;
+    motioncellscolor.B_channel_value =
+        filter->motioncellscolor->B_channel_value;
+
+    if ((filter->changed_gridx || filter->changed_gridy
+            || filter->changed_startime)) {
+      if ((g_strcmp0 (filter->cur_datafile, NULL) != 0)) {
+        GFREE (filter->cur_datafile);
+        filter->datafileidx++;
+        filter->cur_datafile =
+            g_strdup_printf ("%s-%d.%s", filter->basename_datafile,
+            filter->datafileidx, filter->datafile_extension);
+        filter->changed_datafile = TRUE;
+        motion_cells_free_resources (filter->id);
+      }
+      if (filter->motioncells_count > 0)
+        gst_motioncells_update_motion_cells (filter);
+      if (filter->motionmaskcells_count > 0)
+        gst_motioncells_update_motion_masks (filter);
+      filter->changed_gridx = FALSE;
+      filter->changed_gridy = FALSE;
+      filter->changed_startime = FALSE;
+    }
+    datafile = g_strdup (filter->cur_datafile);
+    filter->cur_buff_timestamp = (GST_BUFFER_TIMESTAMP (buf) / GST_MSECOND);
+    filter->starttime +=
+        (filter->cur_buff_timestamp - filter->prev_buff_timestamp);
+    starttime = filter->starttime;
+    if (filter->changed_datafile || filter->diff_timestamp < 0)
+      filter->diff_timestamp =
+          (gint64) (GST_BUFFER_TIMESTAMP (buf) / GST_MSECOND);
+    changed_datafile = filter->changed_datafile;
+    motionmaskcells_count = filter->motionmaskcells_count;
+    motionmaskcellsidx = g_new0 (motioncellidx, filter->motionmaskcells_count);
+    for (i = 0; i < filter->motionmaskcells_count; i++) {
+      motionmaskcellsidx[i].lineidx = filter->motionmaskcellsidx[i].lineidx;
+      motionmaskcellsidx[i].columnidx = filter->motionmaskcellsidx[i].columnidx;
+    }
+    motioncells_count = filter->motioncells_count;
+    motioncellsidx = g_new0 (motioncellidx, filter->motioncells_count);
+    for (i = 0; i < filter->motioncells_count; i++) {
+      motioncellsidx[i].lineidx = filter->motioncellsidx[i].lineidx;
+      motioncellsidx[i].columnidx = filter->motioncellsidx[i].columnidx;
+    }
+    useAlpha = filter->usealpha;
+    thickness = filter->thickness;
+    success =
+        perform_detection_motion_cells (filter->cvImage, sensitivity, framerate,
+        gridx, gridy,
+        (gint64) (GST_BUFFER_TIMESTAMP (buf) / GST_MSECOND) -
+        filter->diff_timestamp, display, useAlpha, motionmaskcoord_count,
+        motionmaskcoords, motionmaskcells_count, motionmaskcellsidx,
+        motioncellscolor, motioncells_count, motioncellsidx, starttime,
+        datafile, changed_datafile, thickness, filter->id);
+    if ((success == 1) && (filter->sent_init_error_msg == false)) {
+      char *initfailedreason;
+      int initerrorcode;
+      GstStructure *s;
+      GstMessage *m;
+      initfailedreason = getInitDataFileFailed (filter->id);
+      initerrorcode = getInitErrorCode (filter->id);
+      s = gst_structure_new ("motion", "init_error_code", G_TYPE_INT,
+          initerrorcode, "details", G_TYPE_STRING, initfailedreason, NULL);
+      m = gst_message_new_element (GST_OBJECT (filter), s);
+      gst_element_post_message (GST_ELEMENT (filter), m);
+      filter->sent_init_error_msg = TRUE;
+    }
+    if ((success == -1) && (filter->sent_save_error_msg == false)) {
+      char *savefailedreason;
+      int saveerrorcode;
+      GstStructure *s;
+      GstMessage *m;
+      savefailedreason = getSaveDataFileFailed (filter->id);
+      saveerrorcode = getSaveErrorCode (filter->id);
+      s = gst_structure_new ("motion", "save_error_code", G_TYPE_INT,
+          saveerrorcode, "details", G_TYPE_STRING, savefailedreason, NULL);
+      m = gst_message_new_element (GST_OBJECT (filter), s);
+      gst_element_post_message (GST_ELEMENT (filter), m);
+      filter->sent_save_error_msg = TRUE;
+    }
+    if (success == -2) {        //frame dropped
+      filter->prev_buff_timestamp = filter->cur_buff_timestamp;
+      //free
+      GFREE (datafile);
+      GFREE (motionmaskcoords);
+      GFREE (motionmaskcellsidx);
+      GFREE (motioncellsidx);
+      g_mutex_unlock (filter->propset_mutex);
+      return gst_pad_push (filter->srcpad, buf);
+    }
+    filter->changed_datafile = getChangedDataFile (filter->id);
+    motioncellsidxcnt = getMotionCellsIdxCnt (filter->id);
+    numberOfCells = filter->gridx * filter->gridy;
+    motioncellsnumber = motioncellsidxcnt / MSGLEN;
+    cellsOfInterestNumber = (filter->motioncells_count > 0) ?   //how many cells interest for us
+        (filter->motioncells_count) : (numberOfCells);
+    mincellsOfInterestNumber =
+        floor ((double) cellsOfInterestNumber * filter->threshold);
+    motiondetect = (motioncellsnumber >= mincellsOfInterestNumber) ? 1 : 0;
+    if ((motioncellsidxcnt > 0) && (motiondetect == 1)) {
+      char *detectedmotioncells;
+      filter->last_motion_timestamp = GST_BUFFER_TIMESTAMP (buf);
+      detectedmotioncells = getMotionCellsIdx (filter->id);
+      if (detectedmotioncells) {
+        filter->consecutive_motion++;
+        if ((filter->previous_motion == false)
+            && (filter->consecutive_motion >= filter->minimum_motion_frames)) {
+          GstStructure *s;
+          GstMessage *m;
+          filter->previous_motion = true;
+          filter->motion_begin_timestamp = GST_BUFFER_TIMESTAMP (buf);
+          s = gst_structure_new ("motion", "motion_cells_indices",
+              G_TYPE_STRING, detectedmotioncells, "motion_begin", G_TYPE_UINT64,
+              filter->motion_begin_timestamp, NULL);
+          m = gst_message_new_element (GST_OBJECT (filter), s);
+          gst_element_post_message (GST_ELEMENT (filter), m);
+        } else if (filter->postallmotion) {
+          GstStructure *s;
+          GstMessage *m;
+          filter->motion_timestamp = GST_BUFFER_TIMESTAMP (buf);
+          s = gst_structure_new ("motion", "motion_cells_indices",
+              G_TYPE_STRING, detectedmotioncells, "motion", G_TYPE_UINT64,
+              filter->motion_timestamp, NULL);
+          m = gst_message_new_element (GST_OBJECT (filter), s);
+          gst_element_post_message (GST_ELEMENT (filter), m);
+        }
+      } else {
+        GstStructure *s;
+        GstMessage *m;
+        s = gst_structure_new ("motion", "motion_cells_indices", G_TYPE_STRING,
+            "error", NULL);
+        m = gst_message_new_element (GST_OBJECT (filter), s);
+        gst_element_post_message (GST_ELEMENT (filter), m);
+      }
+    } else {
+      filter->consecutive_motion = 0;
+      if ((((GST_BUFFER_TIMESTAMP (buf) -
+                      filter->last_motion_timestamp) / 1000000000l) >=
+              filter->gap)
+          && (filter->last_motion_timestamp > 0)) {
+        GST_DEBUG ("POST MOTION FINISHED MSG\n");
+        if (filter->previous_motion) {
+          GstStructure *s;
+          GstMessage *m;
+          filter->previous_motion = false;
+          s = gst_structure_new ("motion", "motion_finished", G_TYPE_UINT64,
+              filter->last_motion_timestamp, NULL);
+          m = gst_message_new_element (GST_OBJECT (filter), s);
+          gst_element_post_message (GST_ELEMENT (filter), m);
+        }
+      }
+    }
+    if (filter->postnomotion > 0) {
+      guint64 last_buf_timestamp = GST_BUFFER_TIMESTAMP (buf) / 1000000000l;
+      if ((last_buf_timestamp -
+              (filter->last_motion_timestamp / 1000000000l)) >=
+          filter->postnomotion) {
+        GST_DEBUG ("POST NO MOTION MSG\n");
+        if ((last_buf_timestamp -
+                (filter->last_nomotion_notified / 1000000000l)) >=
+            filter->postnomotion) {
+          GstStructure *s;
+          GstMessage *m;
+          filter->last_nomotion_notified = GST_BUFFER_TIMESTAMP (buf);
+          s = gst_structure_new ("motion", "no_motion", G_TYPE_UINT64,
+              filter->last_motion_timestamp, NULL);
+          m = gst_message_new_element (GST_OBJECT (filter), s);
+          gst_element_post_message (GST_ELEMENT (filter), m);
+        }
+      }
+    }
+    filter->prev_buff_timestamp = filter->cur_buff_timestamp;
+    //free
+    GFREE (datafile);
+    GFREE (motionmaskcoords);
+    GFREE (motionmaskcellsidx);
+    GFREE (motioncellsidx);
+
+    g_mutex_unlock (filter->propset_mutex);
+  }
+
+  return gst_pad_push (filter->srcpad, buf);
+}
+
+/* entry point to initialize the plug-in
+ * initialize the plug-in itself
+ * register the element factories and other features
+ */
+gboolean
+gst_motioncells_plugin_init (GstPlugin * plugin)
+{
+  /* debug category for fltering log messages */
+  GST_DEBUG_CATEGORY_INIT (gst_motion_cells_debug,
+      "motioncells",
+      0,
+      "Performs motion detection on videos, providing detected positions via bus messages");
+
+  return gst_element_register (plugin, "motioncells", GST_RANK_NONE,
+      GST_TYPE_MOTIONCELLS);
+}
diff --git a/ext/opencv/gstmotioncells.h b/ext/opencv/gstmotioncells.h
new file mode 100644
index 0000000000..d26a2d6dd2
--- /dev/null
+++ b/ext/opencv/gstmotioncells.h
@@ -0,0 +1,124 @@
+/*
+ * GStreamer
+ * Copyright (C) 2011 Robert Jobbagy <jobbagy.robert@gmail.com>
+ * Copyright (C) 2011 Nicola Murino <nicola.murino@gmail.com>
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Alternatively, the contents of this file may be used under the
+ * GNU Lesser General Public License Version 2.1 (the "LGPL"), in
+ * which case the following provisions apply instead of the ones
+ * mentioned above:
+ *
+ * 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_MOTIONCELLS_H__
+#define __GST_MOTIONCELLS_H__
+
+#include <gst/gst.h>
+#include <cv.h>
+
+G_BEGIN_DECLS
+/* #defines don't like whitespacey bits */
+#define GST_TYPE_MOTIONCELLS \
+  (gst_motion_cells_get_type())
+#define gst_motion_cells(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MOTIONCELLS,GstMotioncells))
+#define gst_motion_cells_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MOTIONCELLS,GstMotioncellsClass))
+#define GST_IS_MOTIONCELLS(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MOTIONCELLS))
+#define GST_IS_MOTIONCELLS_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MOTIONCELLS))
+typedef struct _GstMotioncells GstMotioncells;
+typedef struct _GstMotioncellsClass GstMotioncellsClass;
+
+typedef struct {
+	int upper_left_x;
+	int upper_left_y;
+	int lower_right_x;
+	int lower_right_y;
+} motionmaskcoordrect;
+
+typedef struct {
+	int R_channel_value;
+	int G_channel_value;
+	int B_channel_value;
+} cellscolor;
+
+typedef struct {
+	int lineidx;
+	int columnidx;
+} motioncellidx;
+
+struct _GstMotioncells
+{
+  GstElement element;
+  GstPad *sinkpad, *srcpad;
+  GstState state;
+  gboolean display, calculate_motion, firstgridx, firstgridy, changed_gridx,
+      changed_gridy, changed_startime;
+  gboolean previous_motion, changed_datafile, postallmotion, usealpha,
+      firstdatafile, firstframe;
+  gboolean sent_init_error_msg, sent_save_error_msg;
+  gchar *prev_datafile, *cur_datafile, *basename_datafile, *datafile_extension;
+  gint prevgridx, gridx, prevgridy, gridy, id;
+  gdouble sensitivity, threshold;
+  IplImage *cvImage;
+  motionmaskcoordrect *motionmaskcoords;
+  cellscolor *motioncellscolor;
+  motioncellidx *motioncellsidx, *motionmaskcellsidx;
+  int motionmaskcoord_count, motioncells_count, motionmaskcells_count;
+  int gap, thickness, datafileidx, postnomotion, minimum_motion_frames;
+  guint64 motion_begin_timestamp, last_motion_timestamp, motion_timestamp,
+      last_nomotion_notified, prev_buff_timestamp, cur_buff_timestamp;
+  gint64 diff_timestamp, starttime;
+  guint64 consecutive_motion;
+  gint width, height;
+  //time stuff
+  struct timeval tv;
+  GMutex *propset_mutex;
+  double framerate;
+};
+
+struct _GstMotioncellsClass
+{
+  GstElementClass parent_class;
+};
+
+GType gst_motion_cells_get_type (void);
+
+gboolean gst_motioncells_plugin_init (GstPlugin * plugin);
+
+G_END_DECLS
+#endif /* __GST_MOTION_CELLS_H__ */
diff --git a/ext/opencv/gstopencv.c b/ext/opencv/gstopencv.c
index e12ca78028..8d9def2b27 100644
--- a/ext/opencv/gstopencv.c
+++ b/ext/opencv/gstopencv.c
@@ -32,6 +32,7 @@
 #include "gstedgedetect.h"
 #include "gstfaceblur.h"
 #include "gstfacedetect.h"
+#include "gstmotioncells.h"
 #include "gstpyramidsegment.h"
 #include "gsttemplatematch.h"
 #include "gsttextoverlay.h"
@@ -66,6 +67,9 @@ plugin_init (GstPlugin * plugin)
   if (!gst_facedetect_plugin_init (plugin))
     return FALSE;
 
+  if (!gst_motioncells_plugin_init (plugin))
+    return FALSE;
+
   if (!gst_pyramidsegment_plugin_init (plugin))
     return FALSE;
 
diff --git a/ext/opencv/motioncells_wrapper.cpp b/ext/opencv/motioncells_wrapper.cpp
new file mode 100644
index 0000000000..b768f9ece9
--- /dev/null
+++ b/ext/opencv/motioncells_wrapper.cpp
@@ -0,0 +1,213 @@
+/*
+ * GStreamer
+ * Copyright (C) 2011 Robert Jobbagy <jobbagy.robert@gmail.com>
+ * Copyright (C) 2011 Nicola Murino <nicola.murino@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Alternatively, the contents of this file may be used under the
+ * GNU Lesser General Public License Version 2.1 (the "LGPL"), in
+ * which case the following provisions apply instead of the ones
+ * mentioned above:
+ *
+ * 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 <stdio.h>
+#include <limits.h>
+#include "motioncells_wrapper.h"
+
+extern int instanceCounter;
+extern bool element_id_was_max;
+MotionCells *mc;
+char p_str[] = "idx failed";
+
+void
+motion_cells_init ()
+{
+  mc = new MotionCells ();
+  instanceOfMC tmpmc;
+  tmpmc.id = instanceCounter;
+  tmpmc.mc = mc;
+  motioncellsvector.push_back (tmpmc);
+  if ((instanceCounter < INT_MAX) && !element_id_was_max) {
+    instanceCounter++;
+    element_id_was_max = false;
+  } else {
+    element_id_was_max = true;
+    instanceCounter = motioncellsfreeids.back ();
+    motioncellsfreeids.pop_back ();
+  }
+}
+
+int
+perform_detection_motion_cells (IplImage * p_image, double p_sensitivity,
+    double p_framerate, int p_gridx, int p_gridy, long int p_timestamp_millisec,
+    bool p_isVisible, bool p_useAlpha, int motionmaskcoord_count,
+    motionmaskcoordrect * motionmaskcoords, int motionmaskcells_count,
+    motioncellidx * motionmaskcellsidx, cellscolor motioncellscolor,
+    int motioncells_count, motioncellidx * motioncellsidx, gint64 starttime,
+    char *p_datafile, bool p_changed_datafile, int p_thickness, int p_id)
+{
+  int idx = 0;
+  idx = searchIdx (p_id);
+  return motioncellsvector.at (idx).mc->performDetectionMotionCells (p_image,
+      p_sensitivity, p_framerate, p_gridx, p_gridy, p_timestamp_millisec,
+      p_isVisible, p_useAlpha, motionmaskcoord_count, motionmaskcoords,
+      motionmaskcells_count, motionmaskcellsidx, motioncellscolor,
+      motioncells_count, motioncellsidx, starttime, p_datafile,
+      p_changed_datafile, p_thickness);
+}
+
+
+void
+setPrevFrame (IplImage * p_prevFrame, int p_id)
+{
+  int idx = 0;
+  idx = searchIdx (p_id);
+  motioncellsvector.at (idx).mc->setPrevFrame (p_prevFrame);
+}
+
+char *
+getMotionCellsIdx (int p_id)
+{
+  int idx = 0;
+  idx = searchIdx (p_id);
+  if (idx > -1)
+    return motioncellsvector.at (idx).mc->getMotionCellsIdx ();
+  else {
+    return p_str;
+  }
+
+}
+
+int
+getMotionCellsIdxCnt (int p_id)
+{
+  int idx = 0;
+  idx = searchIdx (p_id);
+  if (idx > -1)
+    return motioncellsvector.at (idx).mc->getMotionCellsIdxCount ();
+  else
+    return 0;
+}
+
+bool
+getChangedDataFile (int p_id)
+{
+  int idx = 0;
+  idx = searchIdx (p_id);
+  if (idx > -1)
+    return motioncellsvector.at (idx).mc->getChangedDataFile ();
+  else
+    return false;
+}
+
+int
+searchIdx (int p_id)
+{
+  for (unsigned int i = 0; i < motioncellsvector.size (); i++) {
+    instanceOfMC tmpmc;
+    tmpmc = motioncellsvector.at (i);
+    if (tmpmc.id == p_id) {
+      return i;
+    }
+  }
+  return -1;
+}
+
+char *
+getInitDataFileFailed (int p_id)
+{
+  int idx = 0;
+  idx = searchIdx (p_id);
+  if (idx > -1)
+    return motioncellsvector.at (idx).mc->getDatafileInitFailed ();
+  else {
+    return p_str;
+  }
+}
+
+char *
+getSaveDataFileFailed (int p_id)
+{
+  int idx = 0;
+  idx = searchIdx (p_id);
+  if (idx > -1)
+    return motioncellsvector.at (idx).mc->getDatafileSaveFailed ();
+  else {
+    return p_str;
+  }
+}
+
+int
+getInitErrorCode (int p_id)
+{
+  int idx = 0;
+  idx = searchIdx (p_id);
+  if (idx > -1)
+    return motioncellsvector.at (idx).mc->getInitErrorCode ();
+  else
+    return -1;
+}
+
+int
+getSaveErrorCode (int p_id)
+{
+  int idx = 0;
+  idx = searchIdx (p_id);
+  if (idx > -1)
+    return motioncellsvector.at (idx).mc->getSaveErrorCode ();
+  else
+    return -1;
+}
+
+void
+motion_cells_free (int p_id)
+{
+  int idx = 0;
+  idx = searchIdx (p_id);
+  if (idx > -1) {
+    delete motioncellsvector.at (idx).mc;
+    motioncellsvector.erase (motioncellsvector.begin () + idx);
+    motioncellsfreeids.push_back (p_id);
+  }
+}
+
+void
+motion_cells_free_resources (int p_id)
+{
+  int idx = 0;
+  idx = searchIdx (p_id);
+  if (idx > -1)
+    motioncellsvector.at (idx).mc->freeDataFile ();
+}
diff --git a/ext/opencv/motioncells_wrapper.h b/ext/opencv/motioncells_wrapper.h
new file mode 100644
index 0000000000..0feaafa8bd
--- /dev/null
+++ b/ext/opencv/motioncells_wrapper.h
@@ -0,0 +1,89 @@
+/*
+ * GStreamer
+ * Copyright (C) 2011 Robert Jobbagy <jobbagy.robert@gmail.com>
+ * Copyright (C) 2011 Nicola Murino <nicola.murino@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Alternatively, the contents of this file may be used under the
+ * GNU Lesser General Public License Version 2.1 (the "LGPL"), in
+ * which case the following provisions apply instead of the ones
+ * mentioned above:
+ *
+ * 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 MOTIONCELLS_WRAPPER_H
+#define MOTIONCELLS_WRAPPER_H
+
+#include <stdbool.h>
+
+#ifdef __cplusplus
+#include "MotionCells.h"
+struct instanceOfMC
+{
+  int id;
+  MotionCells *mc;
+};
+vector < instanceOfMC > motioncellsvector;
+vector < int >motioncellsfreeids;
+
+int searchIdx (int p_id);
+extern "C"
+{
+#endif
+
+  void motion_cells_init ();
+  int perform_detection_motion_cells (IplImage * p_image, double p_sensitivity,
+      double p_framerate, int p_gridx, int p_gridy,
+      long int p_timestamp_millisec, bool p_isVisible, bool p_useAlpha,
+      int motionmaskcoord_count, motionmaskcoordrect * motionmaskcoords,
+      int motionmaskcells_count, motioncellidx * motionmaskcellsidx,
+      cellscolor motioncellscolor, int motioncells_count,
+      motioncellidx * motioncellsidx, gint64 starttime, char *datafile,
+      bool p_changed_datafile, int p_thickness, int p_id);
+  void setPrevFrame (IplImage * p_prevFrame, int p_id);
+  void motion_cells_free (int p_id);
+  void motion_cells_free_resources (int p_id);
+  char *getMotionCellsIdx (int p_id);
+  int getMotionCellsIdxCnt (int p_id);
+  bool getChangedDataFile (int p_id);
+  char *getInitDataFileFailed (int p_id);
+  char *getSaveDataFileFailed (int p_id);
+  int getInitErrorCode (int p_id);
+  int getSaveErrorCode (int p_id);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* MOTIONCELLS_WRAPPER_H */

From 75a6072db8a8225f8cb2ade960a8eb3d89ee5bf3 Mon Sep 17 00:00:00 2001
From: Robert Jobbagy <jobbagy.robert@gmail.com>
Date: Wed, 27 Jul 2011 22:34:23 +0200
Subject: [PATCH 132/158] gstmotioncells_dynamic_test: test tool what can to do
 dynamic change properties

---
 configure.ac                                  |   1 +
 tests/examples/Makefile.am                    |   6 +-
 tests/examples/opencv/Makefile.am             |   7 +
 .../opencv/gst_element_print_properties.c     | 601 ++++++++++++++++++
 .../opencv/gst_element_print_properties.h     |  34 +
 .../opencv/gstmotioncells_dynamic_test.c      | 237 +++++++
 .../opencv/gstmotioncells_dynamic_test.h      |  30 +
 7 files changed, 914 insertions(+), 2 deletions(-)
 create mode 100644 tests/examples/opencv/Makefile.am
 create mode 100644 tests/examples/opencv/gst_element_print_properties.c
 create mode 100644 tests/examples/opencv/gst_element_print_properties.h
 create mode 100644 tests/examples/opencv/gstmotioncells_dynamic_test.c
 create mode 100644 tests/examples/opencv/gstmotioncells_dynamic_test.h

diff --git a/configure.ac b/configure.ac
index b953183d67..2b869b9c45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1971,6 +1971,7 @@ tests/examples/camerabin2/Makefile
 tests/examples/directfb/Makefile
 tests/examples/mxf/Makefile
 tests/examples/scaletempo/Makefile
+tests/examples/opencv/Makefile
 tests/icles/Makefile
 ext/voamrwbenc/Makefile
 ext/voaacenc/Makefile
diff --git a/tests/examples/Makefile.am b/tests/examples/Makefile.am
index 26833fb619..84c178797b 100644
--- a/tests/examples/Makefile.am
+++ b/tests/examples/Makefile.am
@@ -16,7 +16,9 @@ else
 CAMERABIN2=
 endif
 
-SUBDIRS= $(DIRECTFB_DIR) $(GTK_EXAMPLES)
-DIST_SUBDIRS= camerabin camerabin2 directfb mxf scaletempo
+OPENCV_EXAMPLES=opencv
+
+SUBDIRS= $(DIRECTFB_DIR) $(GTK_EXAMPLES) $(OPENCV_EXAMPLES)
+DIST_SUBDIRS= camerabin camerabin2 directfb mxf scaletempo opencv
 
 include $(top_srcdir)/common/parallel-subdirs.mak
diff --git a/tests/examples/opencv/Makefile.am b/tests/examples/opencv/Makefile.am
new file mode 100644
index 0000000000..16af077a29
--- /dev/null
+++ b/tests/examples/opencv/Makefile.am
@@ -0,0 +1,7 @@
+noinst_PROGRAMS = gstmotioncells_dynamic_test
+
+gstmotioncells_dynamic_test_SOURCES = gstmotioncells_dynamic_test.c gst_element_print_properties.c
+gstmotioncells_dynamic_test_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
+gstmotioncells_dynamic_test_LDFLAGS = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GSTPB_BASE_LIBS)
+
+noinst_HEADERS = gst_element_print_properties.h 
diff --git a/tests/examples/opencv/gst_element_print_properties.c b/tests/examples/opencv/gst_element_print_properties.c
new file mode 100644
index 0000000000..28d23b9cdd
--- /dev/null
+++ b/tests/examples/opencv/gst_element_print_properties.c
@@ -0,0 +1,601 @@
+/* GStreamer
+ * Copyright (C) 2010 Wesley Miller <wmiller@sdr.com>
+ *
+ *
+ *  gst_element_print_properties(): a tool to inspect GStreamer
+ *                                  element properties
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+#include <gst/gst.h>
+#include <string.h>
+#include <stdio.h>
+#include <locale.h>
+
+#include "gst_element_print_properties.h"
+
+
+void
+gst_element_print_properties (GstElement * element)
+{
+  /////////////////////////////////////////////////////////////////////////////
+  //
+  // Formatting setup
+  //
+  //    Change the valuses of c2w, c3w and c4w to adjust the 2nd, 3rd and 4th
+  //    column widths, respectively.  The gutter width is fixed at 3 and
+  //    alwasys prints as " | ".  Column 1 has a fixed width of 3.
+  //
+  //    The first two rows for each element's output are its element class
+  //    name (e.g. "GstAudioResample") and its element factory name
+  //    ("audioresample").  The long element factory name ("Audio resampler")
+  //    is in column 4 following the element factory name.
+  //
+  //    Most properties use this format.  Multivalued items like CAPS, certain
+  //    GST_TYPEs and enums are different.
+  //
+  //      Column 1  contains the rwc, "readable", "writable", "controllable"
+  //                flags of the property.
+  //      Column 2  contains the property name
+  //      Column 3  contains the current value
+  //      Column 4  contains the property type, e.g. G_TYPE_INT
+  //      Column 5  contains the range, if there is one, and the default.
+  //                The range is encosed in parentheses. e.g.  "(1-10)   5"
+  //
+  //    CAPS, enums, flags and some undefined items have no columns 4 or 5 and
+  //    column 3 will contain a description of the item.  Additional rows may
+  //    list specific valused (CAPS and flags).
+  //
+  //    String values are enclosed in double quotes.  A missing right quote
+  //    inidicates the string had been truncated.
+  //
+  //  Screen column
+  //  ----+----1----+----2----+----3----+----4----+----5----+----6----+----7----+----8----+----9--->
+  //
+  //  formatted columns with built in gutters
+  //  --- | ---------c2---------- | ---------c3-------- | -----------c4---------- | --> unspecified
+  //
+  //  <-->|<--- property name --->|<-- current value -->|<-------- type --------->|<----- range and default ----->
+  //      | ELEMENT CLASS NAME    | GstAudioResample    |                         |
+  //      | ELEMENT FACTORY NAME  | audioresample       | Audio resampler         |
+  //  RW- | name                  | "audioResampler"    | G_TYPE_STRING           | null
+  //  RW- | qos                   | false               | G_TYPE_BOOLEAN          | false
+  //  RW- | quality               | 8                   | G_TYPE_INT              | (0 - 10)   4
+  //
+  /////////////////////////////////////////////////////////////////////////////
+
+  const guint c2w = 21;         // column 2 width
+  const guint c3w = 19;         // column 3 width
+  const guint c4w = 23;         // column 4 width
+
+  /////////////////////////////////////////////////////////////////////////////
+  // end configuration variables.
+  /////////////////////////////////////////////////////////////////////////////
+
+  GParamSpec **property_specs;
+  guint num_properties, i;
+  gboolean readable;
+  gboolean first_flag;
+
+
+  g_return_if_fail (element != NULL);
+
+  property_specs = g_object_class_list_properties (G_OBJECT_GET_CLASS (element),
+      &num_properties);
+
+   /*--- draw the header information ---*/
+  print_column_titles (c2w, c3w, c4w);
+  print_element_info (element, c2w, c3w, c4w);
+
+
+  for (i = 0; i < num_properties; i++) {
+    gchar flags[4];
+    GValue value = { 0, };
+    GParamSpec *param = property_specs[i];
+
+    readable = FALSE;
+    first_flag = TRUE;
+
+    g_value_init (&value, param->value_type);
+
+    flags[0] = '-';
+    flags[1] = '-';
+    flags[2] = '-';
+    flags[3] = 0x0;
+
+    if (param->flags & G_PARAM_READABLE) {
+      g_object_get_property (G_OBJECT (element), param->name, &value);
+      readable = TRUE;
+      flags[0] = 'r';
+    }
+
+    if (param->flags & G_PARAM_WRITABLE)
+      flags[1] = 'w';
+
+    if (param->flags & GST_PARAM_CONTROLLABLE)
+      flags[2] = 'c';
+
+    g_print ("%s |", flags);
+    g_print (" %-*s | ", c2w, g_param_spec_get_name (param));
+
+    switch (G_VALUE_TYPE (&value)) {
+      case G_TYPE_STRING:      // String
+      {
+        GParamSpecString *pstring = G_PARAM_SPEC_STRING (param);
+        if (readable) {         /* current */
+          const char *string_val = g_value_get_string (&value);
+          gchar work_string[100];
+
+          if (string_val == NULL)
+            sprintf (work_string, "\"%s\"", "null");
+          else
+            sprintf (work_string, "\"%s\"", string_val);
+          g_print ("%-*.*s", c3w, c3w, work_string);
+        } else {
+          g_print ("%-*s", c3w, "<not readable>");      /* alt current */
+        }
+        g_print (" | %-*s", c4w, "G_TYPE_STRING");      /* type */
+
+        if (pstring->default_value == NULL)
+          g_print (" | %s", "null");    /* default */
+        else
+          g_print (" | \"%s\"", pstring->default_value);        /* default */
+        break;
+      }
+
+      case G_TYPE_BOOLEAN:     //  Boolean
+      {
+        GParamSpecBoolean *pboolean = G_PARAM_SPEC_BOOLEAN (param);
+        if (readable)           /* current */
+          g_print ("%-*s", c3w,
+              (g_value_get_boolean (&value) ? "true" : "false"));
+        else
+          g_print ("%-*s", c3w, "<not readable>");
+        g_print (" | %-*s", c4w, "G_TYPE_BOOLEAN");     /* type */
+        g_print (" | %s ",      /* default */
+            (pboolean->default_value ? "true" : "false"));
+        break;
+      }
+
+      case G_TYPE_ULONG:       //  Unsigned Long
+      {
+        GParamSpecULong *pulong = G_PARAM_SPEC_ULONG (param);
+        if (readable)           /* current */
+          g_print ("%-*lu", c3w, g_value_get_ulong (&value));
+        else
+          g_print ("%-*s", c3w, "<not readable>");
+        g_print (" | %-*s", c4w, "G_TYPE_ULONG");       /* type */
+        g_print (" | (%lu - %lu)   %lu ", pulong->minimum, pulong->maximum,     /* range */
+            pulong->default_value);     /* default */
+        break;
+      }
+
+      case G_TYPE_LONG:        //  Long
+      {
+        GParamSpecLong *plong = G_PARAM_SPEC_LONG (param);
+        if (readable)           /* current */
+          g_print ("%-*ld", c3w, g_value_get_long (&value));
+        else
+          g_print ("%-*s", c3w, "<not readable>");
+        g_print (" | %-*s", c4w, "G_TYPE_LONG");        /* type */
+        g_print (" | (%ld - %ld)   %ld ", plong->minimum, plong->maximum,       /* range */
+            plong->default_value);      /* default */
+        break;
+      }
+
+      case G_TYPE_UINT:        //  Unsigned Integer
+      {
+        GParamSpecUInt *puint = G_PARAM_SPEC_UINT (param);
+        if (readable)           /* current */
+          g_print ("%-*u", c3w, g_value_get_uint (&value));
+        else
+          g_print ("%-*s", c3w, "<not readable>");
+        g_print (" | %-*s", c4w, "G_TYPE_UINT");        /* type */
+        g_print (" | (%u - %u)   %u ", puint->minimum, puint->maximum,  /* range */
+            puint->default_value);      /* default */
+        break;
+      }
+
+      case G_TYPE_INT:         //  Integer
+      {
+        GParamSpecInt *pint = G_PARAM_SPEC_INT (param);
+        if (readable)           /* current */
+          g_print ("%-*d", c3w, g_value_get_int (&value));
+        else
+          g_print ("%-*s", c3w, "<not readable>");
+        g_print (" | %-*s", c4w, "G_TYPE_INT"); /* type */
+        g_print (" | (%d - %d)   %d ", pint->minimum, pint->maximum,    /* range */
+            pint->default_value);       /* default */
+        break;
+      }
+
+      case G_TYPE_UINT64:      //  Unsigned Integer64.
+      {
+        GParamSpecUInt64 *puint64 = G_PARAM_SPEC_UINT64 (param);
+        if (readable)           /* current */
+          g_print ("%-*" G_GUINT64_FORMAT, c3w, g_value_get_uint64 (&value));
+        else
+          g_print ("%-*s", c3w, "<not readable>");
+        g_print (" | %-*s", c4w, "G_TYPE_UINT64");      /* type */
+        g_print (" | (%" G_GUINT64_FORMAT " - %" G_GUINT64_FORMAT ")" "   %" G_GUINT64_FORMAT " ", puint64->minimum, puint64->maximum,  /* range */
+            puint64->default_value);    /* default */
+        break;
+      }
+
+      case G_TYPE_INT64:       // Integer64
+      {
+        GParamSpecInt64 *pint64 = G_PARAM_SPEC_INT64 (param);
+        if (readable)           /* current */
+          g_print ("%-*" G_GINT64_FORMAT, c3w, g_value_get_int64 (&value));
+        else
+          g_print ("%-*s", c3w, "<not readable>");
+        g_print (" | %-*s", c4w, "G_TYPE_INT64");       /* type */
+        g_print (" | (%" G_GINT64_FORMAT " - %" G_GINT64_FORMAT ")" "   %" G_GINT64_FORMAT " ", pint64->minimum, pint64->maximum,       /* range */
+            pint64->default_value);     /* default */
+        break;
+      }
+
+      case G_TYPE_FLOAT:       //  Float.
+      {
+        GParamSpecFloat *pfloat = G_PARAM_SPEC_FLOAT (param);
+        if (readable)           /* current */
+          g_print ("%-*g", c3w, g_value_get_float (&value));
+        else
+          g_print ("%-*s", c3w, "<not readable>");
+        g_print (" | %-*s", c4w, "G_TYPE_FLOAT");       /* type */
+        g_print (" | (%g - %g)   %g ", pfloat->minimum, pfloat->maximum,        /* range */
+            pfloat->default_value);     /* default */
+        break;
+      }
+
+      case G_TYPE_DOUBLE:      //  Double
+      {
+        GParamSpecDouble *pdouble = G_PARAM_SPEC_DOUBLE (param);
+        if (readable)           /* current */
+          g_print ("%-*g", c3w, g_value_get_double (&value));
+        else
+          g_print ("%-*s", c3w, "<not readable>");
+        g_print (" | %-*s", c4w, "G_TYPE_DOUBLE");      /* type */
+        g_print (" | (%g - %g)   %g ", pdouble->minimum, pdouble->maximum,      /* range */
+            pdouble->default_value);    /* default */
+        break;
+      }
+
+      default:
+        if (param->value_type == GST_TYPE_CAPS) {
+          const GstCaps *caps = gst_value_get_caps (&value);
+          if (!caps)
+            g_print ("%-*s | %-*.*s |", c3w, "Caps (NULL)", c4w, c4w, " ");
+          else {
+            gchar prefix_string[100];
+            sprintf (prefix_string, "    | %-*.*s | ", c2w, c2w, " ");
+            print_caps (caps, prefix_string);
+          }
+        }
+
+        else if (G_IS_PARAM_SPEC_ENUM (param)) {
+          GParamSpecEnum *penum = G_PARAM_SPEC_ENUM (param);
+          GEnumValue *values;
+          guint j = 0;
+          gint enum_value;
+          const gchar *def_val_nick = "", *cur_val_nick = "";
+          gchar work_string[100];
+
+          values = G_ENUM_CLASS (g_type_class_ref (param->value_type))->values;
+          enum_value = g_value_get_enum (&value);
+
+          while (values[j].value_name) {
+            if (values[j].value == enum_value)
+              cur_val_nick = values[j].value_nick;
+            if (values[j].value == penum->default_value)
+              def_val_nick = values[j].value_nick;
+            j++;
+          }
+
+          sprintf (work_string, "%d, \"%s\"", enum_value, cur_val_nick);
+          g_print ("%-*.*s", c3w, c3w, work_string);
+          g_print (" | Enum \"%s\" : %d, \"%s\"",
+              g_type_name (G_VALUE_TYPE (&value)),
+              penum->default_value, def_val_nick);
+        }
+
+        else if (G_IS_PARAM_SPEC_FLAGS (param)) {
+          GParamSpecFlags *pflags = G_PARAM_SPEC_FLAGS (param);
+          GFlagsValue *vals;
+          gchar *cur, *def;
+          gchar work_string[100];
+
+          vals = pflags->flags_class->values;
+          cur = flags_to_string (vals, g_value_get_flags (&value));     /* current */
+          def = flags_to_string (vals, pflags->default_value);  /* default */
+
+          /* current */
+          sprintf (work_string, "0x%08x, \"%s\"",
+              g_value_get_flags (&value), cur);
+          g_print ("%-*.*s", c3w, c3w, work_string);
+
+          /* type */
+          sprintf (work_string, "Flags \"%s\"",
+              g_type_name (G_VALUE_TYPE (&value)));
+          g_print ("%-*.*s", c4w, c4w, work_string);
+
+          /* default */
+          g_print (" | 0x%08x, \"%s\"", pflags->default_value, def);
+
+          /* values list */
+          while (vals[0].value_name) {
+            sprintf (work_string, "\n    | %-*.*s |   (0x%08x): %-16s - %s",
+                c2w, c2w, "",
+                vals[0].value, vals[0].value_nick, vals[0].value_name);
+            g_print ("%s", work_string);
+            ++vals;
+          }
+
+          g_free (cur);
+          g_free (def);
+        }
+
+        else if (G_IS_PARAM_SPEC_OBJECT (param)) {
+          g_print ("%-*.*s | Object of type \"%s\"",
+              c3w, c3w,
+              g_type_name (param->value_type), g_type_name (param->value_type));
+        }
+
+        else if (G_IS_PARAM_SPEC_BOXED (param)) {
+          g_print ("%-*.*s | Boxed pointer of type \"%s\"",
+              c3w, c3w,
+              g_type_name (param->value_type), g_type_name (param->value_type));
+        }
+
+        else if (G_IS_PARAM_SPEC_POINTER (param)) {
+          if (param->value_type != G_TYPE_POINTER) {
+            g_print ("%-*.*s | Pointer of type \"%s\"",
+                c3w, c3w,
+                g_type_name (param->value_type),
+                g_type_name (param->value_type));
+          } else {
+            g_print ("%-*.*s |", c3w, c3w, "Pointer.");
+          }
+        }
+
+        else if (param->value_type == G_TYPE_VALUE_ARRAY) {
+          GParamSpecValueArray *pvarray = G_PARAM_SPEC_VALUE_ARRAY (param);
+          if (pvarray->element_spec) {
+            g_print ("%-*.*s :Array of GValues of type \"%s\"",
+                c3w, c3w,
+                g_type_name (pvarray->element_spec->value_type),
+                g_type_name (pvarray->element_spec->value_type));
+          } else {
+            g_print ("%-*.*s :", c3w, c3w, "Array of GValues");
+          }
+        }
+
+        else if (GST_IS_PARAM_SPEC_FRACTION (param)) {
+          GstParamSpecFraction *pfraction = GST_PARAM_SPEC_FRACTION (param);
+          gchar work_string[100];
+
+          if (readable) {       /* current */
+            sprintf (work_string, "%d/%d",
+                gst_value_get_fraction_numerator (&value),
+                gst_value_get_fraction_denominator (&value));
+            g_print ("%-*.*s", c3w, c3w, work_string);
+          } else
+            g_print ("%-*s", c3w, "<not readable>");
+
+          g_print (" | %-*.*s", /* type */
+              c3w, c3w, " Fraction. ");
+          g_print (" | (%d/%d - %d/%d)",        /* range */
+              pfraction->min_num, pfraction->min_den,
+              pfraction->max_num, pfraction->max_den);
+          g_print ("   %d/%d ", /* default */
+              pfraction->def_num, pfraction->def_den);
+        }
+
+        else if (GST_IS_PARAM_SPEC_MINI_OBJECT (param)) {
+          g_print ("%-*.*s | MiniObject of type \"%s\"",
+              c3w, c3w,
+              g_type_name (param->value_type), g_type_name (param->value_type));
+        }
+
+        else {
+          g_print ("Unknown type %ld \"%s\"",
+              (glong) param->value_type, g_type_name (param->value_type));
+
+        }
+        break;
+    }
+
+    if (!readable)
+      g_print (" Write only\n");
+    else
+      g_print ("\n");
+
+    g_value_reset (&value);
+  }
+
+  if (0 == num_properties)
+    g_print ("  none\n");
+
+  g_free (property_specs);
+}
+
+//------------------------------------------------------------------------------
+void
+print_column_titles (guint c2w, guint c3w, guint c4w)
+{
+  //////////////////////////////////////////////////////////////////////////
+  //
+  // Create Header for property listing
+  // RWF | --- element name ---- | ---------c3-------- | -----------c4---------- | --> unspecified
+  //
+  //////////////////////////////////////////////////////////////////////////
+  gchar work_string[200];
+  gchar dashes[] = "-----------------------------";
+  gint llen = 0;
+  gint rlen = 0;
+
+      /*--- column 1 - RWC ---*/
+  sprintf (work_string, "<-->|<");
+
+      /*--- column 2 - property name ---*/
+  llen = (c2w - 15) / 2;        /* width of " property name " = 15 */
+  rlen = c2w - 15 - llen;
+
+  strncat (work_string, dashes, llen);
+  strcat (work_string, " property name ");
+  strncat (work_string, dashes, rlen);
+  strcat (work_string, ">|<");
+
+      /*--- column 3 - current value ---*/
+  llen = (c3w - 15) / 2;        /* width of " current value " = 15 */
+  rlen = c3w - 15 - llen;
+
+  strncat (work_string, dashes, llen);
+  strcat (work_string, " current value ");
+  strncat (work_string, dashes, rlen);
+  strcat (work_string, ">|<");
+
+      /*--- column 4 - type ---*/
+  llen = (c4w - 6) / 2;         /* width of " type " = 6 */
+  rlen = c4w - 6 - llen;
+
+  strncat (work_string, dashes, llen);
+  strcat (work_string, " type ");
+  strncat (work_string, dashes, rlen);
+  strcat (work_string, ">|<");
+
+      /*--- column 5 - range and default ---*/
+  strcat (work_string, "----- range and default ----->");
+
+  g_print ("\n%s\n", work_string);
+}
+
+//------------------------------------------------------------------------------
+void
+print_element_info (GstElement * element, guint c2w, guint c3w, guint c4w)
+{
+  /////////////////////////////////////////////////////////////////////////////
+  //
+  // Print element factory and class information as part of each header
+  //
+  /////////////////////////////////////////////////////////////////////////////
+  gchar work_string[100];
+  GstElementFactory *factory = gst_element_get_factory (element);
+
+  sprintf (work_string, "ELEMENT CLASS NAME");
+  g_print ("    | %-*s", c2w, work_string);
+  g_print (" | %-*s", c3w, g_type_name (G_OBJECT_TYPE (element)));
+  g_print (" | %-*s | \n", c4w, "");
+
+
+  sprintf (work_string, "ELEMENT FACTORY NAME");
+  g_print ("    | %-*s", c2w, work_string);
+
+  g_print (" | %-*s", c3w,
+      gst_plugin_feature_get_name (GST_PLUGIN_FEATURE (factory)));
+  g_print (" | %-*s | \n", c4w, gst_element_factory_get_longname (factory));
+
+// "Audio Resampler"   g_print( " | %-*s",      c3w, gst_element_factory_get_longname( gst_element_get_factory( element )) );
+
+
+}
+
+//------------------------------------------------------------------------------
+gchar *
+flags_to_string (GFlagsValue * vals, guint flags)
+{
+  /////////////////////////////////////////////////////////////////////////////
+  //
+  // List individual flags in separate rows
+  //
+  /////////////////////////////////////////////////////////////////////////////
+  GString *s = NULL;
+  guint flags_left, i;
+
+  /* first look for an exact match and count the number of values */
+  for (i = 0; vals[i].value_name != NULL; ++i) {
+    if (vals[i].value == flags)
+      return g_strdup (vals[i].value_nick);
+  }
+
+  s = g_string_new (NULL);
+
+  /* we assume the values are sorted from lowest to highest value */
+  flags_left = flags;
+  while (i > 0) {
+    --i;
+    if (0 != vals[i].value && (flags_left & vals[i].value) == vals[i].value) {
+      if (0 < s->len)
+        g_string_append (s, " | ");
+      g_string_append (s, vals[i].value_nick);
+      flags_left -= vals[i].value;
+      if (0 == flags_left)
+        break;
+    }
+  }
+
+  if (0 == s->len)
+    g_string_assign (s, "(none)");
+
+  return g_string_free (s, FALSE);
+}
+
+
+//------------------------------------------------------------------------------
+void
+print_caps (const GstCaps * caps, const gchar * pfx)
+{
+  /////////////////////////////////////////////////////////////////////////////
+  //
+  // Print each caps value on a separate line
+  //
+  /////////////////////////////////////////////////////////////////////////////
+  guint i;
+
+  g_return_if_fail (caps != NULL);
+
+  if (gst_caps_is_any (caps)) {
+    g_print ("%s | %s", pfx, "ANY                 |                     |");
+    return;
+  }
+  if (gst_caps_is_empty (caps)) {
+    g_print ("%s | %s", pfx, "EMPTY               |                     |");
+    return;
+  }
+
+  for (i = 0; i < gst_caps_get_size (caps); i++) {
+    GstStructure *structure = gst_caps_get_structure (caps, i);
+    g_print ("%s", gst_structure_get_name (structure));
+    gst_structure_foreach (structure, print_field, (gpointer) pfx);
+  }
+}
+
+//------------------------------------------------------------------------------
+gboolean
+print_field (GQuark field, const GValue * value, gpointer pfx)
+{
+  /////////////////////////////////////////////////////////////////////////////
+  //
+  // printing function for individual caps fields
+  //
+  /////////////////////////////////////////////////////////////////////////////
+  gchar *str = gst_value_serialize (value);
+  g_print ("\n%s  %-15.15s - %s",
+      (gchar *) pfx, g_quark_to_string (field), str);
+  g_free (str);
+  return TRUE;
+}
diff --git a/tests/examples/opencv/gst_element_print_properties.h b/tests/examples/opencv/gst_element_print_properties.h
new file mode 100644
index 0000000000..49beee35ca
--- /dev/null
+++ b/tests/examples/opencv/gst_element_print_properties.h
@@ -0,0 +1,34 @@
+/* GStreamer
+ * Copyright (C) 2010 Wesley Miller <wmiller@sdr.com>
+ *
+ *
+ *  gst_element_print_properties(): a tool to inspect GStreamer
+ *                                  element properties
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef GST_ELEMENT_PRINT_PROPERTIES_H
+#define GST_ELEMENT_PRINT_PROPERTIES_H
+
+extern void gst_element_print_properties (GstElement * element);
+extern void print_column_titles (guint c2w, guint c3w, guint c4w);
+extern void print_element_info (GstElement * element, guint c2w, guint c3w,
+    guint c4w);
+extern gchar *flags_to_string (GFlagsValue * vals, guint flags);
+extern void print_caps (const GstCaps * caps, const gchar * pfx);
+extern gboolean print_field (GQuark field, const GValue * value, gpointer pfx);
+
+#endif
diff --git a/tests/examples/opencv/gstmotioncells_dynamic_test.c b/tests/examples/opencv/gstmotioncells_dynamic_test.c
new file mode 100644
index 0000000000..21c351bfdd
--- /dev/null
+++ b/tests/examples/opencv/gstmotioncells_dynamic_test.c
@@ -0,0 +1,237 @@
+/* GStreamer
+ * Copyright (C) 2011 Robert Jobbagy <jobbagy.robert@gmail.com>
+ *
+ *
+ *  gst_motioncells_dynamic_test(): a test tool what can to do dynamic change properties
+ *
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#include <gst/gst.h>
+#include <glib.h>
+#include <glib/gprintf.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <locale.h>
+#include <gst/interfaces/propertyprobe.h>
+#include "gstmotioncells_dynamic_test.h"
+#include "gst_element_print_properties.h"
+
+const guint c2w = 21;           // column 2 width
+const guint c3w = 19;           // column 3 width
+const guint c4w = 23;           // column 4 width
+
+void
+setProperty (GstElement * mcells, char *property, char *prop_value, GType type,
+    GValue * value)
+{
+
+  switch (type) {
+    case G_TYPE_STRING:
+    {
+      g_object_set (G_OBJECT (mcells), property, prop_value, NULL);
+      break;
+    }
+    case G_TYPE_BOOLEAN:
+    {
+      gboolean flag = (g_strcmp0 (prop_value, "true") == 0) ? TRUE : FALSE;
+      g_object_set (G_OBJECT (mcells), property, flag, NULL);
+      break;
+    }
+    case G_TYPE_ULONG:
+    {
+      unsigned long ulongval = strtoul (prop_value, NULL, 0);
+      g_object_set (G_OBJECT (mcells), property, ulongval, NULL);
+      break;
+    }
+    case G_TYPE_LONG:
+    {
+      long longval = atol (prop_value);
+      g_object_set (G_OBJECT (mcells), property, longval, NULL);
+      break;
+    }
+    case G_TYPE_UINT:
+    {
+      unsigned int uintval = atoi (prop_value);
+      g_object_set (G_OBJECT (mcells), property, uintval, NULL);
+      break;
+    }
+    case G_TYPE_INT:
+    {
+      int intval = atoi (prop_value);
+      g_object_set (G_OBJECT (mcells), property, intval, NULL);
+      break;
+    }
+    case G_TYPE_UINT64:
+    {
+      guint64 guint64val = atoi (prop_value);
+      g_object_set (G_OBJECT (mcells), property, guint64val, NULL);
+      break;
+    }
+    case G_TYPE_INT64:
+    {
+      gint64 gint64val = atoi (prop_value);
+      g_object_set (G_OBJECT (mcells), property, gint64val, NULL);
+      break;
+    }
+    case G_TYPE_FLOAT:
+    {
+      float floatval = atof (prop_value);
+      g_object_set (G_OBJECT (mcells), property, floatval, NULL);
+      break;
+    }
+    case G_TYPE_DOUBLE:
+    {
+      double doubleval = strtod (prop_value, NULL);
+      g_object_set (G_OBJECT (mcells), property, doubleval, NULL);
+      break;
+    }
+    default:
+      fprintf (stderr, "You gave me something wrong type of data !!! \n");
+      break;
+  }
+}
+
+// gst-launch v4l2src ! videoscale ! videorate ! capsfilter "caps=video/x-raw-yuv,width=320,height=240,framerate=10/1" ! ffmpegcolorspace ! motioncells ! ffmpegcolorspace ! xvimagesink
+int
+main (int argc, char *argv[])
+{
+  GstElement *pipeline, *source, *videor, *videos, *decodebin, *capsf,
+      *colorsp0, *colorsp1, *mcells, *sink;
+  GstCaps *caps;
+  gchar property[20];
+  gchar prop_value[100];
+  GParamSpec **property_specs;
+  guint num_properties, i;
+  GValue value = { 0, };
+  gboolean found_property = FALSE;
+  int ret;
+
+  // Initialisation //
+  gst_init (&argc, &argv);
+  fprintf (stderr, "Usage: %s test or rtsp rtsp://your/cam/address\n", argv[0]);
+  // Create gstreamer elements //
+  pipeline = gst_pipeline_new ("moitoncells-pipeline");
+  if (argc == 2 && (g_strcmp0 (argv[1], "test") == 0))
+    source = gst_element_factory_make ("videotestsrc", "vidsrc");
+  else if (argc == 3 && (g_strcmp0 (argv[1], "rtsp") == 0))
+    source = gst_element_factory_make ("rtspsrc", "rtspsrc0");
+  else if (argc == 1)
+    source = gst_element_factory_make ("v4l2src", "v4l2");
+  else {
+    fprintf (stderr, "Usage: %s test or rtsp rtsp://your/cam/address\n",
+        argv[0]);
+    exit (-1);
+  }
+
+  videor = gst_element_factory_make ("videorate", "videor");
+  videos = gst_element_factory_make ("videoscale", "videos");
+  capsf = gst_element_factory_make ("capsfilter", "capsf");
+  if (argc == 3 && (g_strcmp0 (argv[1], "rtsp") == 0))
+    decodebin = gst_element_factory_make ("decodebin", "decode");
+  else
+    decodebin = NULL;
+  colorsp0 = gst_element_factory_make ("ffmpegcolorspace", "colorspace0");
+  mcells = gst_element_factory_make ("motioncells", "mcells");
+  colorsp1 = gst_element_factory_make ("ffmpegcolorspace", "colorspace1");
+  sink = gst_element_factory_make ("xvimagesink", "xv-image-sink");
+  if (!pipeline || !source || !videor || !videos || !capsf || !colorsp0
+      || !mcells || !colorsp1 || !sink) {
+    g_printerr ("One element could not be created. Exiting.\n");
+    return -1;
+  }
+  if (argc == 3 && (g_strcmp0 (argv[1], "rtsp") == 0) && !decodebin) {
+    g_printerr ("Decodebin could not be created. Exiting.\n");
+    return -1;
+  }
+  if ((g_strcmp0 (argv[1], "rtsp") == 0)) {
+    g_object_set (G_OBJECT (source), "location", argv[2], NULL);
+    g_object_set (G_OBJECT (source), "latency", 1000, NULL);
+  } else if ((g_strcmp0 (argv[1], "test") == 0))
+    g_object_set (G_OBJECT (source), "pattern", 18, NULL);
+
+  caps =
+      gst_caps_from_string
+      ("video/x-raw-yuv,width=320,height=240,framerate=10/1");
+  g_object_set (G_OBJECT (capsf), "caps", caps, NULL);
+  //g_object_set (G_OBJECT (sink), "sync",FALSE,NULL);
+
+  if (argc > 1) {
+    if (g_strcmp0 (argv[1], "test") == 0) {
+      gst_bin_add_many (GST_BIN (pipeline),
+          source, videor, videos, capsf, colorsp0, mcells, colorsp1, sink,
+          NULL);
+
+      gst_element_link_many (source, videor, videos, capsf, colorsp0, mcells,
+          colorsp1, sink, NULL);
+    } else if (g_strcmp0 (argv[1], "rtsp") == 0) {
+      gst_bin_add_many (GST_BIN (pipeline),
+          source, videor, videos, capsf, decodebin, colorsp0, mcells, colorsp1,
+          sink, NULL);
+
+      gst_element_link_many (source, videor, videos, capsf, decodebin, colorsp0,
+          mcells, colorsp1, sink, NULL);
+    }
+  } else {                      //default
+    gst_bin_add_many (GST_BIN (pipeline),
+        source, videor, videos, capsf, colorsp0, mcells, colorsp1, sink, NULL);
+
+    gst_element_link_many (source, videor, videos, capsf, colorsp0, mcells,
+        colorsp1, sink, NULL);
+  }
+
+  g_print ("Now playing\n");
+  gst_element_set_state (pipeline, GST_STATE_PLAYING);
+  g_print ("Running...\n");
+  g_print ("You can use these properties : \n");
+  gst_element_print_properties (mcells);
+  g_print ("change property here: example  some_property property_value \n");
+  g_print ("Quit with 'q' \n");
+  //get all properties
+  property_specs = g_object_class_list_properties (G_OBJECT_GET_CLASS (mcells),
+      &num_properties);
+  while (TRUE) {
+    found_property = FALSE;
+    i = 0;
+    ret = scanf ("%19s %99s", property, prop_value);
+
+    if ((g_strcmp0 (property, "q") == 0) || (g_strcmp0 (prop_value, "q") == 0))
+      break;
+    printf ("property: %s -> value: %s \n", property, prop_value);
+    for (i = 0; i < num_properties; i++) {
+      GParamSpec *param = property_specs[i];
+      g_value_init (&value, param->value_type);
+      g_object_get_property (G_OBJECT (mcells), param->name, &value);
+      //fprintf(stderr,"property: %s and param name: %s and property value: %s \n",property,param->name,prop_value);
+      if ((g_strcmp0 (property, param->name) == 0) && !found_property &&
+          (g_strcmp0 (prop_value, "") != 0)
+          && (g_strcmp0 (prop_value, "\"") != 0)
+          && (g_strcmp0 (prop_value, "\'") != 0)) {
+        GType type;
+        found_property = TRUE;
+        type = param->value_type;
+        setProperty (mcells, property, prop_value, type, &value);
+      }
+      g_value_unset (&value);
+      if (found_property)
+        break;
+    }
+  }
+
+  gst_element_set_state (pipeline, GST_STATE_NULL);
+  gst_object_unref (pipeline);
+  return 0;
+}
diff --git a/tests/examples/opencv/gstmotioncells_dynamic_test.h b/tests/examples/opencv/gstmotioncells_dynamic_test.h
new file mode 100644
index 0000000000..6760c66669
--- /dev/null
+++ b/tests/examples/opencv/gstmotioncells_dynamic_test.h
@@ -0,0 +1,30 @@
+/* GStreamer
+ * Copyright (C) 2011 Robert Jobbagy <jobbagy.robert@gmail.com>
+ *
+ *
+ *  gst_motioncells_dynamic_test(): a test tool what can to do dynamic change properties
+ *
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef GST_MOTIONCELLS_DYNAMIC_TEST_H
+#define GST_MOTIONCELLS_DYNAMIC_TEST_H
+
+extern void setProperty (GstElement * mcells, char *property, char *prop_value,
+    GType type, GValue * value);
+
+
+#endif

From e5970c8805a6ea4ed4c5baabfe6f7352d963f9d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Thu, 28 Jul 2011 20:38:37 +0100
Subject: [PATCH 133/158] tagmux: require subclass to install sink pad template

Require the subclass to install both source and sink pad
templates. Also, print some warnings if the subclass doesn't
do that.

https://bugzilla.gnome.org/show_bug.cgi?id=555437
---
 gst/id3tag/gstid3mux.c |  8 ++++++++
 gst/id3tag/gsttagmux.c | 42 +++++++++++++++++++++++-------------------
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/gst/id3tag/gstid3mux.c b/gst/id3tag/gstid3mux.c
index d203fb3c6d..f2330d2b10 100644
--- a/gst/id3tag/gstid3mux.c
+++ b/gst/id3tag/gstid3mux.c
@@ -71,6 +71,11 @@ enum
 #define DEFAULT_WRITE_V2 TRUE
 #define DEFAULT_V2_MAJOR_VERSION 3
 
+static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("ANY"));
+
 static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
@@ -93,6 +98,9 @@ gst_id3_mux_base_init (gpointer g_class)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
 
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&sink_template));
+
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&src_template));
 
diff --git a/gst/id3tag/gsttagmux.c b/gst/id3tag/gsttagmux.c
index c7d9f0823d..b5fd5960c5 100644
--- a/gst/id3tag/gsttagmux.c
+++ b/gst/id3tag/gsttagmux.c
@@ -20,6 +20,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
+/**
+ * FIXME: documentation
+ *
+ * Since: 0.10.36
+ */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -50,15 +55,6 @@ struct _GstTagMuxPrivate
 GST_DEBUG_CATEGORY_STATIC (gst_tag_mux_debug);
 #define GST_CAT_DEFAULT gst_tag_mux_debug
 
-/* Subclass provides a src template and pad. We accept anything as input here,
-   however. */
-
-static GstStaticPadTemplate gst_tag_mux_sink_template =
-GST_STATIC_PAD_TEMPLATE ("sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("ANY"));
-
 static void
 gst_tag_mux_iface_init (GType tag_type)
 {
@@ -111,11 +107,6 @@ gst_tag_mux_finalize (GObject * obj)
 static void
 gst_tag_mux_base_init (gpointer g_class)
 {
-  GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
-
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&gst_tag_mux_sink_template));
-
   GST_DEBUG_CATEGORY_INIT (gst_tag_mux_debug, "id3basemux", 0,
       "tag muxer base class for Id3Mux");
 }
@@ -145,8 +136,14 @@ gst_tag_mux_init (GstTagMux * mux, GstTagMuxClass * mux_class)
       G_TYPE_INSTANCE_GET_PRIVATE (mux, GST_TYPE_TAG_MUX, GstTagMuxPrivate);
 
   /* pad through which data comes in to the element */
-  mux->priv->sinkpad =
-      gst_pad_new_from_static_template (&gst_tag_mux_sink_template, "sink");
+  tmpl = gst_element_class_get_pad_template (element_klass, "sink");
+  if (tmpl) {
+    mux->priv->sinkpad = gst_pad_new_from_template (tmpl, "sink");
+  } else {
+    g_warning ("GstTagMux subclass '%s' did not install a %s pad template!\n",
+        G_OBJECT_CLASS_NAME (mux_class), "sink");
+    mux->priv->sinkpad = gst_pad_new ("sink", GST_PAD_SINK);
+  }
   gst_pad_set_chain_function (mux->priv->sinkpad,
       GST_DEBUG_FUNCPTR (gst_tag_mux_chain));
   gst_pad_set_event_function (mux->priv->sinkpad,
@@ -156,12 +153,19 @@ gst_tag_mux_init (GstTagMux * mux, GstTagMuxClass * mux_class)
   /* pad through which data goes out of the element */
   tmpl = gst_element_class_get_pad_template (element_klass, "src");
   if (tmpl) {
+    GstCaps *tmpl_caps = gst_pad_template_get_caps (tmpl);
+
     mux->priv->srcpad = gst_pad_new_from_template (tmpl, "src");
     gst_pad_use_fixed_caps (mux->priv->srcpad);
-    /* FIXME: we assume the template caps are fixed.. */
-    gst_pad_set_caps (mux->priv->srcpad, gst_pad_template_get_caps (tmpl));
-    gst_element_add_pad (GST_ELEMENT (mux), mux->priv->srcpad);
+    if (tmpl_caps != NULL && gst_caps_is_fixed (tmpl_caps)) {
+      gst_pad_set_caps (mux->priv->srcpad, tmpl_caps);
+    }
+  } else {
+    g_warning ("GstTagMux subclass '%s' did not install a %s pad template!\n",
+        G_OBJECT_CLASS_NAME (mux_class), "source");
+    mux->priv->srcpad = gst_pad_new ("src", GST_PAD_SRC);
   }
+  gst_element_add_pad (GST_ELEMENT (mux), mux->priv->srcpad);
 
   mux->priv->render_start_tag = TRUE;
   mux->priv->render_end_tag = TRUE;

From 830a337799c49c2ba897df794d85ee22ce877b1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Fri, 29 Jul 2011 19:43:11 +0100
Subject: [PATCH 134/158] id3mux: use now-public GstTagMux base class from
 libgsttag

---
 gst/id3tag/Makefile.am |   3 +-
 gst/id3tag/gstid3mux.h |   2 +-
 gst/id3tag/gsttagmux.c | 537 -----------------------------------------
 gst/id3tag/gsttagmux.h |  69 ------
 gst/id3tag/id3tag.h    |   2 +-
 5 files changed, 3 insertions(+), 610 deletions(-)
 delete mode 100644 gst/id3tag/gsttagmux.c
 delete mode 100644 gst/id3tag/gsttagmux.h

diff --git a/gst/id3tag/Makefile.am b/gst/id3tag/Makefile.am
index bb9c150ce9..f2ed73df73 100644
--- a/gst/id3tag/Makefile.am
+++ b/gst/id3tag/Makefile.am
@@ -2,7 +2,6 @@ plugin_LTLIBRARIES = libgstid3tag.la
 
 libgstid3tag_la_SOURCES = \
 	gstid3mux.c \
-	gsttagmux.c \
 	id3tag.c
 
 libgstid3tag_la_CFLAGS = \
@@ -16,7 +15,7 @@ libgstid3tag_la_LIBADD = \
 libgstid3tag_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstid3tag_la_LIBTOOLFLAGS = --tag=disable-static
 
-noinst_HEADERS = gstid3mux.h gsttagmux.h id3tag.h
+noinst_HEADERS = gstid3mux.h id3tag.h
 
 Android.mk: Makefile.am $(BUILT_SOURCES)
 	androgenizer \
diff --git a/gst/id3tag/gstid3mux.h b/gst/id3tag/gstid3mux.h
index eb5aa050a9..ba4f930c28 100644
--- a/gst/id3tag/gstid3mux.h
+++ b/gst/id3tag/gstid3mux.h
@@ -23,7 +23,7 @@
 #ifndef GST_ID3_MUX_H
 #define GST_ID3_MUX_H
 
-#include "gsttagmux.h"
+#include <gst/tag/gsttagmux.h>
 #include "id3tag.h"
 
 G_BEGIN_DECLS
diff --git a/gst/id3tag/gsttagmux.c b/gst/id3tag/gsttagmux.c
deleted file mode 100644
index b5fd5960c5..0000000000
--- a/gst/id3tag/gsttagmux.c
+++ /dev/null
@@ -1,537 +0,0 @@
-/* GStreamer tag muxer base class
- * Copyright (C) 2006 Christophe Fergeau  <teuf@gnome.org>
- * Copyright (C) 2006 Tim-Philipp Müller <tim centricular net>
- * Copyright (C) 2006 Sebastian Dröge <slomo@circular-chaos.org>
- * Copyright (C) 2009 Pioneers of the Inevitable <songbird@songbirdnest.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.
- */
-
-/**
- * FIXME: documentation
- *
- * Since: 0.10.36
- */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <gst/gsttagsetter.h>
-#include <gst/tag/tag.h>
-
-#include "gsttagmux.h"
-
-struct _GstTagMuxPrivate
-{
-  GstPad *srcpad;
-  GstPad *sinkpad;
-  GstTagList *event_tags;       /* tags received from upstream elements */
-  GstTagList *final_tags;       /* Final set of tags used for muxing */
-  gsize start_tag_size;
-  gsize end_tag_size;
-  gboolean render_start_tag;
-  gboolean render_end_tag;
-
-  gint64 current_offset;
-  gint64 max_offset;
-
-  GstEvent *newsegment_ev;      /* cached newsegment event from upstream */
-};
-
-GST_DEBUG_CATEGORY_STATIC (gst_tag_mux_debug);
-#define GST_CAT_DEFAULT gst_tag_mux_debug
-
-static void
-gst_tag_mux_iface_init (GType tag_type)
-{
-  static const GInterfaceInfo tag_setter_info = {
-    NULL,
-    NULL,
-    NULL
-  };
-
-  g_type_add_interface_static (tag_type, GST_TYPE_TAG_SETTER, &tag_setter_info);
-}
-
-/* make sure to register a less generic type so we can easily move this
- * GstTagMux base class into -base without causing GType name conflicts */
-typedef GstTagMux GstId3BaseMux;
-typedef GstTagMuxClass GstId3BaseMuxClass;
-
-GST_BOILERPLATE_FULL (GstId3BaseMux, gst_tag_mux,
-    GstElement, GST_TYPE_ELEMENT, gst_tag_mux_iface_init);
-
-
-static GstStateChangeReturn
-gst_tag_mux_change_state (GstElement * element, GstStateChange transition);
-static GstFlowReturn gst_tag_mux_chain (GstPad * pad, GstBuffer * buffer);
-static gboolean gst_tag_mux_sink_event (GstPad * pad, GstEvent * event);
-
-static void
-gst_tag_mux_finalize (GObject * obj)
-{
-  GstTagMux *mux = GST_TAG_MUX (obj);
-
-  if (mux->priv->newsegment_ev) {
-    gst_event_unref (mux->priv->newsegment_ev);
-    mux->priv->newsegment_ev = NULL;
-  }
-
-  if (mux->priv->event_tags) {
-    gst_tag_list_free (mux->priv->event_tags);
-    mux->priv->event_tags = NULL;
-  }
-
-  if (mux->priv->final_tags) {
-    gst_tag_list_free (mux->priv->final_tags);
-    mux->priv->final_tags = NULL;
-  }
-
-  G_OBJECT_CLASS (parent_class)->finalize (obj);
-}
-
-static void
-gst_tag_mux_base_init (gpointer g_class)
-{
-  GST_DEBUG_CATEGORY_INIT (gst_tag_mux_debug, "id3basemux", 0,
-      "tag muxer base class for Id3Mux");
-}
-
-static void
-gst_tag_mux_class_init (GstTagMuxClass * klass)
-{
-  GObjectClass *gobject_class;
-  GstElementClass *gstelement_class;
-
-  gobject_class = (GObjectClass *) klass;
-  gstelement_class = (GstElementClass *) klass;
-
-  gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_tag_mux_finalize);
-  gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_tag_mux_change_state);
-
-  g_type_class_add_private (klass, sizeof (GstTagMuxPrivate));
-}
-
-static void
-gst_tag_mux_init (GstTagMux * mux, GstTagMuxClass * mux_class)
-{
-  GstElementClass *element_klass = GST_ELEMENT_CLASS (mux_class);
-  GstPadTemplate *tmpl;
-
-  mux->priv =
-      G_TYPE_INSTANCE_GET_PRIVATE (mux, GST_TYPE_TAG_MUX, GstTagMuxPrivate);
-
-  /* pad through which data comes in to the element */
-  tmpl = gst_element_class_get_pad_template (element_klass, "sink");
-  if (tmpl) {
-    mux->priv->sinkpad = gst_pad_new_from_template (tmpl, "sink");
-  } else {
-    g_warning ("GstTagMux subclass '%s' did not install a %s pad template!\n",
-        G_OBJECT_CLASS_NAME (mux_class), "sink");
-    mux->priv->sinkpad = gst_pad_new ("sink", GST_PAD_SINK);
-  }
-  gst_pad_set_chain_function (mux->priv->sinkpad,
-      GST_DEBUG_FUNCPTR (gst_tag_mux_chain));
-  gst_pad_set_event_function (mux->priv->sinkpad,
-      GST_DEBUG_FUNCPTR (gst_tag_mux_sink_event));
-  gst_element_add_pad (GST_ELEMENT (mux), mux->priv->sinkpad);
-
-  /* pad through which data goes out of the element */
-  tmpl = gst_element_class_get_pad_template (element_klass, "src");
-  if (tmpl) {
-    GstCaps *tmpl_caps = gst_pad_template_get_caps (tmpl);
-
-    mux->priv->srcpad = gst_pad_new_from_template (tmpl, "src");
-    gst_pad_use_fixed_caps (mux->priv->srcpad);
-    if (tmpl_caps != NULL && gst_caps_is_fixed (tmpl_caps)) {
-      gst_pad_set_caps (mux->priv->srcpad, tmpl_caps);
-    }
-  } else {
-    g_warning ("GstTagMux subclass '%s' did not install a %s pad template!\n",
-        G_OBJECT_CLASS_NAME (mux_class), "source");
-    mux->priv->srcpad = gst_pad_new ("src", GST_PAD_SRC);
-  }
-  gst_element_add_pad (GST_ELEMENT (mux), mux->priv->srcpad);
-
-  mux->priv->render_start_tag = TRUE;
-  mux->priv->render_end_tag = TRUE;
-}
-
-static GstTagList *
-gst_tag_mux_get_tags (GstTagMux * mux)
-{
-  GstTagSetter *tagsetter = GST_TAG_SETTER (mux);
-  const GstTagList *tagsetter_tags;
-  GstTagMergeMode merge_mode;
-
-  if (mux->priv->final_tags)
-    return mux->priv->final_tags;
-
-  tagsetter_tags = gst_tag_setter_get_tag_list (tagsetter);
-  merge_mode = gst_tag_setter_get_tag_merge_mode (tagsetter);
-
-  GST_LOG_OBJECT (mux, "merging tags, merge mode = %d", merge_mode);
-  GST_LOG_OBJECT (mux, "event tags: %" GST_PTR_FORMAT, mux->priv->event_tags);
-  GST_LOG_OBJECT (mux, "set   tags: %" GST_PTR_FORMAT, tagsetter_tags);
-
-  mux->priv->final_tags =
-      gst_tag_list_merge (tagsetter_tags, mux->priv->event_tags, merge_mode);
-
-  GST_LOG_OBJECT (mux, "final tags: %" GST_PTR_FORMAT, mux->priv->final_tags);
-
-  return mux->priv->final_tags;
-}
-
-static GstFlowReturn
-gst_tag_mux_render_start_tag (GstTagMux * mux)
-{
-  GstTagMuxClass *klass;
-  GstBuffer *buffer;
-  GstTagList *taglist;
-  GstEvent *event;
-  GstFlowReturn ret;
-
-  taglist = gst_tag_mux_get_tags (mux);
-
-  klass = GST_TAG_MUX_CLASS (G_OBJECT_GET_CLASS (mux));
-
-  if (klass->render_start_tag == NULL)
-    goto no_vfunc;
-
-  buffer = klass->render_start_tag (mux, taglist);
-
-  /* Null buffer is ok, just means we're not outputting anything */
-  if (buffer == NULL) {
-    GST_INFO_OBJECT (mux, "No start tag generated");
-    mux->priv->start_tag_size = 0;
-    return GST_FLOW_OK;
-  }
-
-  if (GST_BUFFER_CAPS (buffer) == NULL) {
-    buffer = gst_buffer_make_metadata_writable (buffer);
-    gst_buffer_set_caps (buffer, GST_PAD_CAPS (mux->priv->srcpad));
-  }
-
-  mux->priv->start_tag_size = GST_BUFFER_SIZE (buffer);
-  GST_LOG_OBJECT (mux, "tag size = %" G_GSIZE_FORMAT " bytes",
-      mux->priv->start_tag_size);
-
-  /* Send newsegment event from byte position 0, so the tag really gets
-   * written to the start of the file, independent of the upstream segment */
-  gst_pad_push_event (mux->priv->srcpad,
-      gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_BYTES, 0, -1, 0));
-
-  /* Send an event about the new tags to downstream elements */
-  /* gst_event_new_tag takes ownership of the list, so use a copy */
-  event = gst_event_new_tag (gst_tag_list_copy (taglist));
-  gst_pad_push_event (mux->priv->srcpad, event);
-
-  GST_BUFFER_OFFSET (buffer) = 0;
-  ret = gst_pad_push (mux->priv->srcpad, buffer);
-
-  mux->priv->current_offset = mux->priv->start_tag_size;
-  mux->priv->max_offset =
-      MAX (mux->priv->max_offset, mux->priv->current_offset);
-
-  return ret;
-
-no_vfunc:
-  {
-    GST_ERROR_OBJECT (mux, "Subclass does not implement "
-        "render_start_tag vfunc!");
-    return GST_FLOW_ERROR;
-  }
-}
-
-static GstFlowReturn
-gst_tag_mux_render_end_tag (GstTagMux * mux)
-{
-  GstTagMuxClass *klass;
-  GstBuffer *buffer;
-  GstTagList *taglist;
-  GstFlowReturn ret;
-
-  taglist = gst_tag_mux_get_tags (mux);
-
-  klass = GST_TAG_MUX_CLASS (G_OBJECT_GET_CLASS (mux));
-
-  if (klass->render_end_tag == NULL)
-    goto no_vfunc;
-
-  buffer = klass->render_end_tag (mux, taglist);
-
-  if (buffer == NULL) {
-    GST_INFO_OBJECT (mux, "No end tag generated");
-    mux->priv->end_tag_size = 0;
-    return GST_FLOW_OK;
-  }
-
-  if (GST_BUFFER_CAPS (buffer) == NULL) {
-    buffer = gst_buffer_make_metadata_writable (buffer);
-    gst_buffer_set_caps (buffer, GST_PAD_CAPS (mux->priv->srcpad));
-  }
-
-  mux->priv->end_tag_size = GST_BUFFER_SIZE (buffer);
-  GST_LOG_OBJECT (mux, "tag size = %" G_GSIZE_FORMAT " bytes",
-      mux->priv->end_tag_size);
-
-  /* Send newsegment event from the end of the file, so it gets written there,
-     independent of whatever new segment events upstream has sent us */
-  gst_pad_push_event (mux->priv->srcpad,
-      gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_BYTES,
-          mux->priv->max_offset, -1, 0));
-
-  GST_BUFFER_OFFSET (buffer) = mux->priv->max_offset;
-  ret = gst_pad_push (mux->priv->srcpad, buffer);
-
-  return ret;
-
-no_vfunc:
-  {
-    GST_ERROR_OBJECT (mux, "Subclass does not implement "
-        "render_end_tag vfunc!");
-    return GST_FLOW_ERROR;
-  }
-}
-
-static GstEvent *
-gst_tag_mux_adjust_event_offsets (GstTagMux * mux,
-    const GstEvent * newsegment_event)
-{
-  GstFormat format;
-  gint64 start, stop, cur;
-
-  gst_event_parse_new_segment ((GstEvent *) newsegment_event, NULL, NULL,
-      &format, &start, &stop, &cur);
-
-  g_assert (format == GST_FORMAT_BYTES);
-
-  if (start != -1)
-    start += mux->priv->start_tag_size;
-  if (stop != -1)
-    stop += mux->priv->start_tag_size;
-  if (cur != -1)
-    cur += mux->priv->start_tag_size;
-
-  GST_DEBUG_OBJECT (mux, "adjusting newsegment event offsets to start=%"
-      G_GINT64_FORMAT ", stop=%" G_GINT64_FORMAT ", cur=%" G_GINT64_FORMAT
-      " (delta = +%" G_GSIZE_FORMAT ")", start, stop, cur,
-      mux->priv->start_tag_size);
-
-  return gst_event_new_new_segment (TRUE, 1.0, format, start, stop, cur);
-}
-
-static GstFlowReturn
-gst_tag_mux_chain (GstPad * pad, GstBuffer * buffer)
-{
-  GstTagMux *mux = GST_TAG_MUX (GST_OBJECT_PARENT (pad));
-  GstFlowReturn ret;
-  int length;
-
-  if (mux->priv->render_start_tag) {
-
-    GST_INFO_OBJECT (mux, "Adding tags to stream");
-    ret = gst_tag_mux_render_start_tag (mux);
-    if (ret != GST_FLOW_OK) {
-      GST_DEBUG_OBJECT (mux, "flow: %s", gst_flow_get_name (ret));
-      gst_buffer_unref (buffer);
-      return ret;
-    }
-
-    /* Now send the cached newsegment event that we got from upstream */
-    if (mux->priv->newsegment_ev) {
-      gint64 start;
-      GstEvent *newseg;
-
-      GST_DEBUG_OBJECT (mux, "sending cached newsegment event");
-      newseg = gst_tag_mux_adjust_event_offsets (mux, mux->priv->newsegment_ev);
-      gst_event_unref (mux->priv->newsegment_ev);
-      mux->priv->newsegment_ev = NULL;
-
-      gst_event_parse_new_segment (newseg, NULL, NULL, NULL, &start, NULL,
-          NULL);
-
-      gst_pad_push_event (mux->priv->srcpad, newseg);
-      mux->priv->current_offset = start;
-      mux->priv->max_offset =
-          MAX (mux->priv->max_offset, mux->priv->current_offset);
-    } else {
-      /* upstream sent no newsegment event or only one in a non-BYTE format */
-    }
-
-    mux->priv->render_start_tag = FALSE;
-  }
-
-  buffer = gst_buffer_make_metadata_writable (buffer);
-
-  if (GST_BUFFER_OFFSET (buffer) != GST_BUFFER_OFFSET_NONE) {
-    GST_LOG_OBJECT (mux, "Adjusting buffer offset from %" G_GINT64_FORMAT
-        " to %" G_GINT64_FORMAT, GST_BUFFER_OFFSET (buffer),
-        GST_BUFFER_OFFSET (buffer) + mux->priv->start_tag_size);
-    GST_BUFFER_OFFSET (buffer) += mux->priv->start_tag_size;
-  }
-
-  length = GST_BUFFER_SIZE (buffer);
-
-  gst_buffer_set_caps (buffer, GST_PAD_CAPS (mux->priv->srcpad));
-  ret = gst_pad_push (mux->priv->srcpad, buffer);
-
-  mux->priv->current_offset += length;
-  mux->priv->max_offset =
-      MAX (mux->priv->max_offset, mux->priv->current_offset);
-
-  return ret;
-}
-
-static gboolean
-gst_tag_mux_sink_event (GstPad * pad, GstEvent * event)
-{
-  GstTagMux *mux;
-  gboolean result;
-
-  mux = GST_TAG_MUX (gst_pad_get_parent (pad));
-  result = FALSE;
-
-  switch (GST_EVENT_TYPE (event)) {
-    case GST_EVENT_TAG:{
-      GstTagList *tags;
-
-      gst_event_parse_tag (event, &tags);
-
-      GST_INFO_OBJECT (mux, "Got tag event: %" GST_PTR_FORMAT, tags);
-
-      if (mux->priv->event_tags != NULL) {
-        gst_tag_list_insert (mux->priv->event_tags, tags,
-            GST_TAG_MERGE_REPLACE);
-      } else {
-        mux->priv->event_tags = gst_tag_list_copy (tags);
-      }
-
-      GST_INFO_OBJECT (mux, "Event tags are now: %" GST_PTR_FORMAT,
-          mux->priv->event_tags);
-
-      /* just drop the event, we'll push a new tag event in render_start_tag */
-      gst_event_unref (event);
-      result = TRUE;
-      break;
-    }
-    case GST_EVENT_NEWSEGMENT:{
-      GstFormat fmt;
-      gint64 start;
-
-      gst_event_parse_new_segment (event, NULL, NULL, &fmt, &start, NULL, NULL);
-
-      if (fmt != GST_FORMAT_BYTES) {
-        GST_WARNING_OBJECT (mux, "dropping newsegment event in %s format",
-            gst_format_get_name (fmt));
-        gst_event_unref (event);
-        break;
-      }
-
-      if (mux->priv->render_start_tag) {
-        /* we have not rendered the tag yet, which means that we don't know
-         * how large it is going to be yet, so we can't adjust the offsets
-         * here at this point and need to cache the newsegment event for now
-         * (also, there could be tag events coming after this newsegment event
-         *  and before the first buffer). */
-        if (mux->priv->newsegment_ev) {
-          GST_WARNING_OBJECT (mux, "discarding old cached newsegment event");
-          gst_event_unref (mux->priv->newsegment_ev);
-        }
-
-        GST_LOG_OBJECT (mux, "caching newsegment event for later");
-        mux->priv->newsegment_ev = event;
-      } else {
-        GST_DEBUG_OBJECT (mux, "got newsegment event, adjusting offsets");
-        gst_pad_push_event (mux->priv->srcpad,
-            gst_tag_mux_adjust_event_offsets (mux, event));
-        gst_event_unref (event);
-
-        mux->priv->current_offset = start;
-        mux->priv->max_offset =
-            MAX (mux->priv->max_offset, mux->priv->current_offset);
-      }
-      event = NULL;
-      result = TRUE;
-      break;
-    }
-    case GST_EVENT_EOS:{
-      if (mux->priv->render_end_tag) {
-        GstFlowReturn ret;
-
-        GST_INFO_OBJECT (mux, "Adding tags to stream");
-        ret = gst_tag_mux_render_end_tag (mux);
-        if (ret != GST_FLOW_OK) {
-          GST_DEBUG_OBJECT (mux, "flow: %s", gst_flow_get_name (ret));
-          return ret;
-        }
-
-        mux->priv->render_end_tag = FALSE;
-      }
-
-      /* Now forward EOS */
-      result = gst_pad_event_default (pad, event);
-      break;
-    }
-    default:
-      result = gst_pad_event_default (pad, event);
-      break;
-  }
-
-  gst_object_unref (mux);
-
-  return result;
-}
-
-
-static GstStateChangeReturn
-gst_tag_mux_change_state (GstElement * element, GstStateChange transition)
-{
-  GstTagMux *mux;
-  GstStateChangeReturn result;
-
-  mux = GST_TAG_MUX (element);
-
-  result = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
-  if (result != GST_STATE_CHANGE_SUCCESS) {
-    return result;
-  }
-
-  switch (transition) {
-    case GST_STATE_CHANGE_PAUSED_TO_READY:{
-      if (mux->priv->newsegment_ev) {
-        gst_event_unref (mux->priv->newsegment_ev);
-        mux->priv->newsegment_ev = NULL;
-      }
-      if (mux->priv->event_tags) {
-        gst_tag_list_free (mux->priv->event_tags);
-        mux->priv->event_tags = NULL;
-      }
-      mux->priv->start_tag_size = 0;
-      mux->priv->end_tag_size = 0;
-      mux->priv->render_start_tag = TRUE;
-      mux->priv->render_end_tag = TRUE;
-      mux->priv->current_offset = 0;
-      mux->priv->max_offset = 0;
-      break;
-    }
-    default:
-      break;
-  }
-
-  return result;
-}
diff --git a/gst/id3tag/gsttagmux.h b/gst/id3tag/gsttagmux.h
deleted file mode 100644
index 4677c32f75..0000000000
--- a/gst/id3tag/gsttagmux.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* GStreamer tag muxer base class
- *
- * Copyright (C) 2006 Christophe Fergeau  <teuf@gnome.org>
- * Copyright (C) 2006 Tim-Philipp Müller <tim centricular net>
- * Copyright (C) 2009 Pioneers of the Inevitable <songbird@songbirdnest.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_TAG_MUX_H
-#define GST_TAG_MUX_H
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_TAG_MUX \
-  (gst_tag_mux_get_type())
-#define GST_TAG_MUX(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_TAG_MUX,GstTagMux))
-#define GST_TAG_MUX_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_TAG_MUX,GstTagMuxClass))
-#define GST_IS_TAG_MUX(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_TAG_MUX))
-#define GST_IS_TAG_MUX_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_TAG_MUX))
-
-typedef struct _GstTagMux GstTagMux;
-typedef struct _GstTagMuxClass GstTagMuxClass;
-typedef struct _GstTagMuxPrivate GstTagMuxPrivate;
-
-struct _GstTagMux {
-  GstElement    element;
-
-  /*< private >*/
-  GstTagMuxPrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-struct _GstTagMuxClass {
-  GstElementClass parent_class;
-
-  /* vfuncs */
-  GstBuffer  * (*render_start_tag) (GstTagMux * mux, const GstTagList * tag_list);
-  GstBuffer  * (*render_end_tag)   (GstTagMux * mux, const GstTagList * tag_list);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_tag_mux_get_type (void);
-
-G_END_DECLS
-
-#endif
diff --git a/gst/id3tag/id3tag.h b/gst/id3tag/id3tag.h
index eeb1995d5b..321c7b8fbe 100644
--- a/gst/id3tag/id3tag.h
+++ b/gst/id3tag/id3tag.h
@@ -17,7 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "gsttagmux.h"
+#include <gst/tag/gsttagmux.h>
 
 G_BEGIN_DECLS
 

From b6723d092c12cee3c24da8ea94229da9309a1f80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Fri, 29 Jul 2011 21:26:41 +0100
Subject: [PATCH 135/158] tests: fix compiler warning in faad unit test

---
 tests/check/elements/faad.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/check/elements/faad.c b/tests/check/elements/faad.c
index c911048e92..8478b51117 100644
--- a/tests/check/elements/faad.c
+++ b/tests/check/elements/faad.c
@@ -111,12 +111,10 @@ do_test (GstBuffer * inbuffer)
   /* clean up buffers */
   for (i = 0; i < num_buffers; ++i) {
     gint size;
-    guint8 *data;
 
     outbuffer = GST_BUFFER (buffers->data);
     fail_if (outbuffer == NULL);
 
-    data = GST_BUFFER_DATA (outbuffer);
     size = GST_BUFFER_SIZE (outbuffer);
 
     /* 2 16-bit channels */

From cbc0a2f056aced60c7e8c8be861a18e0743f5af2 Mon Sep 17 00:00:00 2001
From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Date: Thu, 28 Jul 2011 18:21:04 -0400
Subject: [PATCH 136/158] mpegtsbase: Prevent stack gardening by using the
 right type

stream_type is stored as guint inside the GstStructure but was retreived
using valist with a pointer to guint16. This would cause stack gardening
when code is compiled without optimisation (e.g. in -O0 the compiler wont
pad the stack to optimise out required mask).

https://bugzilla.gnome.org/show_bug.cgi?id=655540
---
 gst/mpegtsdemux/mpegtsbase.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gst/mpegtsdemux/mpegtsbase.c b/gst/mpegtsdemux/mpegtsbase.c
index ac4b6157a0..e3be7c84b6 100644
--- a/gst/mpegtsdemux/mpegtsbase.c
+++ b/gst/mpegtsdemux/mpegtsbase.c
@@ -615,7 +615,7 @@ mpegts_base_activate_program (MpegTSBase * base, MpegTSBaseProgram * program,
   guint i, nbstreams;
   guint pcr_pid;
   guint pid;
-  guint16 stream_type;
+  guint stream_type;
   GstStructure *stream;
   const GValue *new_streams;
   const GValue *value;

From 57279cdd249796a0b5ce0710dbb226a8b98faac9 Mon Sep 17 00:00:00 2001
From: Edward Hervey <edward.hervey@collabora.co.uk>
Date: Mon, 1 Aug 2011 10:54:16 +0200
Subject: [PATCH 137/158] tsdemux: Refactor stream/program removal

The program_stopped vmethod was called before stream_removed vmethod
was being called. Since we only did stream-related operations in there,
we just remove the program_stopped vmethod and do everything in the
stream_removed one.

Also, make sure we flush out all pending data before sending EOS.
---
 gst/mpegtsdemux/tsdemux.c | 49 ++++++++++++---------------------------
 1 file changed, 15 insertions(+), 34 deletions(-)

diff --git a/gst/mpegtsdemux/tsdemux.c b/gst/mpegtsdemux/tsdemux.c
index 6ea958bda4..fc0df389fb 100644
--- a/gst/mpegtsdemux/tsdemux.c
+++ b/gst/mpegtsdemux/tsdemux.c
@@ -184,8 +184,6 @@ static gboolean gst_ts_demux_srcpad_query (GstPad * pad, GstQuery * query);
 /* mpegtsbase methods */
 static void
 gst_ts_demux_program_started (MpegTSBase * base, MpegTSBaseProgram * program);
-static void
-gst_ts_demux_program_stopped (MpegTSBase * base, MpegTSBaseProgram * program);
 static void gst_ts_demux_reset (MpegTSBase * base);
 static GstFlowReturn
 gst_ts_demux_push (MpegTSBase * base, MpegTSPacketizerPacket * packet,
@@ -210,6 +208,9 @@ static GstFlowReturn
 process_pcr (MpegTSBase * base, guint64 initoff, TSPcrOffset * pcroffset,
     guint numpcr, gboolean isinitial);
 static void gst_ts_demux_flush_streams (GstTSDemux * tsdemux);
+static GstFlowReturn
+gst_ts_demux_push_pending_data (GstTSDemux * demux, TSDemuxStream * stream);
+
 static gboolean push_event (MpegTSBase * base, GstEvent * event);
 static void _extra_init (GType type);
 
@@ -277,7 +278,6 @@ gst_ts_demux_class_init (GstTSDemuxClass * klass)
   ts_class->push = GST_DEBUG_FUNCPTR (gst_ts_demux_push);
   ts_class->push_event = GST_DEBUG_FUNCPTR (push_event);
   ts_class->program_started = GST_DEBUG_FUNCPTR (gst_ts_demux_program_started);
-  ts_class->program_stopped = GST_DEBUG_FUNCPTR (gst_ts_demux_program_stopped);
   ts_class->stream_added = gst_ts_demux_stream_added;
   ts_class->stream_removed = gst_ts_demux_stream_removed;
   ts_class->find_timestamps = GST_DEBUG_FUNCPTR (find_timestamps);
@@ -1219,14 +1219,20 @@ gst_ts_demux_stream_removed (MpegTSBase * base, MpegTSBaseStream * bstream)
 {
   TSDemuxStream *stream = (TSDemuxStream *) bstream;
 
-  if (stream) {
-    if (stream->pad) {
-      /* Unref the pad, clear it */
-      gst_object_unref (stream->pad);
-      stream->pad = NULL;
+  if (stream->pad) {
+    if (gst_pad_is_active (stream->pad)) {
+      GST_DEBUG_OBJECT (stream->pad, "Flushing out pending data");
+      /* Flush out all data */
+      gst_ts_demux_push_pending_data ((GstTSDemux *) base, stream);
+      GST_DEBUG_OBJECT (stream->pad, "Pushing out EOS");
+      gst_pad_push_event (stream->pad, gst_event_new_eos ());
+      GST_DEBUG_OBJECT (stream->pad, "Deactivating and removing pad");
+      gst_pad_set_active (stream->pad, FALSE);
+      gst_element_remove_pad (GST_ELEMENT_CAST (base), stream->pad);
     }
-    stream->flow_return = GST_FLOW_NOT_LINKED;
+    stream->pad = NULL;
   }
+  stream->flow_return = GST_FLOW_NOT_LINKED;
 }
 
 static void
@@ -1296,31 +1302,6 @@ gst_ts_demux_program_started (MpegTSBase * base, MpegTSBaseProgram * program)
   }
 }
 
-static void
-gst_ts_demux_program_stopped (MpegTSBase * base, MpegTSBaseProgram * program)
-{
-  GList *tmp;
-  GstTSDemux *demux = GST_TS_DEMUX (base);
-  TSDemuxStream *localstream = NULL;
-
-  GST_LOG ("program %d stopped", program->program_number);
-
-  for (tmp = program->stream_list; tmp; tmp = tmp->next) {
-    localstream = (TSDemuxStream *) tmp->data;
-    if (localstream->pad) {
-      if (gst_pad_is_active (localstream->pad)) {
-        GST_DEBUG ("Pushing EOS and deactivating pad %s:%s",
-            GST_DEBUG_PAD_NAME (localstream->pad));
-        gst_pad_push_event (localstream->pad, gst_event_new_eos ());
-        gst_pad_set_active (localstream->pad, FALSE);
-        gst_element_remove_pad (GST_ELEMENT_CAST (demux), localstream->pad);
-      } else
-        gst_object_unref (localstream->pad);
-      localstream->pad = NULL;
-    }
-  }
-}
-
 static gboolean
 process_section (MpegTSBase * base)
 {

From adfb090b59a7f8537e27a6926cb21a5a26dd7354 Mon Sep 17 00:00:00 2001
From: Edward Hervey <edward.hervey@collabora.co.uk>
Date: Mon, 1 Aug 2011 15:46:12 +0200
Subject: [PATCH 138/158] mpegtsbase: Remove programs on EOS

Allows subclasses to properly flush out pending data.
---
 gst/mpegtsdemux/mpegtsbase.c | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/gst/mpegtsdemux/mpegtsbase.c b/gst/mpegtsdemux/mpegtsbase.c
index e3be7c84b6..2a81f75939 100644
--- a/gst/mpegtsdemux/mpegtsbase.c
+++ b/gst/mpegtsdemux/mpegtsbase.c
@@ -212,6 +212,10 @@ mpegts_base_reset (MpegTSBase * base)
 
   gst_segment_init (&base->segment, GST_FORMAT_UNDEFINED);
 
+  base->mode = BASE_MODE_STREAMING;
+  base->seen_pat = FALSE;
+  base->first_pat_offset = -1;
+
   if (klass->reset)
     klass->reset (base);
 }
@@ -236,15 +240,10 @@ mpegts_base_init (MpegTSBase * base, MpegTSBaseClass * klass)
 
   base->is_pes = g_new0 (guint8, 1024);
   base->known_psi = g_new0 (guint8, 1024);
-  mpegts_base_reset (base);
   base->program_size = sizeof (MpegTSBaseProgram);
   base->stream_size = sizeof (MpegTSBaseStream);
 
-  base->mode = BASE_MODE_STREAMING;
-  base->seen_pat = FALSE;
-  base->first_pat_offset = -1;
-
-  gst_segment_init (&base->segment, GST_FORMAT_UNDEFINED);
+  mpegts_base_reset (base);
 }
 
 static void
@@ -1135,6 +1134,23 @@ mpegts_base_get_tags_from_eit (MpegTSBase * base, GstStructure * eit_info)
   }
 }
 
+static void
+remove_each_program (gpointer key, MpegTSBaseProgram * program,
+    MpegTSBase * base)
+{
+  /* First deactivate it */
+  mpegts_base_deactivate_program (base, program);
+  /* Then remove it */
+  mpegts_base_remove_program (base, program->program_number);
+}
+
+static gboolean
+gst_mpegts_base_handle_eos (MpegTSBase * base)
+{
+  g_hash_table_foreach (base->programs, (GHFunc) remove_each_program, base);
+  /* finally remove  */
+  return TRUE;
+}
 
 static gboolean
 mpegts_base_sink_event (GstPad * pad, GstEvent * event)
@@ -1166,6 +1182,9 @@ mpegts_base_sink_event (GstPad * pad, GstEvent * event)
       gst_event_unref (event);
     }
       break;
+    case GST_EVENT_EOS:
+      res = gst_mpegts_base_handle_eos (base);
+      break;
     case GST_EVENT_FLUSH_START:
       gst_segment_init (&base->segment, GST_FORMAT_UNDEFINED);
       mpegts_packetizer_flush (base->packetizer);

From 5572e638589a10fd91bc6beff96585c2bb65d379 Mon Sep 17 00:00:00 2001
From: Edward Hervey <edward.hervey@collabora.co.uk>
Date: Mon, 1 Aug 2011 18:48:03 +0200
Subject: [PATCH 139/158] hlsdemux: Send NEWSEGMENT events

Previously hlsdemux wasn't sending out any newsegment.
Here we push a GST_FORMAT_TIME newsegment, and whenever possible we
try to indicate the proper start time.

This allows downstream elements to relay the start/time values properly
to the sinks, allowing better stream switching.
---
 gst/hls/gsthlsdemux.c | 13 +++++++++++++
 gst/hls/gsthlsdemux.h |  2 ++
 2 files changed, 15 insertions(+)

diff --git a/gst/hls/gsthlsdemux.c b/gst/hls/gsthlsdemux.c
index eed9d82d09..773d24986a 100644
--- a/gst/hls/gsthlsdemux.c
+++ b/gst/hls/gsthlsdemux.c
@@ -242,6 +242,8 @@ gst_hls_demux_init (GstHLSDemux * demux, GstHLSDemuxClass * klass)
   g_static_rec_mutex_init (&demux->task_lock);
   demux->task = gst_task_create ((GstTaskFunction) gst_hls_demux_loop, demux);
   gst_task_set_lock (demux->task, &demux->task_lock);
+
+  demux->position = 0;
 }
 
 static void
@@ -379,6 +381,10 @@ gst_hls_demux_sink_event (GstPad * pad, GstEvent * event)
       gst_event_unref (event);
       return TRUE;
     }
+    case GST_EVENT_NEWSEGMENT:
+      /* Swallow newsegments, we'll push our own */
+      gst_event_unref (event);
+      return TRUE;
     default:
       break;
   }
@@ -615,8 +621,15 @@ gst_hls_demux_loop (GstHLSDemux * demux)
   if (G_UNLIKELY (!demux->srcpad
           || GST_BUFFER_CAPS (buf) != GST_PAD_CAPS (demux->srcpad))) {
     switch_pads (demux, GST_BUFFER_CAPS (buf));
+    /* And send a newsegment */
+    gst_pad_push_event (demux->srcpad,
+        gst_event_new_new_segment (0, 1.0, GST_FORMAT_TIME, demux->position,
+            GST_CLOCK_TIME_NONE, demux->position));
   }
 
+  if (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_DURATION (buf)))
+    demux->position += GST_BUFFER_DURATION (buf);
+
   ret = gst_pad_push (demux->srcpad, buf);
   if (ret != GST_FLOW_OK)
     goto error;
diff --git a/gst/hls/gsthlsdemux.h b/gst/hls/gsthlsdemux.h
index 5113b76df3..67574675d3 100644
--- a/gst/hls/gsthlsdemux.h
+++ b/gst/hls/gsthlsdemux.h
@@ -87,6 +87,8 @@ struct _GstHLSDemux
   gboolean cancelled;
   GstAdapter *download;
 
+  /* Position in the stream */
+  GstClockTime position;
 };
 
 struct _GstHLSDemuxClass

From 5c77682dabf2a289d7e8cdced379f85aeb0f3192 Mon Sep 17 00:00:00 2001
From: Edward Hervey <edward.hervey@collabora.co.uk>
Date: Mon, 1 Aug 2011 18:49:55 +0200
Subject: [PATCH 140/158] tsdemux: Take into account upstream newsegment events

If the incoming newsegment event was in time, use that position value
for the downstream newsegments.
---
 gst/mpegtsdemux/tsdemux.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gst/mpegtsdemux/tsdemux.c b/gst/mpegtsdemux/tsdemux.c
index fc0df389fb..e859ea9c6f 100644
--- a/gst/mpegtsdemux/tsdemux.c
+++ b/gst/mpegtsdemux/tsdemux.c
@@ -2066,6 +2066,19 @@ calculate_and_push_newsegment (GstTSDemux * demux, TSDemuxStream * stream)
     /* FIXME : We're just ignore the upstream format for the time being */
     /* FIXME : We should use base->segment.format and a upstream latency query
      * to decide if we need to use live values or not */
+    GST_DEBUG ("push-based. base Segment start:%" GST_TIME_FORMAT " duration:%"
+        GST_TIME_FORMAT ", time:%" GST_TIME_FORMAT,
+        GST_TIME_ARGS (base->segment.start),
+        GST_TIME_ARGS (base->segment.duration),
+        GST_TIME_ARGS (base->segment.time));
+    GST_DEBUG ("push-based. demux Segment start:%" GST_TIME_FORMAT " duration:%"
+        GST_TIME_FORMAT ", time:%" GST_TIME_FORMAT,
+        GST_TIME_ARGS (demux->segment.start),
+        GST_TIME_ARGS (demux->segment.duration),
+        GST_TIME_ARGS (demux->segment.time));
+
+    if (demux->segment.time == 0 && base->segment.format == GST_FORMAT_TIME)
+      demux->segment.time = base->segment.time;
 
     start = firstpts;
     stop = GST_CLOCK_TIME_NONE;

From afee3b0301567247a196ee3fa4c1f48ce2c738bc Mon Sep 17 00:00:00 2001
From: Robert Swain <robert.swain@collabora.co.uk>
Date: Wed, 29 Jun 2011 15:18:47 +0200
Subject: [PATCH 141/158] camerabin2: Remove redundant elements

Since camerabin2 has switched to encodebin and encodebin has its own
queues and conversion elements, those preceding encodebin are no longer
necessary and as such can be removed.
---
 gst/camerabin2/gstcamerabin2.c | 76 ++++++++++++++--------------------
 gst/camerabin2/gstcamerabin2.h |  3 --
 2 files changed, 30 insertions(+), 49 deletions(-)

diff --git a/gst/camerabin2/gstcamerabin2.c b/gst/camerabin2/gstcamerabin2.c
index 555156529f..ed79b62837 100644
--- a/gst/camerabin2/gstcamerabin2.c
+++ b/gst/camerabin2/gstcamerabin2.c
@@ -245,13 +245,9 @@ gst_camera_bin_start_capture (GstCameraBin2 * camerabin)
     if (camerabin->audio_src) {
       gst_element_set_state (camerabin->audio_src, GST_STATE_READY);
       /* need to reset eos status (pads could be flushing) */
-      gst_element_set_state (camerabin->audio_queue, GST_STATE_READY);
-      gst_element_set_state (camerabin->audio_convert, GST_STATE_READY);
       gst_element_set_state (camerabin->audio_capsfilter, GST_STATE_READY);
       gst_element_set_state (camerabin->audio_volume, GST_STATE_READY);
 
-      gst_element_sync_state_with_parent (camerabin->audio_queue);
-      gst_element_sync_state_with_parent (camerabin->audio_convert);
       gst_element_sync_state_with_parent (camerabin->audio_capsfilter);
       gst_element_sync_state_with_parent (camerabin->audio_volume);
     }
@@ -341,7 +337,6 @@ gst_camera_bin_src_notify_readyforcapture (GObject * obj, GParamSpec * pspec,
       gst_element_set_state (camera->videosink, GST_STATE_NULL);
       gst_element_set_state (camera->video_encodebin, GST_STATE_NULL);
       gst_element_set_state (camera->videobin_capsfilter, GST_STATE_NULL);
-      gst_element_set_state (camera->videobin_queue, GST_STATE_NULL);
       location = g_strdup_printf (camera->location, camera->capture_index++);
       GST_DEBUG_OBJECT (camera, "Switching videobin location to %s", location);
       g_object_set (camera->videosink, "location", location, NULL);
@@ -349,7 +344,6 @@ gst_camera_bin_src_notify_readyforcapture (GObject * obj, GParamSpec * pspec,
       gst_element_set_state (camera->videosink, GST_STATE_PLAYING);
       gst_element_set_state (camera->video_encodebin, GST_STATE_PLAYING);
       gst_element_set_state (camera->videobin_capsfilter, GST_STATE_PLAYING);
-      gst_element_set_state (camera->videobin_queue, GST_STATE_PLAYING);
     }
 
   }
@@ -377,10 +371,6 @@ gst_camera_bin_dispose (GObject * object)
 
   if (camerabin->audio_capsfilter)
     gst_object_unref (camerabin->audio_capsfilter);
-  if (camerabin->audio_queue)
-    gst_object_unref (camerabin->audio_queue);
-  if (camerabin->audio_convert)
-    gst_object_unref (camerabin->audio_convert);
   if (camerabin->audio_volume)
     gst_object_unref (camerabin->audio_volume);
 
@@ -399,8 +389,6 @@ gst_camera_bin_dispose (GObject * object)
     gst_object_unref (camerabin->videosink);
   if (camerabin->video_encodebin)
     gst_object_unref (camerabin->video_encodebin);
-  if (camerabin->videobin_queue)
-    gst_object_unref (camerabin->videobin_queue);
   if (camerabin->videobin_capsfilter)
     gst_object_unref (camerabin->videobin_capsfilter);
 
@@ -798,7 +786,8 @@ gst_camera_bin_handle_message (GstBin * bin, GstMessage * message)
 static void
 gst_camera_bin_check_and_replace_filter (GstCameraBin2 * camera,
     GstElement ** current_filter, GstElement * new_filter,
-    GstElement * previous_element, GstElement * next_element)
+    GstElement * previous_element, GstElement * next_element,
+    const gchar * prev_elem_pad)
 {
   if (*current_filter == new_filter) {
     GST_DEBUG_OBJECT (camera, "Current filter is the same as the previous, "
@@ -822,9 +811,21 @@ gst_camera_bin_check_and_replace_filter (GstCameraBin2 * camera,
   if (new_filter) {
     *current_filter = gst_object_ref (new_filter);
     gst_bin_add (GST_BIN_CAST (camera), gst_object_ref (new_filter));
-    gst_element_link_many (previous_element, new_filter, next_element, NULL);
+  }
+
+  if (prev_elem_pad) {
+    if (new_filter) {
+      gst_element_link_pads (previous_element, prev_elem_pad, new_filter, NULL);
+      gst_element_link (new_filter, next_element);
+    } else {
+      gst_element_link_pads (previous_element, prev_elem_pad, next_element,
+          NULL);
+    }
   } else {
-    gst_element_link (previous_element, next_element);
+    if (new_filter)
+      gst_element_link_many (previous_element, new_filter, next_element, NULL);
+    else
+      gst_element_link (previous_element, next_element);
   }
 }
 
@@ -1081,13 +1082,6 @@ gst_camera_bin_create_elements (GstCameraBin2 * camera)
     g_object_set (camera->videosink, "async", FALSE, NULL);
 
     /* audio elements */
-    camera->audio_queue = gst_element_factory_make ("queue", "audio-queue");
-    camera->audio_convert = gst_element_factory_make ("audioconvert",
-        "audio-convert");
-    if (!camera->audio_convert) {
-      missing_element_name = "audioconvert";
-      goto missing_element;
-    }
     if (!camera->audio_volume) {
       missing_element_name = "volume";
       goto missing_element;
@@ -1160,8 +1154,6 @@ gst_camera_bin_create_elements (GstCameraBin2 * camera)
       camera->image_profile_switch = TRUE;
     }
 
-    camera->videobin_queue =
-        gst_element_factory_make ("queue", "videobin-queue");
     camera->imagebin_queue =
         gst_element_factory_make ("queue", "imagebin-queue");
     camera->viewfinderbin_queue =
@@ -1171,20 +1163,16 @@ gst_camera_bin_create_elements (GstCameraBin2 * camera)
         NULL);
     g_object_set (camera->imagebin_queue, "max-size-time", (guint64) 0,
         "silent", TRUE, NULL);
-    g_object_set (camera->videobin_queue, "silent", TRUE, NULL);
 
     gst_bin_add_many (GST_BIN_CAST (camera),
         gst_object_ref (camera->video_encodebin),
         gst_object_ref (camera->videosink),
         gst_object_ref (camera->image_encodebin),
         gst_object_ref (camera->imagesink),
-        gst_object_ref (camera->videobin_queue),
         gst_object_ref (camera->imagebin_queue),
         gst_object_ref (camera->viewfinderbin_queue), NULL);
 
     /* Linking can be optimized TODO */
-    gst_element_link_many (camera->videobin_queue, camera->videobin_capsfilter,
-        NULL);
     gst_element_link (camera->video_encodebin, camera->videosink);
 
     gst_element_link_many (camera->imagebin_queue, camera->imagebin_capsfilter,
@@ -1297,8 +1285,12 @@ gst_camera_bin_create_elements (GstCameraBin2 * camera)
         "sink");
     gst_element_link_pads (camera->src, "imgsrc", camera->imagebin_queue,
         "sink");
-    gst_element_link_pads (camera->src, "vidsrc", camera->videobin_queue,
-        "sink");
+    if (!gst_element_link_pads (camera->src, "vidsrc",
+            camera->videobin_capsfilter, "sink")) {
+      GST_ERROR_OBJECT (camera,
+          "Failed to link camera source's vidsrc pad to video bin capsfilter");
+      goto fail;
+    }
 
     gst_pad_add_buffer_probe (imgsrc,
         (GCallback) gst_camera_bin_image_src_buffer_probe, camera);
@@ -1307,13 +1299,13 @@ gst_camera_bin_create_elements (GstCameraBin2 * camera)
 
   gst_camera_bin_check_and_replace_filter (camera, &camera->image_filter,
       camera->user_image_filter, camera->imagebin_queue,
-      camera->imagebin_capsfilter);
+      camera->imagebin_capsfilter, NULL);
   gst_camera_bin_check_and_replace_filter (camera, &camera->video_filter,
-      camera->user_video_filter, camera->videobin_queue,
-      camera->videobin_capsfilter);
+      camera->user_video_filter, camera->src, camera->videobin_capsfilter,
+      "vidsrc");
   gst_camera_bin_check_and_replace_filter (camera, &camera->viewfinder_filter,
       camera->user_viewfinder_filter, camera->viewfinderbin_queue,
-      camera->viewfinderbin_capsfilter);
+      camera->viewfinderbin_capsfilter, NULL);
 
   /* check if we need to replace the camera audio src */
   has_audio = gst_camera_bin_video_profile_has_audio (camera);
@@ -1321,10 +1313,8 @@ gst_camera_bin_create_elements (GstCameraBin2 * camera)
     if ((camera->user_audio_src && camera->user_audio_src != camera->audio_src)
         || !has_audio) {
       gst_bin_remove (GST_BIN_CAST (camera), camera->audio_src);
-      gst_bin_remove (GST_BIN_CAST (camera), camera->audio_queue);
       gst_bin_remove (GST_BIN_CAST (camera), camera->audio_volume);
       gst_bin_remove (GST_BIN_CAST (camera), camera->audio_capsfilter);
-      gst_bin_remove (GST_BIN_CAST (camera), camera->audio_convert);
       gst_object_unref (camera->audio_src);
       camera->audio_src = NULL;
     }
@@ -1344,20 +1334,18 @@ gst_camera_bin_create_elements (GstCameraBin2 * camera)
 
   if (new_audio_src) {
     gst_bin_add (GST_BIN_CAST (camera), gst_object_ref (camera->audio_src));
-    gst_bin_add (GST_BIN_CAST (camera), gst_object_ref (camera->audio_queue));
     gst_bin_add (GST_BIN_CAST (camera), gst_object_ref (camera->audio_volume));
     gst_bin_add (GST_BIN_CAST (camera),
         gst_object_ref (camera->audio_capsfilter));
-    gst_bin_add (GST_BIN_CAST (camera), gst_object_ref (camera->audio_convert));
 
-    gst_element_link_many (camera->audio_src, camera->audio_queue,
-        camera->audio_volume,
-        camera->audio_capsfilter, camera->audio_convert, NULL);
+    gst_element_link_many (camera->audio_src, camera->audio_volume,
+        camera->audio_capsfilter, NULL);
   }
 
   if ((profile_switched && has_audio) || new_audio_src) {
     if (GST_PAD_LINK_FAILED (gst_camera_bin_link_encodebin (camera,
-                camera->video_encodebin, camera->audio_convert, AUDIO_PAD))) {
+                camera->video_encodebin, camera->audio_capsfilter,
+                AUDIO_PAD))) {
       goto fail;
     }
   }
@@ -1423,20 +1411,16 @@ gst_camera_bin_change_state (GstElement * element, GstStateChange trans)
       camera->image_location_list = NULL;
 
       /* explicitly set to READY as they might be outside of the bin */
-      gst_element_set_state (camera->audio_queue, GST_STATE_READY);
       gst_element_set_state (camera->audio_volume, GST_STATE_READY);
       gst_element_set_state (camera->audio_capsfilter, GST_STATE_READY);
-      gst_element_set_state (camera->audio_convert, GST_STATE_READY);
       break;
     case GST_STATE_CHANGE_READY_TO_NULL:
       if (camera->audio_src)
         gst_element_set_state (camera->audio_src, GST_STATE_NULL);
 
       /* explicitly set to NULL as they might be outside of the bin */
-      gst_element_set_state (camera->audio_queue, GST_STATE_NULL);
       gst_element_set_state (camera->audio_volume, GST_STATE_NULL);
       gst_element_set_state (camera->audio_capsfilter, GST_STATE_NULL);
-      gst_element_set_state (camera->audio_convert, GST_STATE_NULL);
 
       break;
     default:
diff --git a/gst/camerabin2/gstcamerabin2.h b/gst/camerabin2/gstcamerabin2.h
index 8ab108ac2c..1dc9c00986 100644
--- a/gst/camerabin2/gstcamerabin2.h
+++ b/gst/camerabin2/gstcamerabin2.h
@@ -45,7 +45,6 @@ struct _GstCameraBin2
   GstElement *video_encodebin;
   gulong video_encodebin_signal_id;
   GstElement *videosink;
-  GstElement *videobin_queue;
   GstElement *videobin_capsfilter;
 
   GstElement *viewfinderbin;
@@ -67,10 +66,8 @@ struct _GstCameraBin2
 
   GstElement *audio_src;
   GstElement *user_audio_src;
-  GstElement *audio_queue;
   GstElement *audio_volume;
   GstElement *audio_capsfilter;
-  GstElement *audio_convert;
 
   gint processing_counter; /* atomic int */
 

From dae8d8fd5ac03ee1a295b74297cb5f0522091e49 Mon Sep 17 00:00:00 2001
From: Robert Swain <robert.swain@collabora.co.uk>
Date: Wed, 29 Jun 2011 15:35:42 +0200
Subject: [PATCH 142/158] camerabin2: Prepare audiosrc before start-capture

If we bring the audio source up to the PAUSED state before emitting the
start-capture signal to the camera source, when subequently taking the
audio source to the PLAYING state, it will begin capture more quickly.
---
 gst/camerabin2/gstcamerabin2.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gst/camerabin2/gstcamerabin2.c b/gst/camerabin2/gstcamerabin2.c
index ed79b62837..abdd35386d 100644
--- a/gst/camerabin2/gstcamerabin2.c
+++ b/gst/camerabin2/gstcamerabin2.c
@@ -250,6 +250,7 @@ gst_camera_bin_start_capture (GstCameraBin2 * camerabin)
 
       gst_element_sync_state_with_parent (camerabin->audio_capsfilter);
       gst_element_sync_state_with_parent (camerabin->audio_volume);
+      gst_element_set_state (camerabin->audio_src, GST_STATE_PAUSED);
     }
   } else {
     gchar *location = NULL;

From 2609427ada306d6cc9ce9b96b91d4d5406d5c81c Mon Sep 17 00:00:00 2001
From: Robert Swain <robert.swain@collabora.co.uk>
Date: Thu, 30 Jun 2011 11:09:44 +0200
Subject: [PATCH 143/158] camerabin2: Add flags prop to toggle encodebin
 conversion elements

A flags property has been added to encodebin to toggle whether the
conversion elements (ffmpegcolorspace, videoscale, audioconvert,
audioresample, audiorate) are created and linked into the appropriate
branches of encodebin.

Not including these elements avoids some slow caps negotiation and
allows the first buffers to flow through encodebin much more quickly.
However, it imposes that the uncompressed input is appropriate for the
target profile and elements selected to meet that profile.
---
 gst/camerabin2/gstcamerabin2.c                | 55 ++++++++++++++++++-
 gst/camerabin2/gstcamerabin2.h                | 10 ++++
 .../examples/camerabin2/gst-camerabin2-test.c |  5 ++
 3 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/gst/camerabin2/gstcamerabin2.c b/gst/camerabin2/gstcamerabin2.c
index abdd35386d..b444fb28e6 100644
--- a/gst/camerabin2/gstcamerabin2.c
+++ b/gst/camerabin2/gstcamerabin2.c
@@ -124,7 +124,8 @@ enum
   PROP_ZOOM,
   PROP_MAX_ZOOM,
   PROP_IMAGE_ENCODING_PROFILE,
-  PROP_IDLE
+  PROP_IDLE,
+  PROP_FLAGS
 };
 
 enum
@@ -142,6 +143,7 @@ static guint camerabin_signals[LAST_SIGNAL];
 #define DEFAULT_POST_PREVIEWS TRUE
 #define DEFAULT_MUTE_AUDIO FALSE
 #define DEFAULT_IDLE TRUE
+#define DEFAULT_FLAGS 0
 
 #define DEFAULT_AUDIO_SRC "autoaudiosrc"
 
@@ -161,6 +163,31 @@ static void gst_camera_bin_handle_message (GstBin * bin, GstMessage * message);
 static gboolean gst_camera_bin_send_event (GstElement * element,
     GstEvent * event);
 
+#define C_FLAGS(v) ((guint) v)
+#define GST_TYPE_CAM_FLAGS (gst_cam_flags_get_type())
+static GType
+gst_cam_flags_get_type (void)
+{
+  static const GFlagsValue values[] = {
+    {C_FLAGS (GST_CAM_FLAG_NO_AUDIO_CONVERSION), "Do not use audio conversion "
+        "elements", "no-audio-conversion"},
+    {C_FLAGS (GST_CAM_FLAG_NO_VIDEO_CONVERSION), "Do not use video conversion "
+        "elements", "no-video-conversion"},
+    {0, NULL, NULL}
+  };
+  static volatile GType id = 0;
+
+  if (g_once_init_enter ((gsize *) & id)) {
+    GType _id;
+
+    _id = g_flags_register_static ("GstCamFlags", values);
+
+    g_once_init_leave ((gsize *) & id, _id);
+  }
+
+  return id;
+}
+
 GType
 gst_camera_bin2_get_type (void)
 {
@@ -658,6 +685,16 @@ gst_camera_bin_class_init (GstCameraBin2Class * klass)
           "The caps that the camera source can produce on the viewfinder pad",
           GST_TYPE_CAPS, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
+   /**
+    * GstCameraBin:flags
+    *
+    * Control the behaviour of encodebin.
+    */
+  g_object_class_install_property (object_class, PROP_FLAGS,
+      g_param_spec_flags ("flags", "Flags", "Flags to control behaviour",
+          GST_TYPE_CAM_FLAGS, DEFAULT_FLAGS,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
   /**
    * GstCameraBin2::capture-start:
    * @camera: the camera bin element
@@ -692,6 +729,7 @@ gst_camera_bin_init (GstCameraBin2 * camera)
   camera->viewfinderbin = gst_element_factory_make ("viewfinderbin", "vf-bin");
   camera->zoom = DEFAULT_ZOOM;
   camera->max_zoom = MAX_ZOOM;
+  camera->flags = DEFAULT_FLAGS;
 
   /* capsfilters are created here as we proxy their caps properties and
    * this way we avoid having to store the caps while on NULL state to 
@@ -1064,6 +1102,7 @@ gst_camera_bin_create_elements (GstCameraBin2 * camera)
   gboolean has_audio;
   gboolean profile_switched = FALSE;
   const gchar *missing_element_name;
+  gint encbin_flags = 0;
 
   if (!camera->elements_created) {
     /* TODO check that elements created in _init were really created */
@@ -1078,6 +1117,14 @@ gst_camera_bin_create_elements (GstCameraBin2 * camera)
         g_signal_connect (camera->video_encodebin, "element-added",
         (GCallback) encodebin_element_added, camera);
 
+    /* propagate the flags property by translating appropriate values
+     * to GstEncFlags values */
+    if (camera->flags & GST_CAM_FLAG_NO_AUDIO_CONVERSION)
+      encbin_flags |= (1 << 0);
+    if (camera->flags & GST_CAM_FLAG_NO_VIDEO_CONVERSION)
+      encbin_flags |= (1 << 1);
+    g_object_set (camera->video_encodebin, "flags", encbin_flags, NULL);
+
     camera->videosink =
         gst_element_factory_make ("filesink", "videobin-filesink");
     g_object_set (camera->videosink, "async", FALSE, NULL);
@@ -1677,6 +1724,9 @@ gst_camera_bin_set_property (GObject * object, guint prop_id,
           (GstEncodingProfile *) gst_value_dup_mini_object (value);
       camera->image_profile_switch = TRUE;
       break;
+    case PROP_FLAGS:
+      camera->flags = g_value_get_flags (value);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -1835,6 +1885,9 @@ gst_camera_bin_get_property (GObject * object, guint prop_id,
       g_value_set_boolean (value,
           g_atomic_int_get (&camera->processing_counter) == 0);
       break;
+    case PROP_FLAGS:
+      g_value_set_flags (value, camera->flags);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
diff --git a/gst/camerabin2/gstcamerabin2.h b/gst/camerabin2/gstcamerabin2.h
index 1dc9c00986..d5a37f034e 100644
--- a/gst/camerabin2/gstcamerabin2.h
+++ b/gst/camerabin2/gstcamerabin2.h
@@ -31,6 +31,15 @@ G_BEGIN_DECLS
 #define GST_IS_CAMERA_BIN2(obj)   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_CAMERA_BIN2))
 #define GST_IS_CAMERA_BIN2_CLASS(obj)   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_CAMERA_BIN2))
 
+typedef enum
+{
+  /* matches GstEncFlags GST_ENC_FLAG_NO_AUDIO_CONVERSION in encodebin */
+  GST_CAM_FLAG_NO_AUDIO_CONVERSION = (1 << 0),
+  /* matches GstEncFlags GST_ENC_FLAG_NO_VIDEO_CONVERSION in encodebin */
+  GST_CAM_FLAG_NO_VIDEO_CONVERSION = (1 << 1)
+} GstCamFlags;
+
+
 typedef struct _GstCameraBin2 GstCameraBin2;
 typedef struct _GstCameraBin2Class GstCameraBin2Class;
 
@@ -92,6 +101,7 @@ struct _GstCameraBin2
   GstEncodingProfile *image_profile;
   gfloat zoom;
   gfloat max_zoom;
+  GstCamFlags flags;
 
   gboolean elements_created;
 };
diff --git a/tests/examples/camerabin2/gst-camerabin2-test.c b/tests/examples/camerabin2/gst-camerabin2-test.c
index abeeb9d022..4e74927645 100644
--- a/tests/examples/camerabin2/gst-camerabin2-test.c
+++ b/tests/examples/camerabin2/gst-camerabin2-test.c
@@ -217,6 +217,7 @@ static gchar *viewfinder_caps_str = NULL;
 static gchar *video_capture_caps_str = NULL;
 static gboolean performance_measure = FALSE;
 static gchar *performance_targets_str = NULL;
+static gchar *camerabin2_flags = NULL;
 
 
 #define MODE_VIDEO 2
@@ -676,6 +677,8 @@ setup_pipeline (void)
 
   GST_INFO_OBJECT (camerabin, "camerabin2 created");
 
+  gst_util_set_object_arg (camerabin, "flags", camerabin2_flags);
+
   if (videosrc_name) {
     GstElement *wrapper;
     GstElement *videosrc;
@@ -1234,6 +1237,8 @@ main (int argc, char *argv[])
           ", shot to snapshot, shot to shot, preview to shot, shot to buffer. "
           "e.g. 3.5,1.0,5.0,2.5,5.0,1.5,1.0",
         NULL},
+    {"flags", '\0', 0, G_OPTION_ARG_STRING, &camerabin2_flags,
+        "camerabin2 element flags (default = 0)", NULL},
     {NULL}
   };
 

From 7f720ed606fcd48db2c1d6116a8d92b3c2c291ac Mon Sep 17 00:00:00 2001
From: Robert Swain <robert.swain@collabora.co.uk>
Date: Thu, 28 Jul 2011 12:56:12 -0300
Subject: [PATCH 144/158] camerabin2: Prevent audio source from providing clock

The audio source inside camerabin2 is put to READY and back to
PLAYING when starting capture, causing the pipeline to lose its
clock. As camerabin2 isn't put to PAUSED->PLAYING again during
this, a new clock isn't selected for elements.
---
 gst/camerabin2/gstcamerabin2.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gst/camerabin2/gstcamerabin2.c b/gst/camerabin2/gstcamerabin2.c
index b444fb28e6..8d56efb6af 100644
--- a/gst/camerabin2/gstcamerabin2.c
+++ b/gst/camerabin2/gstcamerabin2.c
@@ -170,9 +170,9 @@ gst_cam_flags_get_type (void)
 {
   static const GFlagsValue values[] = {
     {C_FLAGS (GST_CAM_FLAG_NO_AUDIO_CONVERSION), "Do not use audio conversion "
-        "elements", "no-audio-conversion"},
+          "elements", "no-audio-conversion"},
     {C_FLAGS (GST_CAM_FLAG_NO_VIDEO_CONVERSION), "Do not use video conversion "
-        "elements", "no-video-conversion"},
+          "elements", "no-video-conversion"},
     {0, NULL, NULL}
   };
   static volatile GType id = 0;
@@ -1381,6 +1381,10 @@ gst_camera_bin_create_elements (GstCameraBin2 * camera)
   }
 
   if (new_audio_src) {
+    if (g_object_class_find_property (G_OBJECT_GET_CLASS (camera->audio_src),
+            "provide-clock")) {
+      g_object_set (camera->audio_src, "provide-clock", FALSE, NULL);
+    }
     gst_bin_add (GST_BIN_CAST (camera), gst_object_ref (camera->audio_src));
     gst_bin_add (GST_BIN_CAST (camera), gst_object_ref (camera->audio_volume));
     gst_bin_add (GST_BIN_CAST (camera),

From 7e069060b3699429bac1134bf053e8b8dc462090 Mon Sep 17 00:00:00 2001
From: Teemu Katajisto <teemu.katajisto@digia.com>
Date: Thu, 28 Jul 2011 13:18:57 -0300
Subject: [PATCH 145/158] camerabin2: Synchronize clock and base time to
 audiosrc

When audio source goes to READY it loses its clock and base time,
this patch sets them back after bringing the audio source back to PAUSED.
---
 gst/camerabin2/gstcamerabin2.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gst/camerabin2/gstcamerabin2.c b/gst/camerabin2/gstcamerabin2.c
index 8d56efb6af..522d974aa6 100644
--- a/gst/camerabin2/gstcamerabin2.c
+++ b/gst/camerabin2/gstcamerabin2.c
@@ -270,6 +270,8 @@ gst_camera_bin_start_capture (GstCameraBin2 * camerabin)
 
   if (camerabin->mode == MODE_VIDEO) {
     if (camerabin->audio_src) {
+      GstClock *clock = gst_pipeline_get_clock (GST_PIPELINE_CAST (camerabin));
+
       gst_element_set_state (camerabin->audio_src, GST_STATE_READY);
       /* need to reset eos status (pads could be flushing) */
       gst_element_set_state (camerabin->audio_capsfilter, GST_STATE_READY);
@@ -278,6 +280,13 @@ gst_camera_bin_start_capture (GstCameraBin2 * camerabin)
       gst_element_sync_state_with_parent (camerabin->audio_capsfilter);
       gst_element_sync_state_with_parent (camerabin->audio_volume);
       gst_element_set_state (camerabin->audio_src, GST_STATE_PAUSED);
+
+      gst_element_set_base_time (camerabin->audio_src,
+          gst_element_get_base_time (GST_ELEMENT_CAST (camerabin)));
+      if (clock) {
+        gst_element_set_clock (camerabin->audio_src, clock);
+        gst_object_unref (clock);
+      }
     }
   } else {
     gchar *location = NULL;

From c189ba34964218fa9475cd35c0166f6b0fe6b7d8 Mon Sep 17 00:00:00 2001
From: Raluca Elena Podiuc <ralucaelena1985@gmail.com>
Date: Tue, 26 Jul 2011 03:04:47 +0300
Subject: [PATCH 146/158] basecamerabinsrc: preview: remove unused new_preroll
 callback

---
 gst-libs/gst/basecamerabinsrc/gstcamerabinpreview.c | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/gst-libs/gst/basecamerabinsrc/gstcamerabinpreview.c b/gst-libs/gst/basecamerabinsrc/gstcamerabinpreview.c
index 2c3bee582f..6b854197dd 100644
--- a/gst-libs/gst/basecamerabinsrc/gstcamerabinpreview.c
+++ b/gst-libs/gst/basecamerabinsrc/gstcamerabinpreview.c
@@ -75,18 +75,6 @@ bus_callback (GstBus * bus, GstMessage * message, gpointer user_data)
   return TRUE;
 }
 
-static GstFlowReturn
-gst_camerabin_preview_pipeline_new_preroll (GstAppSink * appsink,
-    gpointer user_data)
-{
-  GstBuffer *buffer;
-
-  buffer = gst_app_sink_pull_preroll (appsink);
-  gst_buffer_unref (buffer);
-
-  return GST_FLOW_OK;
-}
-
 static GstFlowReturn
 gst_camerabin_preview_pipeline_new_buffer (GstAppSink * appsink,
     gpointer user_data)
@@ -175,7 +163,6 @@ gst_camerabin_create_preview_pipeline (GstElement * element,
       goto error;
   }
 
-  callbacks.new_preroll = gst_camerabin_preview_pipeline_new_preroll;
   callbacks.new_buffer = gst_camerabin_preview_pipeline_new_buffer;
   gst_app_sink_set_callbacks ((GstAppSink *) data->appsink, &callbacks, data,
       NULL);

From 5aa37ebdc8f84356095765d06be9d714b0a6f682 Mon Sep 17 00:00:00 2001
From: Raluca Elena Podiuc <ralucaelena1985@gmail.com>
Date: Tue, 26 Jul 2011 04:42:49 +0300
Subject: [PATCH 147/158] basecamerasrc: document callbacks

Note for each callback:
- when it is called,
- whether it is mandatory or optional.
---
 .../gst/basecamerabinsrc/gstbasecamerasrc.h     | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.h b/gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.h
index 1c412e493f..f88daf0403 100644
--- a/gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.h
+++ b/gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.h
@@ -92,7 +92,7 @@ struct _GstBaseCameraSrc
 
 /**
  * GstBaseCameraSrcClass:
- * @construct_pipeline: construct pipeline must be implemented by derived class
+ * @construct_pipeline: construct pipeline
  * @setup_pipeline: configure pipeline for the chosen settings
  * @set_zoom: set the zoom
  * @set_mode: set the mode
@@ -101,29 +101,32 @@ struct _GstBaseCameraSrcClass
 {
   GstBinClass parent;
 
-  /* construct pipeline must be implemented by derived class */
+  /* Construct pipeline. (called in GST_STATE_CHANGE_NULL_TO_READY) Optional. */
   gboolean    (*construct_pipeline)  (GstBaseCameraSrc *self);
 
-  /* optional */
+  /* (called in GST_STATE_CHANGE_READY_TO_PAUSED). Optional. */
   gboolean    (*setup_pipeline)      (GstBaseCameraSrc *self);
 
-  /* set the zoom */
+  /* Set the zoom. If set, called when changing 'zoom' property. Optional. */
   void        (*set_zoom)            (GstBaseCameraSrc *self, gfloat zoom);
 
-  /* set the mode */
+  /* Set the mode. If set, called when changing 'mode' property. Optional. */
   gboolean    (*set_mode)            (GstBaseCameraSrc *self,
                                       GstCameraBinMode mode);
 
-  /* set preview caps */
+  /* Set preview caps. If set, called called when setting new 'preview-caps'. Optional. */
   gboolean    (*set_preview)         (GstBaseCameraSrc *self,
                                       GstCaps *preview_caps);
 
-  /* */
+  /* unused */
   GstCaps *   (*get_allowed_input_caps) (GstBaseCameraSrc * self);
 
   void (*private_start_capture) (GstBaseCameraSrc * src);
   void (*private_stop_capture) (GstBaseCameraSrc * src);
+  /* Called by the handler for 'start-capture'. Mandatory. */
   gboolean (*start_capture) (GstBaseCameraSrc * src);
+
+  /* Called by the handler for 'stop-capture'. Mandatory. */
   void (*stop_capture) (GstBaseCameraSrc * src);
 
   gpointer _gst_reserved[GST_PADDING_LARGE];

From 2d17cd33507c20d55cb40b20a53f7414c8f489fc Mon Sep 17 00:00:00 2001
From: Raluca Elena Podiuc <ralucaelena1985@gmail.com>
Date: Tue, 26 Jul 2011 05:43:34 +0300
Subject: [PATCH 148/158] basecamerasrc: document why we set preview to PLAYING

---
 gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.c b/gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.c
index b2ae99298d..c113f3481d 100644
--- a/gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.c
+++ b/gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.c
@@ -476,6 +476,8 @@ gst_base_camera_src_change_state (GstElement * element,
     case GST_STATE_CHANGE_READY_TO_PAUSED:
       if (!setup_pipeline (self))
         return GST_STATE_CHANGE_FAILURE;
+      /* without this the preview pipeline will not post buffer
+       * messages on the pipeline */
       gst_element_set_state (self->preview_pipeline->pipeline,
           GST_STATE_PLAYING);
       break;

From 28df77b7b0b64a3c2d94edafcb186539b33e601a Mon Sep 17 00:00:00 2001
From: Raluca Elena Podiuc <ralucaelena1985@gmail.com>
Date: Tue, 26 Jul 2011 05:59:09 +0300
Subject: [PATCH 149/158] basecamerasrc: don't use class offsets for
 start/stop-capture signal handlers

---
 gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.c | 15 ++++-----------
 gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.h |  2 --
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.c b/gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.c
index c113f3481d..26bdb85e9d 100644
--- a/gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.c
+++ b/gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.c
@@ -591,26 +591,19 @@ gst_base_camera_src_class_init (GstBaseCameraSrcClass * klass)
 
   /* Signals */
   basecamerasrc_signals[START_CAPTURE_SIGNAL] =
-      g_signal_new ("start-capture",
+      g_signal_new_class_handler ("start-capture",
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-      G_STRUCT_OFFSET (GstBaseCameraSrcClass, private_start_capture),
+      G_CALLBACK (gst_base_camera_src_start_capture),
       NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 
   basecamerasrc_signals[STOP_CAPTURE_SIGNAL] =
-      g_signal_new ("stop-capture",
+      g_signal_new_class_handler ("stop-capture",
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-      G_STRUCT_OFFSET (GstBaseCameraSrcClass, private_stop_capture),
+      G_CALLBACK (gst_base_camera_src_stop_capture),
       NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 
-  /* TODO these should be moved to a private struct
-   * that is allocated sequentially to the main struct as said at:
-   * http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#g-type-add-class-private
-   */
-  klass->private_start_capture = gst_base_camera_src_start_capture;
-  klass->private_stop_capture = gst_base_camera_src_stop_capture;
-
   gstelement_class->change_state = gst_base_camera_src_change_state;
 }
 
diff --git a/gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.h b/gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.h
index f88daf0403..2157bb4b90 100644
--- a/gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.h
+++ b/gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.h
@@ -121,8 +121,6 @@ struct _GstBaseCameraSrcClass
   /* unused */
   GstCaps *   (*get_allowed_input_caps) (GstBaseCameraSrc * self);
 
-  void (*private_start_capture) (GstBaseCameraSrc * src);
-  void (*private_stop_capture) (GstBaseCameraSrc * src);
   /* Called by the handler for 'start-capture'. Mandatory. */
   gboolean (*start_capture) (GstBaseCameraSrc * src);
 

From 058a3d9d4cc83d3ab348e51b109dc7e3d656732d Mon Sep 17 00:00:00 2001
From: Raluca Elena Podiuc <ralucaelena1985@gmail.com>
Date: Tue, 26 Jul 2011 06:04:41 +0300
Subject: [PATCH 150/158] basecamerasrc: remove unused get_allowed_input_caps

The use of this method was removed in:
    commit 539f10f4d99e1a074881289254d1d109159cf9e5
    basecamerasrc: More cleanup

The code from wrappercamerabinsrc is from v4l2camerasrc but is unused:
get_allowed_input_caps is not called anywhere.
---
 .../gst/basecamerabinsrc/gstbasecamerasrc.c   | 18 -----
 .../gst/basecamerabinsrc/gstbasecamerasrc.h   |  4 --
 gst/camerabin2/gstwrappercamerabinsrc.c       | 69 -------------------
 3 files changed, 91 deletions(-)

diff --git a/gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.c b/gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.c
index 26bdb85e9d..56bdc6cf68 100644
--- a/gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.c
+++ b/gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.c
@@ -222,24 +222,6 @@ gst_base_camera_src_setup_preview (GstBaseCameraSrc * self,
     bclass->set_preview (self, preview_caps);
 }
 
-/**
- * gst_base_camera_src_get_allowed_input_caps:
- * @self: the camerasrc bin
- *
- * Retrieve caps from videosrc describing formats it supports
- *
- * Returns: caps object from videosrc
- */
-GstCaps *
-gst_base_camera_src_get_allowed_input_caps (GstBaseCameraSrc * self)
-{
-  GstBaseCameraSrcClass *bclass = GST_BASE_CAMERA_SRC_GET_CLASS (self);
-
-  g_return_val_if_fail (bclass->get_allowed_input_caps, NULL);
-
-  return bclass->get_allowed_input_caps (self);
-}
-
 static void
 gst_base_camera_src_start_capture (GstBaseCameraSrc * src)
 {
diff --git a/gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.h b/gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.h
index 2157bb4b90..e5e19535ab 100644
--- a/gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.h
+++ b/gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.h
@@ -118,9 +118,6 @@ struct _GstBaseCameraSrcClass
   gboolean    (*set_preview)         (GstBaseCameraSrc *self,
                                       GstCaps *preview_caps);
 
-  /* unused */
-  GstCaps *   (*get_allowed_input_caps) (GstBaseCameraSrc * self);
-
   /* Called by the handler for 'start-capture'. Mandatory. */
   gboolean (*start_capture) (GstBaseCameraSrc * src);
 
@@ -141,7 +138,6 @@ GstColorBalance * gst_base_camera_src_get_color_balance (GstBaseCameraSrc *self)
 gboolean gst_base_camera_src_set_mode (GstBaseCameraSrc *self, GstCameraBinMode mode);
 void gst_base_camera_src_setup_zoom (GstBaseCameraSrc * self);
 void gst_base_camera_src_setup_preview (GstBaseCameraSrc * self, GstCaps * preview_caps);
-GstCaps * gst_base_camera_src_get_allowed_input_caps (GstBaseCameraSrc * self);
 void gst_base_camera_src_finish_capture (GstBaseCameraSrc *self);
 
 
diff --git a/gst/camerabin2/gstwrappercamerabinsrc.c b/gst/camerabin2/gstwrappercamerabinsrc.c
index 6a003a0b4e..d0c64688f6 100644
--- a/gst/camerabin2/gstwrappercamerabinsrc.c
+++ b/gst/camerabin2/gstwrappercamerabinsrc.c
@@ -854,73 +854,6 @@ gst_wrapper_camera_bin_src_set_zoom (GstBaseCameraSrc * bcamsrc, gfloat zoom)
   }
 }
 
-static GstCaps *
-gst_wrapper_camera_bin_src_get_allowed_input_caps (GstBaseCameraSrc * bcamsrc)
-{
-  GstWrapperCameraBinSrc *self = GST_WRAPPER_CAMERA_BIN_SRC (bcamsrc);
-  GstCaps *caps = NULL;
-  GstPad *pad = NULL, *peer_pad = NULL;
-  GstState state;
-  GstElement *videosrc;
-
-  videosrc = self->src_vid_src ? self->src_vid_src : self->app_vid_src;
-
-  if (!videosrc) {
-    GST_WARNING_OBJECT (self, "no videosrc, can't get allowed caps");
-    goto failed;
-  }
-
-  if (self->allowed_caps) {
-    GST_DEBUG_OBJECT (self, "returning cached caps");
-    goto done;
-  }
-
-  pad = gst_element_get_static_pad (videosrc, "src");
-
-  if (!pad) {
-    GST_WARNING_OBJECT (self, "no srcpad in videosrc");
-    goto failed;
-  }
-
-  state = GST_STATE (videosrc);
-
-  /* Make this function work also in NULL state */
-  if (state == GST_STATE_NULL) {
-    GST_DEBUG_OBJECT (self, "setting videosrc to ready temporarily");
-    peer_pad = gst_pad_get_peer (pad);
-    if (peer_pad) {
-      gst_pad_unlink (pad, peer_pad);
-    }
-    /* Set videosrc to READY to open video device */
-    gst_element_set_locked_state (videosrc, TRUE);
-    gst_element_set_state (videosrc, GST_STATE_READY);
-  }
-
-  self->allowed_caps = gst_pad_get_caps (pad);
-
-  /* Restore state and re-link if necessary */
-  if (state == GST_STATE_NULL) {
-    GST_DEBUG_OBJECT (self, "restoring videosrc state %d", state);
-    /* Reset videosrc to NULL state, some drivers seem to need this */
-    gst_element_set_state (videosrc, GST_STATE_NULL);
-    if (peer_pad) {
-      gst_pad_link (pad, peer_pad);
-      gst_object_unref (peer_pad);
-    }
-    gst_element_set_locked_state (videosrc, FALSE);
-  }
-
-  gst_object_unref (pad);
-
-done:
-  if (self->allowed_caps) {
-    caps = gst_caps_copy (self->allowed_caps);
-  }
-  GST_DEBUG_OBJECT (self, "allowed caps:%" GST_PTR_FORMAT, caps);
-failed:
-  return caps;
-}
-
 /**
  * update_aspect_filter:
  * @self: camerasrc object
@@ -1172,8 +1105,6 @@ gst_wrapper_camera_bin_src_class_init (GstWrapperCameraBinSrcClass * klass)
       gst_wrapper_camera_bin_src_construct_pipeline;
   gstbasecamerasrc_class->set_zoom = gst_wrapper_camera_bin_src_set_zoom;
   gstbasecamerasrc_class->set_mode = gst_wrapper_camera_bin_src_set_mode;
-  gstbasecamerasrc_class->get_allowed_input_caps =
-      gst_wrapper_camera_bin_src_get_allowed_input_caps;
   gstbasecamerasrc_class->start_capture =
       gst_wrapper_camera_bin_src_start_capture;
   gstbasecamerasrc_class->stop_capture =

From 2e28fe2e18f0ce4ab81aff009e2b1bc09e3b7109 Mon Sep 17 00:00:00 2001
From: Raluca Elena Podiuc <ralucaelena1985@gmail.com>
Date: Sat, 30 Jul 2011 16:12:31 +0300
Subject: [PATCH 151/158] camerabin2 remove redundant viewfinder-colorspace and
 viewfinder-scale

camrabin2 connects a viewfinderbin on "vfsrc". viewfinderbin is made of:
   vfbin-csp ! vfbin-videoscale ! videosink.

we should either remove csp/videoscale from wrappercamerabinsrc (as
done in this patch) or we should get rid of viewfinderbin altogether.
---
 gst/camerabin2/gstwrappercamerabinsrc.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/gst/camerabin2/gstwrappercamerabinsrc.c b/gst/camerabin2/gstwrappercamerabinsrc.c
index d0c64688f6..16aa34b945 100644
--- a/gst/camerabin2/gstwrappercamerabinsrc.c
+++ b/gst/camerabin2/gstwrappercamerabinsrc.c
@@ -395,7 +395,6 @@ gst_wrapper_camera_bin_src_construct_pipeline (GstBaseCameraSrc * bcamsrc)
   GstElement *src_csp;
   GstElement *capsfilter;
   gboolean ret = FALSE;
-  GstElement *videoscale;
   GstPad *vf_pad;
   GstPad *tee_capture_pad;
   GstPad *src_caps_src_pad;
@@ -473,17 +472,9 @@ gst_wrapper_camera_bin_src_construct_pipeline (GstBaseCameraSrc * bcamsrc)
     /* viewfinder pad */
     vf_pad = gst_element_get_request_pad (tee, "src%d");
     g_object_set (tee, "alloc-pad", vf_pad, NULL);
+    gst_ghost_pad_set_target (GST_GHOST_PAD (self->vfsrc), vf_pad);
     gst_object_unref (vf_pad);
 
-    /* the viewfinder should always work, so we add some converters to it */
-    if (!gst_camerabin_create_and_add_element (cbin, "ffmpegcolorspace",
-            "viewfinder-colorspace"))
-      goto done;
-    if (!(videoscale =
-            gst_camerabin_create_and_add_element (cbin, "videoscale",
-                "viewfinder-scale")))
-      goto done;
-
     /* image/video pad from tee */
     tee_capture_pad = gst_element_get_request_pad (tee, "src%d");
 
@@ -526,10 +517,7 @@ gst_wrapper_camera_bin_src_construct_pipeline (GstBaseCameraSrc * bcamsrc)
           NULL);
     }
 
-    /* hook-up the vf ghostpad */
-    vf_pad = gst_element_get_static_pad (videoscale, "src");
-    gst_ghost_pad_set_target (GST_GHOST_PAD (self->vfsrc), vf_pad);
-    gst_object_unref (vf_pad);
+
 
     gst_pad_set_active (self->vfsrc, TRUE);
     gst_pad_set_active (self->imgsrc, TRUE);    /* XXX ??? */

From 298af589eb592fa2ed453318c18424fc70fc2659 Mon Sep 17 00:00:00 2001
From: Thiago Santos <thiago.sousa.santos@collabora.co.uk>
Date: Tue, 2 Aug 2011 10:49:09 -0300
Subject: [PATCH 152/158] camerabin2: Workaround for ringbuffer not resyncing
 on READY

Add a workaround to fix timestamps meanwhile bug
https://bugzilla.gnome.org/show_bug.cgi?id=648359 is fixed.
---
 gst/camerabin2/gstcamerabin2.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gst/camerabin2/gstcamerabin2.c b/gst/camerabin2/gstcamerabin2.c
index 522d974aa6..ba6a926c62 100644
--- a/gst/camerabin2/gstcamerabin2.c
+++ b/gst/camerabin2/gstcamerabin2.c
@@ -272,7 +272,11 @@ gst_camera_bin_start_capture (GstCameraBin2 * camerabin)
     if (camerabin->audio_src) {
       GstClock *clock = gst_pipeline_get_clock (GST_PIPELINE_CAST (camerabin));
 
-      gst_element_set_state (camerabin->audio_src, GST_STATE_READY);
+      /* FIXME We need to set audiosrc to null to make it resync the ringbuffer
+       * while bug https://bugzilla.gnome.org/show_bug.cgi?id=648359 isn't
+       * fixed */
+      gst_element_set_state (camerabin->audio_src, GST_STATE_NULL);
+
       /* need to reset eos status (pads could be flushing) */
       gst_element_set_state (camerabin->audio_capsfilter, GST_STATE_READY);
       gst_element_set_state (camerabin->audio_volume, GST_STATE_READY);

From e8d5e476efa2786ec117af14565665efcde48d21 Mon Sep 17 00:00:00 2001
From: Robert Jobbagy <jobbagy.robert@gmail.com>
Date: Tue, 2 Aug 2011 21:14:06 +0200
Subject: [PATCH 153/158] camerabin2: examples: Fix camerabin2 G_OBJECT cast

Adds missing cast to fix build error.
---
 tests/examples/camerabin2/gst-camerabin2-test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/examples/camerabin2/gst-camerabin2-test.c b/tests/examples/camerabin2/gst-camerabin2-test.c
index 4e74927645..db93010329 100644
--- a/tests/examples/camerabin2/gst-camerabin2-test.c
+++ b/tests/examples/camerabin2/gst-camerabin2-test.c
@@ -677,7 +677,7 @@ setup_pipeline (void)
 
   GST_INFO_OBJECT (camerabin, "camerabin2 created");
 
-  gst_util_set_object_arg (camerabin, "flags", camerabin2_flags);
+  gst_util_set_object_arg (G_OBJECT (camerabin), "flags", camerabin2_flags);
 
   if (videosrc_name) {
     GstElement *wrapper;

From 7e49dad23ba349da2dbf5acdc1004c42486783c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Tue, 2 Aug 2011 22:57:15 +0100
Subject: [PATCH 154/158] Fix some more variable-set-but-not-used compiler
 warnings

---
 .gitignore                                           | 1 +
 ext/opencv/gstmotioncells.c                          | 2 --
 tests/examples/opencv/gst_element_print_properties.c | 2 --
 tests/examples/opencv/gstmotioncells_dynamic_test.c  | 4 ++++
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index dd2bbc8aed..899464ac00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,4 @@ gst*orc.h
 /tests/check/orc
 /tests/examples/shapewipe/shapewipe-example
 /tests/examples/jack/jack_client
+/tests/examples/opencv/gstmotioncells_dynamic_test
diff --git a/ext/opencv/gstmotioncells.c b/ext/opencv/gstmotioncells.c
index 0292959315..a349bcac1d 100644
--- a/ext/opencv/gstmotioncells.c
+++ b/ext/opencv/gstmotioncells.c
@@ -219,10 +219,8 @@ static void
 gst_motion_cells_class_init (GstMotioncellsClass * 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->finalize = GST_DEBUG_FUNCPTR (gst_motion_cells_finalize);
diff --git a/tests/examples/opencv/gst_element_print_properties.c b/tests/examples/opencv/gst_element_print_properties.c
index 28d23b9cdd..4192fe84e1 100644
--- a/tests/examples/opencv/gst_element_print_properties.c
+++ b/tests/examples/opencv/gst_element_print_properties.c
@@ -89,7 +89,6 @@ gst_element_print_properties (GstElement * element)
   GParamSpec **property_specs;
   guint num_properties, i;
   gboolean readable;
-  gboolean first_flag;
 
 
   g_return_if_fail (element != NULL);
@@ -108,7 +107,6 @@ gst_element_print_properties (GstElement * element)
     GParamSpec *param = property_specs[i];
 
     readable = FALSE;
-    first_flag = TRUE;
 
     g_value_init (&value, param->value_type);
 
diff --git a/tests/examples/opencv/gstmotioncells_dynamic_test.c b/tests/examples/opencv/gstmotioncells_dynamic_test.c
index 21c351bfdd..83834065be 100644
--- a/tests/examples/opencv/gstmotioncells_dynamic_test.c
+++ b/tests/examples/opencv/gstmotioncells_dynamic_test.c
@@ -206,8 +206,12 @@ main (int argc, char *argv[])
   while (TRUE) {
     found_property = FALSE;
     i = 0;
+
     ret = scanf ("%19s %99s", property, prop_value);
 
+    if (ret < 1)
+      g_printerr ("Error parsing command.\n");
+
     if ((g_strcmp0 (property, "q") == 0) || (g_strcmp0 (prop_value, "q") == 0))
       break;
     printf ("property: %s -> value: %s \n", property, prop_value);

From f0bc2dc05bad84d009a24c19e9b2d6de81f86c3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Tue, 2 Aug 2011 23:53:08 +0100
Subject: [PATCH 155/158] bayer: back around compiler warnings in orc-generated
 code by disabling -Werror for this plugin

https://bugzilla.gnome.org/show_bug.cgi?id=652677
---
 gst/bayer/Makefile.am | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gst/bayer/Makefile.am b/gst/bayer/Makefile.am
index 69666ea2f6..c980678fb8 100644
--- a/gst/bayer/Makefile.am
+++ b/gst/bayer/Makefile.am
@@ -3,6 +3,9 @@ plugin_LTLIBRARIES = libgstbayer.la
 ORC_SOURCE=gstbayerorc
 include $(top_srcdir)/common/orc.mak
 
+# orc-generated code creates warnings
+ERROR_CFLAGS=
+
 libgstbayer_la_SOURCES = \
 	gstbayer.c \
 	gstbayer2rgb.c \

From ce0655c275023faf3a24bfccc6c612a31604ecc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Tue, 2 Aug 2011 15:14:24 +0200
Subject: [PATCH 156/158] basevideoencoder: Make access to the list of frames
 threadsafe

---
 gst-libs/gst/video/gstbasevideoencoder.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gst-libs/gst/video/gstbasevideoencoder.c b/gst-libs/gst/video/gstbasevideoencoder.c
index 4fbd0b7978..e4efe6d39f 100644
--- a/gst-libs/gst/video/gstbasevideoencoder.c
+++ b/gst-libs/gst/video/gstbasevideoencoder.c
@@ -676,8 +676,10 @@ gst_base_video_encoder_chain (GstPad * pad, GstBuffer * buf)
   frame->force_keyframe = base_video_encoder->force_keyframe;
   base_video_encoder->force_keyframe = FALSE;
 
+  GST_OBJECT_LOCK (base_video_encoder);
   GST_BASE_VIDEO_CODEC (base_video_encoder)->frames =
       g_list_append (GST_BASE_VIDEO_CODEC (base_video_encoder)->frames, frame);
+  GST_OBJECT_UNLOCK (base_video_encoder);
 
   /* new data, more finish needed */
   base_video_encoder->drained = FALSE;
@@ -894,8 +896,10 @@ gst_base_video_encoder_finish_frame (GstBaseVideoEncoder * base_video_encoder,
 
 done:
   /* handed out */
+  GST_OBJECT_LOCK (base_video_encoder);
   GST_BASE_VIDEO_CODEC (base_video_encoder)->frames =
       g_list_remove (GST_BASE_VIDEO_CODEC (base_video_encoder)->frames, frame);
+  GST_OBJECT_UNLOCK (base_video_encoder);
 
   gst_base_video_codec_free_frame (frame);
 
@@ -972,7 +976,9 @@ gst_base_video_encoder_get_oldest_frame (GstBaseVideoEncoder *
 {
   GList *g;
 
+  GST_OBJECT_LOCK (base_video_encoder);
   g = g_list_first (GST_BASE_VIDEO_CODEC (base_video_encoder)->frames);
+  GST_OBJECT_UNLOCK (base_video_encoder);
 
   if (g == NULL)
     return NULL;

From b4c8eb084c4c2e4ca87022a08c355bb7a9f2a85d Mon Sep 17 00:00:00 2001
From: Robert Swain <robert.swain@collabora.co.uk>
Date: Wed, 29 Jun 2011 15:14:29 +0200
Subject: [PATCH 157/158] gst-camerabin2-test: Add audio capture caps option

---
 tests/examples/camerabin2/gst-camerabin2-test.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/examples/camerabin2/gst-camerabin2-test.c b/tests/examples/camerabin2/gst-camerabin2-test.c
index db93010329..f112dbcb34 100644
--- a/tests/examples/camerabin2/gst-camerabin2-test.c
+++ b/tests/examples/camerabin2/gst-camerabin2-test.c
@@ -215,6 +215,7 @@ static gchar *gep_filename = NULL;
 static gchar *image_capture_caps_str = NULL;
 static gchar *viewfinder_caps_str = NULL;
 static gchar *video_capture_caps_str = NULL;
+static gchar *audio_capture_caps_str = NULL;
 static gboolean performance_measure = FALSE;
 static gchar *performance_targets_str = NULL;
 static gchar *camerabin2_flags = NULL;
@@ -650,6 +651,13 @@ set_camerabin2_caps_from_string (void)
     g_object_set (camerabin, "video-capture-caps", caps, NULL);
     gst_caps_unref (caps);
   }
+
+  if (audio_capture_caps_str != NULL) {
+    caps = gst_caps_from_string (audio_capture_caps_str);
+    GST_DEBUG ("setting audio-capture-caps: %" GST_PTR_FORMAT, caps);
+    g_object_set (camerabin, "audio-capture-caps", caps, NULL);
+    gst_caps_unref (caps);
+  }
 }
 
 static gboolean
@@ -1226,6 +1234,10 @@ main (int argc, char *argv[])
     {"video-capture-caps", '\0', 0,
           G_OPTION_ARG_STRING, &video_capture_caps_str,
         "Video capture caps (e.g. video/x-raw-rgb,width=640,height=480)", NULL},
+    {"audio-capture-caps", '\0', 0,
+          G_OPTION_ARG_STRING, &audio_capture_caps_str,
+          "Audio capture caps (e.g. audio/x-raw-int,width=16,depth=16,rate=44100,channels=2)",
+        NULL},
     {"performance-measure", '\0', 0,
           G_OPTION_ARG_NONE, &performance_measure,
           "If performance information should be printed at the end of execution",

From cc9e4903138894963e52d52dfc22ffb23d763b9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Wed, 3 Aug 2011 13:42:20 +0100
Subject: [PATCH 158/158] dvbsuboverlay: fix up copyrights

---
 gst/dvbsuboverlay/dvb-sub.c          | 5 ++---
 gst/dvbsuboverlay/gstdvbsuboverlay.c | 1 +
 gst/dvbsuboverlay/gstdvbsuboverlay.h | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/gst/dvbsuboverlay/dvb-sub.c b/gst/dvbsuboverlay/dvb-sub.c
index a0ef3e1519..3431a8cfe6 100644
--- a/gst/dvbsuboverlay/dvb-sub.c
+++ b/gst/dvbsuboverlay/dvb-sub.c
@@ -1,7 +1,6 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
-/*
- * libdvbsub - DVB subtitle decoding
+/* dvb-sub.c - DVB subtitle decoding
  * Copyright (C) Mart Raudsepp 2009 <mart.raudsepp@artecdesign.ee>
+ * Copyright (C) 2010 ONELAN Ltd.
  * 
  * Heavily uses code algorithms ported from ffmpeg's libavcodec/dvbsubdec.c,
  * especially the segment parsers. The original license applies to this
diff --git a/gst/dvbsuboverlay/gstdvbsuboverlay.c b/gst/dvbsuboverlay/gstdvbsuboverlay.c
index 5dc04cb95b..add39c47b1 100644
--- a/gst/dvbsuboverlay/gstdvbsuboverlay.c
+++ b/gst/dvbsuboverlay/gstdvbsuboverlay.c
@@ -1,5 +1,6 @@
 /* GStreamer DVB subtitles overlay
  * Copyright (c) 2010 Mart Raudsepp <mart.raudsepp@collabora.co.uk>
+ * Copyright (c) 2010 ONELAN Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
diff --git a/gst/dvbsuboverlay/gstdvbsuboverlay.h b/gst/dvbsuboverlay/gstdvbsuboverlay.h
index 19835c6c66..012c728ebe 100644
--- a/gst/dvbsuboverlay/gstdvbsuboverlay.h
+++ b/gst/dvbsuboverlay/gstdvbsuboverlay.h
@@ -1,5 +1,6 @@
 /* GStreamer DVB subtitles overlay
  * Copyright (c) 2010 Mart Raudsepp <mart.raudsepp@collabora.co.uk>
+ * Copyright (c) 2010 ONELAN Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public License