Merge branch 'master' into 0.11

Conflicts:
	configure.ac
	ext/kate/gstkateenc.c
	gst/colorspace/colorspace.c
	gst/mpegvideoparse/mpegvideoparse.c

14 files changed, 998 insertions, 30 deletions

diff --git a/gst/inter/Makefile.am b/gst/inter/Makefile.am
index 4a7e78aea..7728de991 100644
--- a/gst/inter/Makefile.am
+++ b/gst/inter/Makefile.am
@@ -5,6 +5,8 @@ noinst_PROGRAMS = gstintertest
 libgstinter_la_SOURCES = \
 	gstinteraudiosink.c \
 	gstinteraudiosrc.c \
+	gstintersubsink.c \
+	gstintersubsrc.c \
 	gstintervideosink.c \
 	gstintervideosrc.c \
 	gstinter.c \
@@ -13,6 +15,8 @@ libgstinter_la_SOURCES = \
 noinst_HEADERS = \
 	gstinteraudiosink.h \
 	gstinteraudiosrc.h \
+	gstintersubsink.h \
+	gstintersubsrc.h \
 	gstintervideosink.h \
 	gstintervideosrc.h \
 	gstintersurface.h
diff --git a/gst/inter/gstinter.c b/gst/inter/gstinter.c
index 60c5bd6a7..8a7786dbc 100644
--- a/gst/inter/gstinter.c
+++ b/gst/inter/gstinter.c
@@ -1,5 +1,5 @@
 /* GStreamer
- * Copyright (C) 2011 David A. Schleef <ds@schleef.org>
+ * Copyright (C) 2011 David Schleef <ds@entropywave.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -23,6 +23,8 @@
 
 #include "gstinteraudiosrc.h"
 #include "gstinteraudiosink.h"
+#include "gstintersubsrc.h"
+#include "gstintersubsink.h"
 #include "gstintervideosrc.h"
 #include "gstintervideosink.h"
 #include "gstintersurface.h"
@@ -34,13 +36,15 @@ plugin_init (GstPlugin * plugin)
       GST_TYPE_INTER_AUDIO_SRC);
   gst_element_register (plugin, "interaudiosink", GST_RANK_NONE,
       GST_TYPE_INTER_AUDIO_SINK);
+  gst_element_register (plugin, "intersubsrc", GST_RANK_NONE,
+      GST_TYPE_INTER_SUB_SRC);
+  gst_element_register (plugin, "intersubsink", GST_RANK_NONE,
+      GST_TYPE_INTER_SUB_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;
 }
 
diff --git a/gst/inter/gstinteraudiosink.c b/gst/inter/gstinteraudiosink.c
index 1309fbc9e..e5ba92687 100644
--- a/gst/inter/gstinteraudiosink.c
+++ b/gst/inter/gstinteraudiosink.c
@@ -77,7 +77,8 @@ static gboolean gst_inter_audio_sink_unlock_stop (GstBaseSink * sink);
 
 enum
 {
-  PROP_0
+  PROP_0,
+  PROP_CHANNEL
 };
 
 /* pad templates */
@@ -150,6 +151,10 @@ gst_inter_audio_sink_class_init (GstInterAudioSinkClass * klass)
   base_sink_class->unlock_stop =
       GST_DEBUG_FUNCPTR (gst_inter_audio_sink_unlock_stop);
 
+  g_object_class_install_property (gobject_class, PROP_CHANNEL,
+      g_param_spec_string ("channel", "Channel",
+          "Channel name to match inter src and sink elements",
+          "default", G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
diff --git a/gst/inter/gstinteraudiosrc.c b/gst/inter/gstinteraudiosrc.c
index 11b8839e1..e659bf024 100644
--- a/gst/inter/gstinteraudiosrc.c
+++ b/gst/inter/gstinteraudiosrc.c
@@ -79,7 +79,8 @@ gst_inter_audio_src_prepare_seek_segment (GstBaseSrc * src, GstEvent * seek,
 
 enum
 {
-  PROP_0
+  PROP_0,
+  PROP_CHANNEL
 };
 
 /* pad templates */
@@ -158,6 +159,10 @@ gst_inter_audio_src_class_init (GstInterAudioSrcClass * klass)
     base_src_class->prepare_seek_segment =
         GST_DEBUG_FUNCPTR (gst_inter_audio_src_prepare_seek_segment);
 
+  g_object_class_install_property (gobject_class, PROP_CHANNEL,
+      g_param_spec_string ("channel", "Channel",
+          "Channel name to match inter src and sink elements",
+          "default", G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 }
 
diff --git a/gst/inter/gstintersubsink.c b/gst/inter/gstintersubsink.c
new file mode 100644
index 000000000..1328b18a5
--- /dev/null
+++ b/gst/inter/gstintersubsink.c
@@ -0,0 +1,325 @@
+/* GStreamer
+ * Copyright (C) 2011 David Schleef <ds@entropywave.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.
+ */
+/**
+ * SECTION:element-gstintersubsink
+ *
+ * The intersubsink element does FIXME stuff.
+ *
+ * <refsect2>
+ * <title>Example launch line</title>
+ * |[
+ * gst-launch -v fakesrc ! intersubsink ! 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 "gstintersubsink.h"
+
+GST_DEBUG_CATEGORY_STATIC (gst_inter_sub_sink_debug_category);
+#define GST_CAT_DEFAULT gst_inter_sub_sink_debug_category
+
+/* prototypes */
+
+
+static void gst_inter_sub_sink_set_property (GObject * object,
+    guint property_id, const GValue * value, GParamSpec * pspec);
+static void gst_inter_sub_sink_get_property (GObject * object,
+    guint property_id, GValue * value, GParamSpec * pspec);
+static void gst_inter_sub_sink_dispose (GObject * object);
+static void gst_inter_sub_sink_finalize (GObject * object);
+
+static GstCaps *gst_inter_sub_sink_get_caps (GstBaseSink * sink);
+static gboolean gst_inter_sub_sink_set_caps (GstBaseSink * sink,
+    GstCaps * caps);
+static GstFlowReturn gst_inter_sub_sink_buffer_alloc (GstBaseSink * sink,
+    guint64 offset, guint size, GstCaps * caps, GstBuffer ** buf);
+static void gst_inter_sub_sink_get_times (GstBaseSink * sink,
+    GstBuffer * buffer, GstClockTime * start, GstClockTime * end);
+static gboolean gst_inter_sub_sink_start (GstBaseSink * sink);
+static gboolean gst_inter_sub_sink_stop (GstBaseSink * sink);
+static gboolean gst_inter_sub_sink_unlock (GstBaseSink * sink);
+static gboolean gst_inter_sub_sink_event (GstBaseSink * sink, GstEvent * event);
+static GstFlowReturn
+gst_inter_sub_sink_preroll (GstBaseSink * sink, GstBuffer * buffer);
+static GstFlowReturn
+gst_inter_sub_sink_render (GstBaseSink * sink, GstBuffer * buffer);
+static GstStateChangeReturn gst_inter_sub_sink_async_play (GstBaseSink * sink);
+static gboolean gst_inter_sub_sink_activate_pull (GstBaseSink * sink,
+    gboolean active);
+static gboolean gst_inter_sub_sink_unlock_stop (GstBaseSink * sink);
+
+enum
+{
+  PROP_0
+};
+
+/* pad templates */
+
+static GstStaticPadTemplate gst_inter_sub_sink_sink_template =
+GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("text/plain")
+    );
+
+
+/* class initialization */
+
+#define DEBUG_INIT(bla) \
+  GST_DEBUG_CATEGORY_INIT (gst_inter_sub_sink_debug_category, "intersubsink", 0, \
+      "debug category for intersubsink element");
+
+GST_BOILERPLATE_FULL (GstInterSubSink, gst_inter_sub_sink, GstBaseSink,
+    GST_TYPE_BASE_SINK, DEBUG_INIT);
+
+static void
+gst_inter_sub_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_sub_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_sub_sink_class_init (GstInterSubSinkClass * klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  GstBaseSinkClass *base_sink_class = GST_BASE_SINK_CLASS (klass);
+
+  gobject_class->set_property = gst_inter_sub_sink_set_property;
+  gobject_class->get_property = gst_inter_sub_sink_get_property;
+  gobject_class->dispose = gst_inter_sub_sink_dispose;
+  gobject_class->finalize = gst_inter_sub_sink_finalize;
+  base_sink_class->get_caps = GST_DEBUG_FUNCPTR (gst_inter_sub_sink_get_caps);
+  base_sink_class->set_caps = GST_DEBUG_FUNCPTR (gst_inter_sub_sink_set_caps);
+  if (0)
+    base_sink_class->buffer_alloc =
+        GST_DEBUG_FUNCPTR (gst_inter_sub_sink_buffer_alloc);
+  base_sink_class->get_times = GST_DEBUG_FUNCPTR (gst_inter_sub_sink_get_times);
+  base_sink_class->start = GST_DEBUG_FUNCPTR (gst_inter_sub_sink_start);
+  base_sink_class->stop = GST_DEBUG_FUNCPTR (gst_inter_sub_sink_stop);
+  base_sink_class->unlock = GST_DEBUG_FUNCPTR (gst_inter_sub_sink_unlock);
+  if (0)
+    base_sink_class->event = GST_DEBUG_FUNCPTR (gst_inter_sub_sink_event);
+  base_sink_class->preroll = GST_DEBUG_FUNCPTR (gst_inter_sub_sink_preroll);
+  base_sink_class->render = GST_DEBUG_FUNCPTR (gst_inter_sub_sink_render);
+  if (0)
+    base_sink_class->async_play =
+        GST_DEBUG_FUNCPTR (gst_inter_sub_sink_async_play);
+  if (0)
+    base_sink_class->activate_pull =
+        GST_DEBUG_FUNCPTR (gst_inter_sub_sink_activate_pull);
+  base_sink_class->unlock_stop =
+      GST_DEBUG_FUNCPTR (gst_inter_sub_sink_unlock_stop);
+
+}
+
+static void
+gst_inter_sub_sink_init (GstInterSubSink * intersubsink,
+    GstInterSubSinkClass * intersubsink_class)
+{
+
+  intersubsink->surface = gst_inter_surface_get ("default");
+
+  intersubsink->fps_n = 1;
+  intersubsink->fps_d = 1;
+}
+
+void
+gst_inter_sub_sink_set_property (GObject * object, guint property_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  /* GstInterSubSink *intersubsink = GST_INTER_SUB_SINK (object); */
+
+  switch (property_id) {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+  }
+}
+
+void
+gst_inter_sub_sink_get_property (GObject * object, guint property_id,
+    GValue * value, GParamSpec * pspec)
+{
+  /* GstInterSubSink *intersubsink = GST_INTER_SUB_SINK (object); */
+
+  switch (property_id) {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+  }
+}
+
+void
+gst_inter_sub_sink_dispose (GObject * object)
+{
+  /* GstInterSubSink *intersubsink = GST_INTER_SUB_SINK (object); */
+
+  /* clean up as possible.  may be called multiple times */
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+void
+gst_inter_sub_sink_finalize (GObject * object)
+{
+  /* GstInterSubSink *intersubsink = GST_INTER_SUB_SINK (object); */
+
+  /* clean up object here */
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+
+
+static GstCaps *
+gst_inter_sub_sink_get_caps (GstBaseSink * sink)
+{
+
+  return NULL;
+}
+
+static gboolean
+gst_inter_sub_sink_set_caps (GstBaseSink * sink, GstCaps * caps)
+{
+
+  return FALSE;
+}
+
+static GstFlowReturn
+gst_inter_sub_sink_buffer_alloc (GstBaseSink * sink, guint64 offset, guint size,
+    GstCaps * caps, GstBuffer ** buf)
+{
+
+  return GST_FLOW_ERROR;
+}
+
+static void
+gst_inter_sub_sink_get_times (GstBaseSink * sink, GstBuffer * buffer,
+    GstClockTime * start, GstClockTime * end)
+{
+  GstInterSubSink *intersubsink = GST_INTER_SUB_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 (intersubsink->fps_n > 0) {
+        *end = *start +
+            gst_util_uint64_scale_int (GST_SECOND, intersubsink->fps_d,
+            intersubsink->fps_n);
+      }
+    }
+  }
+
+
+}
+
+static gboolean
+gst_inter_sub_sink_start (GstBaseSink * sink)
+{
+
+  return TRUE;
+}
+
+static gboolean
+gst_inter_sub_sink_stop (GstBaseSink * sink)
+{
+  GstInterSubSink *intersubsink = GST_INTER_SUB_SINK (sink);
+
+  g_mutex_lock (intersubsink->surface->mutex);
+  if (intersubsink->surface->sub_buffer) {
+    gst_buffer_unref (intersubsink->surface->sub_buffer);
+  }
+  intersubsink->surface->sub_buffer = NULL;
+  g_mutex_unlock (intersubsink->surface->mutex);
+
+  return TRUE;
+}
+
+static gboolean
+gst_inter_sub_sink_unlock (GstBaseSink * sink)
+{
+
+  return TRUE;
+}
+
+static gboolean
+gst_inter_sub_sink_event (GstBaseSink * sink, GstEvent * event)
+{
+
+  return TRUE;
+}
+
+static GstFlowReturn
+gst_inter_sub_sink_preroll (GstBaseSink * sink, GstBuffer * buffer)
+{
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_inter_sub_sink_render (GstBaseSink * sink, GstBuffer * buffer)
+{
+  GstInterSubSink *intersubsink = GST_INTER_SUB_SINK (sink);
+
+  g_mutex_lock (intersubsink->surface->mutex);
+  if (intersubsink->surface->sub_buffer) {
+    gst_buffer_unref (intersubsink->surface->sub_buffer);
+  }
+  intersubsink->surface->sub_buffer = gst_buffer_ref (buffer);
+  //intersubsink->surface->sub_buffer_count = 0;
+  g_mutex_unlock (intersubsink->surface->mutex);
+
+  return GST_FLOW_OK;
+}
+
+static GstStateChangeReturn
+gst_inter_sub_sink_async_play (GstBaseSink * sink)
+{
+
+  return GST_STATE_CHANGE_SUCCESS;
+}
+
+static gboolean
+gst_inter_sub_sink_activate_pull (GstBaseSink * sink, gboolean active)
+{
+
+  return TRUE;
+}
+
+static gboolean
+gst_inter_sub_sink_unlock_stop (GstBaseSink * sink)
+{
+
+  return TRUE;
+}
diff --git a/gst/inter/gstintersubsink.h b/gst/inter/gstintersubsink.h
new file mode 100644
index 000000000..be2da9b3b
--- /dev/null
+++ b/gst/inter/gstintersubsink.h
@@ -0,0 +1,57 @@
+/* GStreamer
+ * Copyright (C) 2011 David Schleef <ds@entropywave.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_INTER_SUB_SINK_H_
+#define _GST_INTER_SUB_SINK_H_
+
+#include <gst/base/gstbasesink.h>
+#include "gstintersurface.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_INTER_SUB_SINK   (gst_inter_sub_sink_get_type())
+#define GST_INTER_SUB_SINK(obj)   (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_INTER_SUB_SINK,GstInterSubSink))
+#define GST_INTER_SUB_SINK_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_INTER_SUB_SINK,GstInterSubSinkClass))
+#define GST_IS_INTER_SUB_SINK(obj)   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_INTER_SUB_SINK))
+#define GST_IS_INTER_SUB_SINK_CLASS(obj)   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_INTER_SUB_SINK))
+
+typedef struct _GstInterSubSink GstInterSubSink;
+typedef struct _GstInterSubSinkClass GstInterSubSinkClass;
+
+struct _GstInterSubSink
+{
+  GstBaseSink base_intersubsink;
+
+  GstPad *sinkpad;
+  GstInterSurface *surface;
+
+  int fps_n;
+  int fps_d;
+};
+
+struct _GstInterSubSinkClass
+{
+  GstBaseSinkClass base_intersubsink_class;
+};
+
+GType gst_inter_sub_sink_get_type (void);
+
+G_END_DECLS
+
+#endif
diff --git a/gst/inter/gstintersubsrc.c b/gst/inter/gstintersubsrc.c
new file mode 100644
index 000000000..60a29b3d7
--- /dev/null
+++ b/gst/inter/gstintersubsrc.c
@@ -0,0 +1,455 @@
+/* GStreamer
+ * Copyright (C) 2011 David Schleef <ds@entropywave.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.
+ */
+/**
+ * SECTION:element-gstintersubsrc
+ *
+ * The intersubsrc element is a subtitle source element.  It is used
+ * in connection with a intersubsink element in a different pipeline,
+ * similar to interaudiosink and interaudiosrc.
+ *
+ * <refsect2>
+ * <title>Example launch line</title>
+ * |[
+ * gst-launch -v intersubsrc ! kateenc ! oggmux ! filesink location=out.ogv
+ * ]|
+ * 
+ * The intersubsrc element cannot be used effectively with gst-launch,
+ * as it requires a second pipeline in the application to send subtitles.
+ * </refsect2>
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/gst.h>
+#include <gst/base/gstbasesrc.h>
+#include "gstintersubsrc.h"
+
+GST_DEBUG_CATEGORY_STATIC (gst_inter_sub_src_debug_category);
+#define GST_CAT_DEFAULT gst_inter_sub_src_debug_category
+
+/* prototypes */
+
+
+static void gst_inter_sub_src_set_property (GObject * object,
+    guint property_id, const GValue * value, GParamSpec * pspec);
+static void gst_inter_sub_src_get_property (GObject * object,
+    guint property_id, GValue * value, GParamSpec * pspec);
+static void gst_inter_sub_src_dispose (GObject * object);
+static void gst_inter_sub_src_finalize (GObject * object);
+
+static GstCaps *gst_inter_sub_src_get_caps (GstBaseSrc * src);
+static gboolean gst_inter_sub_src_set_caps (GstBaseSrc * src, GstCaps * caps);
+static gboolean gst_inter_sub_src_negotiate (GstBaseSrc * src);
+static gboolean gst_inter_sub_src_newsegment (GstBaseSrc * src);
+static gboolean gst_inter_sub_src_start (GstBaseSrc * src);
+static gboolean gst_inter_sub_src_stop (GstBaseSrc * src);
+static void
+gst_inter_sub_src_get_times (GstBaseSrc * src, GstBuffer * buffer,
+    GstClockTime * start, GstClockTime * end);
+static gboolean gst_inter_sub_src_is_seekable (GstBaseSrc * src);
+static gboolean gst_inter_sub_src_unlock (GstBaseSrc * src);
+static gboolean gst_inter_sub_src_event (GstBaseSrc * src, GstEvent * event);
+static GstFlowReturn
+gst_inter_sub_src_create (GstBaseSrc * src, guint64 offset, guint size,
+    GstBuffer ** buf);
+static gboolean gst_inter_sub_src_do_seek (GstBaseSrc * src,
+    GstSegment * segment);
+static gboolean gst_inter_sub_src_query (GstBaseSrc * src, GstQuery * query);
+static gboolean gst_inter_sub_src_check_get_range (GstBaseSrc * src);
+static void gst_inter_sub_src_fixate (GstBaseSrc * src, GstCaps * caps);
+static gboolean gst_inter_sub_src_unlock_stop (GstBaseSrc * src);
+static gboolean
+gst_inter_sub_src_prepare_seek_segment (GstBaseSrc * src, GstEvent * seek,
+    GstSegment * segment);
+
+enum
+{
+  PROP_0
+};
+
+/* pad templates */
+
+static GstStaticPadTemplate gst_inter_sub_src_src_template =
+GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("application/unknown")
+    );
+
+
+/* class initialization */
+
+#define DEBUG_INIT(bla) \
+  GST_DEBUG_CATEGORY_INIT (gst_inter_sub_src_debug_category, "intersubsrc", 0, \
+      "debug category for intersubsrc element");
+
+GST_BOILERPLATE_FULL (GstInterSubSrc, gst_inter_sub_src, GstBaseSrc,
+    GST_TYPE_BASE_SRC, DEBUG_INIT);
+
+static void
+gst_inter_sub_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_sub_src_src_template));
+
+  gst_element_class_set_details_simple (element_class,
+      "Inter-pipeline subtitle source",
+      "Source/Subtitle", "Inter-pipeline subtitle source",
+      "David Schleef <ds@entropywave.com>");
+}
+
+static void
+gst_inter_sub_src_class_init (GstInterSubSrcClass * klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  GstBaseSrcClass *base_src_class = GST_BASE_SRC_CLASS (klass);
+
+  gobject_class->set_property = gst_inter_sub_src_set_property;
+  gobject_class->get_property = gst_inter_sub_src_get_property;
+  gobject_class->dispose = gst_inter_sub_src_dispose;
+  gobject_class->finalize = gst_inter_sub_src_finalize;
+  if (0)
+    base_src_class->get_caps = GST_DEBUG_FUNCPTR (gst_inter_sub_src_get_caps);
+  base_src_class->set_caps = GST_DEBUG_FUNCPTR (gst_inter_sub_src_set_caps);
+  if (0)
+    base_src_class->negotiate = GST_DEBUG_FUNCPTR (gst_inter_sub_src_negotiate);
+  if (0)
+    base_src_class->newsegment =
+        GST_DEBUG_FUNCPTR (gst_inter_sub_src_newsegment);
+  base_src_class->start = GST_DEBUG_FUNCPTR (gst_inter_sub_src_start);
+  base_src_class->stop = GST_DEBUG_FUNCPTR (gst_inter_sub_src_stop);
+  base_src_class->get_times = GST_DEBUG_FUNCPTR (gst_inter_sub_src_get_times);
+  if (0)
+    base_src_class->is_seekable =
+        GST_DEBUG_FUNCPTR (gst_inter_sub_src_is_seekable);
+  base_src_class->unlock = GST_DEBUG_FUNCPTR (gst_inter_sub_src_unlock);
+  base_src_class->event = GST_DEBUG_FUNCPTR (gst_inter_sub_src_event);
+  base_src_class->create = GST_DEBUG_FUNCPTR (gst_inter_sub_src_create);
+  if (0)
+    base_src_class->do_seek = GST_DEBUG_FUNCPTR (gst_inter_sub_src_do_seek);
+  base_src_class->query = GST_DEBUG_FUNCPTR (gst_inter_sub_src_query);
+  if (0)
+    base_src_class->check_get_range =
+        GST_DEBUG_FUNCPTR (gst_inter_sub_src_check_get_range);
+  base_src_class->fixate = GST_DEBUG_FUNCPTR (gst_inter_sub_src_fixate);
+  if (0)
+    base_src_class->unlock_stop =
+        GST_DEBUG_FUNCPTR (gst_inter_sub_src_unlock_stop);
+  if (0)
+    base_src_class->prepare_seek_segment =
+        GST_DEBUG_FUNCPTR (gst_inter_sub_src_prepare_seek_segment);
+
+
+}
+
+static void
+gst_inter_sub_src_init (GstInterSubSrc * intersubsrc,
+    GstInterSubSrcClass * intersubsrc_class)
+{
+
+  intersubsrc->srcpad =
+      gst_pad_new_from_static_template (&gst_inter_sub_src_src_template, "src");
+
+  gst_base_src_set_format (GST_BASE_SRC (intersubsrc), GST_FORMAT_TIME);
+  gst_base_src_set_live (GST_BASE_SRC (intersubsrc), TRUE);
+
+  intersubsrc->surface = gst_inter_surface_get ("default");
+}
+
+void
+gst_inter_sub_src_set_property (GObject * object, guint property_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  /* GstInterSubSrc *intersubsrc = GST_INTER_SUB_SRC (object); */
+
+  switch (property_id) {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+  }
+}
+
+void
+gst_inter_sub_src_get_property (GObject * object, guint property_id,
+    GValue * value, GParamSpec * pspec)
+{
+  /* GstInterSubSrc *intersubsrc = GST_INTER_SUB_SRC (object); */
+
+  switch (property_id) {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+  }
+}
+
+void
+gst_inter_sub_src_dispose (GObject * object)
+{
+  /* GstInterSubSrc *intersubsrc = GST_INTER_SUB_SRC (object); */
+
+  /* clean up as possible.  may be called multiple times */
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+void
+gst_inter_sub_src_finalize (GObject * object)
+{
+  /* GstInterSubSrc *intersubsrc = GST_INTER_SUB_SRC (object); */
+
+  /* clean up object here */
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+
+static GstCaps *
+gst_inter_sub_src_get_caps (GstBaseSrc * src)
+{
+  GstInterSubSrc *intersubsrc = GST_INTER_SUB_SRC (src);
+
+  GST_DEBUG_OBJECT (intersubsrc, "get_caps");
+
+  return NULL;
+}
+
+static gboolean
+gst_inter_sub_src_set_caps (GstBaseSrc * src, GstCaps * caps)
+{
+  GstInterSubSrc *intersubsrc = GST_INTER_SUB_SRC (src);
+
+  GST_DEBUG_OBJECT (intersubsrc, "set_caps");
+
+  return TRUE;
+}
+
+static gboolean
+gst_inter_sub_src_negotiate (GstBaseSrc * src)
+{
+  GstInterSubSrc *intersubsrc = GST_INTER_SUB_SRC (src);
+
+  GST_DEBUG_OBJECT (intersubsrc, "negotiate");
+
+  return TRUE;
+}
+
+static gboolean
+gst_inter_sub_src_newsegment (GstBaseSrc * src)
+{
+  GstInterSubSrc *intersubsrc = GST_INTER_SUB_SRC (src);
+
+  GST_DEBUG_OBJECT (intersubsrc, "newsegment");
+
+  return TRUE;
+}
+
+static gboolean
+gst_inter_sub_src_start (GstBaseSrc * src)
+{
+  GstInterSubSrc *intersubsrc = GST_INTER_SUB_SRC (src);
+
+  GST_DEBUG_OBJECT (intersubsrc, "start");
+
+  return TRUE;
+}
+
+static gboolean
+gst_inter_sub_src_stop (GstBaseSrc * src)
+{
+  GstInterSubSrc *intersubsrc = GST_INTER_SUB_SRC (src);
+
+  GST_DEBUG_OBJECT (intersubsrc, "stop");
+
+  return TRUE;
+}
+
+static void
+gst_inter_sub_src_get_times (GstBaseSrc * src, GstBuffer * buffer,
+    GstClockTime * start, GstClockTime * end)
+{
+  GstInterSubSrc *intersubsrc = GST_INTER_SUB_SRC (src);
+
+  GST_DEBUG_OBJECT (intersubsrc, "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_sub_src_is_seekable (GstBaseSrc * src)
+{
+  GstInterSubSrc *intersubsrc = GST_INTER_SUB_SRC (src);
+
+  GST_DEBUG_OBJECT (intersubsrc, "is_seekable");
+
+  return FALSE;
+}
+
+static gboolean
+gst_inter_sub_src_unlock (GstBaseSrc * src)
+{
+  GstInterSubSrc *intersubsrc = GST_INTER_SUB_SRC (src);
+
+  GST_DEBUG_OBJECT (intersubsrc, "unlock");
+
+  return TRUE;
+}
+
+static gboolean
+gst_inter_sub_src_event (GstBaseSrc * src, GstEvent * event)
+{
+  GstInterSubSrc *intersubsrc = GST_INTER_SUB_SRC (src);
+
+  GST_DEBUG_OBJECT (intersubsrc, "event");
+
+  return TRUE;
+}
+
+static GstFlowReturn
+gst_inter_sub_src_create (GstBaseSrc * src, guint64 offset, guint size,
+    GstBuffer ** buf)
+{
+  GstInterSubSrc *intersubsrc = GST_INTER_SUB_SRC (src);
+  GstBuffer *buffer;
+
+  GST_DEBUG_OBJECT (intersubsrc, "create");
+
+  buffer = NULL;
+
+  g_mutex_lock (intersubsrc->surface->mutex);
+  if (intersubsrc->surface->sub_buffer) {
+    buffer = gst_buffer_ref (intersubsrc->surface->sub_buffer);
+    //intersubsrc->surface->sub_buffer_count++;
+    //if (intersubsrc->surface->sub_buffer_count >= 30) {
+    gst_buffer_unref (intersubsrc->surface->sub_buffer);
+    intersubsrc->surface->sub_buffer = NULL;
+    //}
+  }
+  g_mutex_unlock (intersubsrc->surface->mutex);
+
+  if (buffer == NULL) {
+    guint8 *data;
+
+    buffer = gst_buffer_new_and_alloc (1);
+
+    data = GST_BUFFER_DATA (buffer);
+    data[0] = 0;
+  }
+
+  buffer = gst_buffer_make_metadata_writable (buffer);
+
+  GST_BUFFER_TIMESTAMP (buffer) =
+      gst_util_uint64_scale_int (GST_SECOND, intersubsrc->n_frames,
+      intersubsrc->rate);
+  GST_DEBUG_OBJECT (intersubsrc, "create ts %" GST_TIME_FORMAT,
+      GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buffer)));
+  GST_BUFFER_DURATION (buffer) =
+      gst_util_uint64_scale_int (GST_SECOND, (intersubsrc->n_frames + 1),
+      intersubsrc->rate) - GST_BUFFER_TIMESTAMP (buffer);
+  GST_BUFFER_OFFSET (buffer) = intersubsrc->n_frames;
+  GST_BUFFER_OFFSET_END (buffer) = -1;
+  GST_BUFFER_FLAG_UNSET (buffer, GST_BUFFER_FLAG_DISCONT);
+  if (intersubsrc->n_frames == 0) {
+    GST_BUFFER_FLAG_SET (buffer, GST_BUFFER_FLAG_DISCONT);
+  }
+  gst_buffer_set_caps (buffer, GST_PAD_CAPS (GST_BASE_SRC_PAD (intersubsrc)));
+  intersubsrc->n_frames++;
+
+  *buf = buffer;
+
+  return GST_FLOW_OK;
+}
+
+static gboolean
+gst_inter_sub_src_do_seek (GstBaseSrc * src, GstSegment * segment)
+{
+  GstInterSubSrc *intersubsrc = GST_INTER_SUB_SRC (src);
+
+  GST_DEBUG_OBJECT (intersubsrc, "do_seek");
+
+  return FALSE;
+}
+
+static gboolean
+gst_inter_sub_src_query (GstBaseSrc * src, GstQuery * query)
+{
+  GstInterSubSrc *intersubsrc = GST_INTER_SUB_SRC (src);
+
+  GST_DEBUG_OBJECT (intersubsrc, "query");
+
+  return TRUE;
+}
+
+static gboolean
+gst_inter_sub_src_check_get_range (GstBaseSrc * src)
+{
+  GstInterSubSrc *intersubsrc = GST_INTER_SUB_SRC (src);
+
+  GST_DEBUG_OBJECT (intersubsrc, "get_range");
+
+  return FALSE;
+}
+
+static void
+gst_inter_sub_src_fixate (GstBaseSrc * src, GstCaps * caps)
+{
+  GstInterSubSrc *intersubsrc = GST_INTER_SUB_SRC (src);
+
+  GST_DEBUG_OBJECT (intersubsrc, "fixate");
+}
+
+static gboolean
+gst_inter_sub_src_unlock_stop (GstBaseSrc * src)
+{
+  GstInterSubSrc *intersubsrc = GST_INTER_SUB_SRC (src);
+
+  GST_DEBUG_OBJECT (intersubsrc, "stop");
+
+  return TRUE;
+}
+
+static gboolean
+gst_inter_sub_src_prepare_seek_segment (GstBaseSrc * src, GstEvent * seek,
+    GstSegment * segment)
+{
+  GstInterSubSrc *intersubsrc = GST_INTER_SUB_SRC (src);
+
+  GST_DEBUG_OBJECT (intersubsrc, "seek_segment");
+
+  return FALSE;
+}
diff --git a/gst/inter/gstintersubsrc.h b/gst/inter/gstintersubsrc.h
new file mode 100644
index 000000000..74bfed1e7
--- /dev/null
+++ b/gst/inter/gstintersubsrc.h
@@ -0,0 +1,57 @@
+/* GStreamer
+ * Copyright (C) 2011 David Schleef <ds@entropywave.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_INTER_SUB_SRC_H_
+#define _GST_INTER_SUB_SRC_H_
+
+#include <gst/base/gstbasesrc.h>
+#include "gstintersurface.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_INTER_SUB_SRC   (gst_inter_sub_src_get_type())
+#define GST_INTER_SUB_SRC(obj)   (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_INTER_SUB_SRC,GstInterSubSrc))
+#define GST_INTER_SUB_SRC_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_INTER_SUB_SRC,GstInterSubSrcClass))
+#define GST_IS_INTER_SUB_SRC(obj)   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_INTER_SUB_SRC))
+#define GST_IS_INTER_SUB_SRC_CLASS(obj)   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_INTER_SUB_SRC))
+
+typedef struct _GstInterSubSrc GstInterSubSrc;
+typedef struct _GstInterSubSrcClass GstInterSubSrcClass;
+
+struct _GstInterSubSrc
+{
+  GstBaseSrc base_intersubsrc;
+
+  GstPad *srcpad;
+  GstInterSurface *surface;
+
+  int rate;
+  int n_frames;
+};
+
+struct _GstInterSubSrcClass
+{
+  GstBaseSrcClass base_intersubsrc_class;
+};
+
+GType gst_inter_sub_src_get_type (void);
+
+G_END_DECLS
+
+#endif
diff --git a/gst/inter/gstintersurface.c b/gst/inter/gstintersurface.c
index 545cd6ffa..1d23e5de1 100644
--- a/gst/inter/gstintersurface.c
+++ b/gst/inter/gstintersurface.c
@@ -21,22 +21,43 @@
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #include "gstintersurface.h"
 
-static GstInterSurface *surface;
+static GList *list;
+static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
 
 
 GstInterSurface *
 gst_inter_surface_get (const char *name)
 {
-  return surface;
+  GList *g;
+  GstInterSurface *surface;
 
-}
+  g_static_mutex_lock (&mutex);
+
+  for (g = list; g; g = g_list_next (g)) {
+    surface = (GstInterSurface *) g->data;
+    if (strcmp (name, surface->name) == 0) {
+      g_static_mutex_unlock (&mutex);
+      return surface;
+    }
+  }
 
-void
-gst_inter_surface_init (void)
-{
   surface = g_malloc0 (sizeof (GstInterSurface));
+  surface->name = g_strdup (name);
   surface->mutex = g_mutex_new ();
   surface->audio_adapter = gst_adapter_new ();
+
+  list = g_list_append (list, surface);
+  g_static_mutex_unlock (&mutex);
+
+  return surface;
+}
+
+void
+gst_inter_surface_unref (GstInterSurface * surface)
+{
+
 }
diff --git a/gst/inter/gstintersurface.h b/gst/inter/gstintersurface.h
index 92440448a..d8ba11f4c 100644
--- a/gst/inter/gstintersurface.h
+++ b/gst/inter/gstintersurface.h
@@ -30,6 +30,7 @@ typedef struct _GstInterSurface GstInterSurface;
 struct _GstInterSurface
 {
   GMutex *mutex;
+  char *name;
 
   /* video */
   GstVideoFormat format;
@@ -45,12 +46,13 @@ struct _GstInterSurface
   int n_channels;
 
   GstBuffer *video_buffer;
+  GstBuffer *sub_buffer;
   GstAdapter *audio_adapter;
 };
 
 
 GstInterSurface * gst_inter_surface_get (const char *name);
-void gst_inter_surface_init (void);
+void gst_inter_surface_unref (GstInterSurface *surface);
 
 
 G_END_DECLS
diff --git a/gst/inter/gstintervideosink.c b/gst/inter/gstintervideosink.c
index 9e1d782e5..b6be4e99a 100644
--- a/gst/inter/gstintervideosink.c
+++ b/gst/inter/gstintervideosink.c
@@ -76,7 +76,8 @@ static gboolean gst_inter_video_sink_unlock_stop (GstBaseSink * sink);
 
 enum
 {
-  PROP_0
+  PROP_0,
+  PROP_CHANNEL
 };
 
 /* pad templates */
@@ -144,6 +145,10 @@ gst_inter_video_sink_class_init (GstInterVideoSinkClass * klass)
   base_sink_class->unlock_stop =
       GST_DEBUG_FUNCPTR (gst_inter_video_sink_unlock_stop);
 
+  g_object_class_install_property (gobject_class, PROP_CHANNEL,
+      g_param_spec_string ("channel", "Channel",
+          "Channel name to match inter src and sink elements",
+          "default", G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
@@ -151,15 +156,21 @@ gst_inter_video_sink_init (GstInterVideoSink * intervideosink,
     GstInterVideoSinkClass * intervideosink_class)
 {
   intervideosink->surface = gst_inter_surface_get ("default");
+
+  intervideosink->channel = g_strdup ("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); */
+  GstInterVideoSink *intervideosink = GST_INTER_VIDEO_SINK (object);
 
   switch (property_id) {
+    case PROP_CHANNEL:
+      g_free (intervideosink->channel);
+      intervideosink->channel = g_value_dup_string (value);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
@@ -170,9 +181,12 @@ void
 gst_inter_video_sink_get_property (GObject * object, guint property_id,
     GValue * value, GParamSpec * pspec)
 {
-  /* GstInterVideoSink *intervideosink = GST_INTER_VIDEO_SINK (object); */
+  GstInterVideoSink *intervideosink = GST_INTER_VIDEO_SINK (object);
 
   switch (property_id) {
+    case PROP_CHANNEL:
+      g_value_set_string (value, intervideosink->channel);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
@@ -192,9 +206,10 @@ gst_inter_video_sink_dispose (GObject * object)
 void
 gst_inter_video_sink_finalize (GObject * object)
 {
-  /* GstInterVideoSink *intervideosink = GST_INTER_VIDEO_SINK (object); */
+  GstInterVideoSink *intervideosink = GST_INTER_VIDEO_SINK (object);
 
   /* clean up object here */
+  g_free (intervideosink->channel);
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
@@ -248,6 +263,9 @@ gst_inter_video_sink_get_times (GstBaseSink * sink, GstBuffer * buffer,
 static gboolean
 gst_inter_video_sink_start (GstBaseSink * sink)
 {
+  GstInterVideoSink *intervideosink = GST_INTER_VIDEO_SINK (sink);
+
+  intervideosink->surface = gst_inter_surface_get (intervideosink->channel);
 
   return TRUE;
 }
@@ -264,6 +282,9 @@ gst_inter_video_sink_stop (GstBaseSink * sink)
   intervideosink->surface->video_buffer = NULL;
   g_mutex_unlock (intervideosink->surface->mutex);
 
+  gst_inter_surface_unref (intervideosink->surface);
+  intervideosink->surface = NULL;
+
   return TRUE;
 }
 
diff --git a/gst/inter/gstintervideosink.h b/gst/inter/gstintervideosink.h
index 5b02efe62..5e421c6d0 100644
--- a/gst/inter/gstintervideosink.h
+++ b/gst/inter/gstintervideosink.h
@@ -39,6 +39,7 @@ struct _GstInterVideoSink
   GstBaseSink base_intervideosink;
 
   GstInterSurface *surface;
+  char *channel;
 
   int fps_n;
   int fps_d;
diff --git a/gst/inter/gstintervideosrc.c b/gst/inter/gstintervideosrc.c
index 69214d7bf..65fc7f0e5 100644
--- a/gst/inter/gstintervideosrc.c
+++ b/gst/inter/gstintervideosrc.c
@@ -80,7 +80,8 @@ gst_inter_video_src_prepare_seek_segment (GstBaseSrc * src, GstEvent * seek,
 
 enum
 {
-  PROP_0
+  PROP_0,
+  PROP_CHANNEL
 };
 
 /* pad templates */
@@ -156,6 +157,10 @@ gst_inter_video_src_class_init (GstInterVideoSrcClass * klass)
     base_src_class->prepare_seek_segment =
         GST_DEBUG_FUNCPTR (gst_inter_video_src_prepare_seek_segment);
 
+  g_object_class_install_property (gobject_class, PROP_CHANNEL,
+      g_param_spec_string ("channel", "Channel",
+          "Channel name to match inter src and sink elements",
+          "default", G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 }
 
@@ -166,16 +171,20 @@ gst_inter_video_src_init (GstInterVideoSrc * intervideosrc,
   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");
+  intervideosrc->channel = g_strdup ("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); */
+  GstInterVideoSrc *intervideosrc = GST_INTER_VIDEO_SRC (object);
 
   switch (property_id) {
+    case PROP_CHANNEL:
+      g_free (intervideosrc->channel);
+      intervideosrc->channel = g_value_dup_string (value);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
@@ -186,9 +195,12 @@ void
 gst_inter_video_src_get_property (GObject * object, guint property_id,
     GValue * value, GParamSpec * pspec)
 {
-  /* GstInterVideoSrc *intervideosrc = GST_INTER_VIDEO_SRC (object); */
+  GstInterVideoSrc *intervideosrc = GST_INTER_VIDEO_SRC (object);
 
   switch (property_id) {
+    case PROP_CHANNEL:
+      g_value_set_string (value, intervideosrc->channel);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
@@ -208,9 +220,10 @@ gst_inter_video_src_dispose (GObject * object)
 void
 gst_inter_video_src_finalize (GObject * object)
 {
-  /* GstInterVideoSrc *intervideosrc = GST_INTER_VIDEO_SRC (object); */
+  GstInterVideoSrc *intervideosrc = GST_INTER_VIDEO_SRC (object);
 
   /* clean up object here */
+  g_free (intervideosrc->channel);
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
@@ -279,6 +292,8 @@ gst_inter_video_src_start (GstBaseSrc * src)
 
   GST_DEBUG_OBJECT (intervideosrc, "start");
 
+  intervideosrc->surface = gst_inter_surface_get (intervideosrc->channel);
+
   return TRUE;
 }
 
@@ -289,6 +304,9 @@ gst_inter_video_src_stop (GstBaseSrc * src)
 
   GST_DEBUG_OBJECT (intervideosrc, "stop");
 
+  gst_inter_surface_unref (intervideosrc->surface);
+  intervideosrc->surface = NULL;
+
   return TRUE;
 }
 
@@ -391,15 +409,6 @@ gst_inter_video_src_create (GstBaseSrc * src, guint64 offset, guint size,
             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);
diff --git a/gst/inter/gstintervideosrc.h b/gst/inter/gstintervideosrc.h
index e7a3cd045..100c21489 100644
--- a/gst/inter/gstintervideosrc.h
+++ b/gst/inter/gstintervideosrc.h
@@ -41,6 +41,8 @@ struct _GstInterVideoSrc
 
   GstInterSurface *surface;
 
+  char *channel;
+
   GstVideoFormat format;
   int fps_n;
   int fps_d;