[farsight2/master] Consistently name fs-funnel fs_ and without gst stuff
Olivier Crête
olivier.crete at collabora.co.uk
Tue Dec 23 15:24:20 PST 2008
---
gst/funnel/Makefile.am | 4 +-
gst/funnel/fs-funnel.c | 346 ++++++++++++++++++++++++++++++++++++++++++++++
gst/funnel/fs-funnel.h | 69 +++++++++
gst/funnel/gstfsfunnel.c | 346 ----------------------------------------------
gst/funnel/gstfsfunnel.h | 69 ---------
5 files changed, 417 insertions(+), 417 deletions(-)
create mode 100644 gst/funnel/fs-funnel.c
create mode 100644 gst/funnel/fs-funnel.h
delete mode 100644 gst/funnel/gstfsfunnel.c
delete mode 100644 gst/funnel/gstfsfunnel.h
diff --git a/gst/funnel/Makefile.am b/gst/funnel/Makefile.am
index efcef82..1284269 100644
--- a/gst/funnel/Makefile.am
+++ b/gst/funnel/Makefile.am
@@ -1,6 +1,6 @@
plugin_LTLIBRARIES = libfsfunnel.la
-libfsfunnel_la_SOURCES = gstfsfunnel.c
+libfsfunnel_la_SOURCES = fs-funnel.c
libfsfunnel_la_CFLAGS = \
$(FS2_CFLAGS) \
$(GST_BASE_CFLAGS) \
@@ -11,4 +11,4 @@ libfsfunnel_la_LIBADD = \
$(GST_BASE_LIBS) \
$(GST_LIBS)
-noinst_HEADERS = gstfsfunnel.h
+noinst_HEADERS = fs-funnel.h
diff --git a/gst/funnel/fs-funnel.c b/gst/funnel/fs-funnel.c
new file mode 100644
index 0000000..d24af19
--- /dev/null
+++ b/gst/funnel/fs-funnel.c
@@ -0,0 +1,346 @@
+/*
+ * Farsight2 - Farsight Funnel element
+ *
+ * Copyright 2007 Collabora Ltd.
+ * @author: Olivier Crete <olivier.crete at collabora.co.uk>
+ * Copyright 2007 Nokia Corp.
+ *
+ * fs-funnel.c: Simple Funnel element
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * SECTION:element-funnel
+ * @short_description: N-to-1 simple funnel
+ *
+ * Takes packets from various input sinks into one output source
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "fs-funnel.h"
+
+GST_DEBUG_CATEGORY_STATIC (fs_funnel_debug);
+#define GST_CAT_DEFAULT fs_funnel_debug
+
+static const GstElementDetails fs_funnel_details =
+GST_ELEMENT_DETAILS(
+ "Farsight Funnel pipe fitting",
+ "Generic",
+ "N-to-1 pipe fitting",
+ "Olivier Crete <olivier.crete at collabora.co.uk>");
+
+static GstStaticPadTemplate funnel_sink_template =
+ GST_STATIC_PAD_TEMPLATE ("sink%d",
+ GST_PAD_SINK,
+ GST_PAD_REQUEST,
+ GST_STATIC_CAPS_ANY);
+
+static GstStaticPadTemplate funnel_src_template =
+ GST_STATIC_PAD_TEMPLATE ("src",
+ GST_PAD_SRC,
+ GST_PAD_ALWAYS,
+ GST_STATIC_CAPS_ANY);
+
+
+static void
+_do_init (GType type)
+{
+ GST_DEBUG_CATEGORY_INIT
+ (fs_funnel_debug, "fsfunnel", 0, "fsfunnel element");
+}
+
+GST_BOILERPLATE_FULL (FsFunnel, fs_funnel, GstElement, GST_TYPE_ELEMENT,
+ _do_init);
+
+
+
+static GstStateChangeReturn fs_funnel_change_state (GstElement *element,
+ GstStateChange transition);
+
+static GstPad *fs_funnel_request_new_pad (GstElement * element,
+ GstPadTemplate * templ, const gchar * name);
+static void fs_funnel_release_pad (GstElement * element, GstPad * pad);
+
+static GstFlowReturn fs_funnel_chain (GstPad * pad, GstBuffer * buffer);
+static gboolean fs_funnel_event (GstPad * pad, GstEvent * event);
+
+
+typedef struct {
+ GstSegment segment;
+} FsFunnelPadPrivate;
+
+static void
+fs_funnel_base_init (gpointer g_class)
+{
+ GstElementClass *gstelement_class = GST_ELEMENT_CLASS (g_class);
+
+ gst_element_class_set_details (gstelement_class, &fs_funnel_details);
+
+ gst_element_class_add_pad_template (gstelement_class,
+ gst_static_pad_template_get (&funnel_sink_template));
+ gst_element_class_add_pad_template (gstelement_class,
+ gst_static_pad_template_get (&funnel_src_template));
+}
+
+
+static void
+fs_funnel_finalize (GObject * object)
+{
+ G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+fs_funnel_class_init (FsFunnelClass * klass)
+{
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);
+
+ gobject_class->finalize = GST_DEBUG_FUNCPTR (fs_funnel_finalize);
+
+ gstelement_class->request_new_pad =
+ GST_DEBUG_FUNCPTR (fs_funnel_request_new_pad);
+ gstelement_class->release_pad = GST_DEBUG_FUNCPTR (fs_funnel_release_pad);
+ gstelement_class->change_state = GST_DEBUG_FUNCPTR (fs_funnel_change_state);
+}
+
+
+
+static void
+fs_funnel_init (FsFunnel * funnel, FsFunnelClass * g_class)
+{
+ funnel->srcpad = gst_pad_new_from_static_template (&funnel_src_template,
+ "src");
+
+ gst_element_add_pad (GST_ELEMENT (funnel), funnel->srcpad);
+}
+
+
+static GstPad *
+fs_funnel_request_new_pad (GstElement * element, GstPadTemplate * templ,
+ const gchar * name)
+{
+ GstPad *sinkpad;
+ FsFunnel *funnel = FS_FUNNEL (element);
+ FsFunnelPadPrivate *priv = g_slice_alloc0 (sizeof(FsFunnelPadPrivate));
+
+ GST_DEBUG_OBJECT (funnel, "requesting pad");
+
+ sinkpad = gst_pad_new_from_template (templ, name);
+
+ gst_pad_set_chain_function (sinkpad, GST_DEBUG_FUNCPTR (fs_funnel_chain));
+ gst_pad_set_event_function (sinkpad, GST_DEBUG_FUNCPTR (fs_funnel_event));
+
+ gst_segment_init (&priv->segment, GST_FORMAT_UNDEFINED);
+ gst_pad_set_element_private (sinkpad, priv);
+
+ gst_pad_set_active (sinkpad, TRUE);
+
+ gst_element_add_pad (element, sinkpad);
+
+ return sinkpad;
+}
+
+static void
+fs_funnel_release_pad (GstElement * element, GstPad * pad)
+{
+ FsFunnel *funnel = FS_FUNNEL (element);
+ FsFunnelPadPrivate *priv = gst_pad_get_element_private (pad);
+
+ GST_DEBUG_OBJECT (funnel, "releasing pad");
+
+ gst_pad_set_active (pad, FALSE);
+
+ if (priv)
+ g_slice_free1 (sizeof(FsFunnelPadPrivate), priv);
+
+ gst_element_remove_pad (GST_ELEMENT_CAST (funnel), pad);
+}
+
+static GstFlowReturn
+fs_funnel_chain (GstPad * pad, GstBuffer * buffer)
+{
+ GstFlowReturn res;
+ FsFunnel *funnel = FS_FUNNEL (gst_pad_get_parent (pad));
+ FsFunnelPadPrivate *priv = gst_pad_get_element_private (pad);
+ GstEvent *event = NULL;
+ GstClockTime newts;
+
+ GST_DEBUG_OBJECT (funnel, "received buffer %p", buffer);
+
+ GST_OBJECT_LOCK (funnel);
+ if (priv->segment.format == GST_FORMAT_UNDEFINED) {
+ GST_WARNING_OBJECT (funnel, "Got buffer without segment,"
+ " setting segment [0,inf[");
+ gst_segment_set_newsegment_full (&priv->segment, FALSE, 1.0, 1.0,
+ GST_FORMAT_TIME, 0, -1, 0);
+ }
+
+ if (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_TIMESTAMP (buffer)))
+ gst_segment_set_last_stop (&priv->segment, priv->segment.format,
+ GST_BUFFER_TIMESTAMP (buffer));
+
+ newts = gst_segment_to_running_time (&priv->segment,
+ priv->segment.format, GST_BUFFER_TIMESTAMP (buffer));
+ if (newts != GST_BUFFER_TIMESTAMP (buffer)) {
+ buffer = gst_buffer_make_metadata_writable (buffer);
+ GST_BUFFER_TIMESTAMP (buffer) = newts;
+ }
+
+ if (!funnel->has_segment)
+ {
+ event = gst_event_new_new_segment_full (FALSE, 1.0, 1.0, GST_FORMAT_TIME,
+ 0, -1, 0);
+ funnel->has_segment = TRUE;
+ }
+ GST_OBJECT_UNLOCK (funnel);
+
+ if (event) {
+ if (!gst_pad_push_event (funnel->srcpad, event)) {
+ GST_WARNING_OBJECT (funnel, "Could not push out newsegment event");
+ res = GST_FLOW_ERROR;
+ goto out;
+ }
+ }
+
+ res = gst_pad_push (funnel->srcpad, buffer);
+
+ GST_LOG_OBJECT (funnel, "handled buffer %s", gst_flow_get_name (res));
+
+ out:
+ gst_object_unref (funnel);
+
+ return res;
+}
+
+static gboolean
+fs_funnel_event (GstPad * pad, GstEvent * event)
+{
+ FsFunnel *funnel = FS_FUNNEL (gst_pad_get_parent (pad));
+ FsFunnelPadPrivate *priv = gst_pad_get_element_private (pad);
+ gboolean forward = TRUE;
+ gboolean res = TRUE;
+
+ switch (GST_EVENT_TYPE (event)) {
+ case GST_EVENT_NEWSEGMENT:
+ {
+ gboolean update;
+ gdouble rate, arate;
+ GstFormat format;
+ gint64 start;
+ gint64 stop;
+ gint64 time;
+
+ gst_event_parse_new_segment_full (event, &update, &rate, &arate,
+ &format, &start, &stop, &time);
+
+
+ GST_OBJECT_LOCK (funnel);
+ gst_segment_set_newsegment_full (&priv->segment, update, rate, arate,
+ format, start, stop, time);
+ GST_OBJECT_UNLOCK (funnel);
+
+ forward = FALSE;
+ gst_event_unref (event);
+ }
+ break;
+ case GST_EVENT_FLUSH_STOP:
+ {
+ GST_OBJECT_LOCK (funnel);
+ gst_segment_init (&priv->segment, GST_FORMAT_UNDEFINED);
+ GST_OBJECT_UNLOCK (funnel);
+ }
+ break;
+ default:
+ break;
+ }
+
+
+ if (forward)
+ res = gst_pad_push_event (funnel->srcpad, event);
+
+ gst_object_unref (funnel);
+
+ return res;
+}
+
+
+static void
+reset_pad (gpointer data, gpointer user_data)
+{
+ GstPad *pad = data;
+ FsFunnelPadPrivate *priv = gst_pad_get_element_private (pad);
+
+ GST_OBJECT_LOCK (pad);
+ gst_segment_init (&priv->segment, GST_FORMAT_UNDEFINED);
+ GST_OBJECT_UNLOCK (pad);
+}
+
+static GstStateChangeReturn
+fs_funnel_change_state (GstElement *element, GstStateChange transition)
+{
+ FsFunnel *funnel = FS_FUNNEL (element);
+ GstStateChangeReturn ret;
+
+ switch (transition) {
+ case GST_STATE_CHANGE_READY_TO_PAUSED:
+ {
+ GstIterator *iter = gst_element_iterate_sink_pads (element);
+ GstIteratorResult res;
+
+ do {
+ res = gst_iterator_foreach (iter, reset_pad, NULL);
+ } while (res == GST_ITERATOR_RESYNC);
+
+ gst_iterator_free (iter);
+
+ if (res == GST_ITERATOR_ERROR)
+ return GST_STATE_CHANGE_FAILURE;
+
+ GST_OBJECT_LOCK (funnel);
+ funnel->has_segment = FALSE;
+ GST_OBJECT_UNLOCK (funnel);
+ }
+ break;
+ default:
+ break;
+ }
+
+ ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
+
+ return ret;
+}
+
+
+static gboolean plugin_init (GstPlugin * plugin)
+{
+ return gst_element_register (plugin, "fsfunnel",
+ GST_RANK_NONE, FS_TYPE_FUNNEL);
+}
+
+GST_PLUGIN_DEFINE (
+ GST_VERSION_MAJOR,
+ GST_VERSION_MINOR,
+ "fsfunnel",
+ "Farsight Funnel plugin",
+ plugin_init,
+ VERSION,
+ "LGPL",
+ "Farsight",
+ "http://farsight.freedesktop.org/"
+)
diff --git a/gst/funnel/fs-funnel.h b/gst/funnel/fs-funnel.h
new file mode 100644
index 0000000..c1d5094
--- /dev/null
+++ b/gst/funnel/fs-funnel.h
@@ -0,0 +1,69 @@
+/*
+ * Farsight2 - Farsight Funnel element
+ *
+ * Copyright 2007 Collabora Ltd.
+ * @author: Olivier Crete <olivier.crete at collabora.co.uk>
+ * Copyright 2007 Nokia Corp.
+ *
+ * fs-funnel.h: Simple Funnel element
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+#ifndef __FS_FUNNEL_H__
+#define __FS_FUNNEL_H__
+
+#include <gst/gst.h>
+
+G_BEGIN_DECLS
+
+#define FS_TYPE_FUNNEL \
+ (fs_funnel_get_type ())
+#define FS_FUNNEL(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST((obj),FS_TYPE_FUNNEL,FsFunnel))
+#define FS_FUNNEL_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST((klass),FS_TYPE_FUNNEL,FsFunnelClass))
+#define FS_IS_FUNNEL(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE((obj),FS_TYPE_FUNNEL))
+#define FS_IS_FUNNEL_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE((klass),FS_TYPE_FUNNEL))
+
+typedef struct _FsFunnel FsFunnel;
+typedef struct _FsFunnelClass FsFunnelClass;
+
+/**
+ * FsFunnel:
+ *
+ * Opaque #FsFunnel data structure.
+ */
+struct _FsFunnel {
+ GstElement element;
+
+ /*< private >*/
+ GstPad *srcpad;
+
+ gboolean has_segment;
+};
+
+struct _FsFunnelClass {
+ GstElementClass parent_class;
+};
+
+GType fs_funnel_get_type (void);
+
+G_END_DECLS
+
+#endif /* __FS_FUNNEL_H__ */
diff --git a/gst/funnel/gstfsfunnel.c b/gst/funnel/gstfsfunnel.c
deleted file mode 100644
index 1b6d041..0000000
--- a/gst/funnel/gstfsfunnel.c
+++ /dev/null
@@ -1,346 +0,0 @@
-/*
- * Farsight2 - Farsight Funnel element
- *
- * Copyright 2007 Collabora Ltd.
- * @author: Olivier Crete <olivier.crete at collabora.co.uk>
- * Copyright 2007 Nokia Corp.
- *
- * gstfsfunnel.c: Simple Funnel element
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * SECTION:element-funnel
- * @short_description: N-to-1 simple funnel
- *
- * Takes packets from various input sinks into one output source
- */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include "gstfsfunnel.h"
-
-GST_DEBUG_CATEGORY_STATIC (fs_funnel_debug);
-#define GST_CAT_DEFAULT fs_funnel_debug
-
-static const GstElementDetails gst_fsfunnel_details =
-GST_ELEMENT_DETAILS(
- "Farsight Funnel pipe fitting",
- "Generic",
- "N-to-1 pipe fitting",
- "Olivier Crete <olivier.crete at collabora.co.uk>");
-
-static GstStaticPadTemplate funnel_sink_template =
- GST_STATIC_PAD_TEMPLATE ("sink%d",
- GST_PAD_SINK,
- GST_PAD_REQUEST,
- GST_STATIC_CAPS_ANY);
-
-static GstStaticPadTemplate funnel_src_template =
- GST_STATIC_PAD_TEMPLATE ("src",
- GST_PAD_SRC,
- GST_PAD_ALWAYS,
- GST_STATIC_CAPS_ANY);
-
-
-static void
-_do_init (GType type)
-{
- GST_DEBUG_CATEGORY_INIT
- (fs_funnel_debug, "fsfunnel", 0, "fsfunnel element");
-}
-
-GST_BOILERPLATE_FULL (FsFunnel, fs_funnel, GstElement, GST_TYPE_ELEMENT,
- _do_init);
-
-
-
-static GstStateChangeReturn fs_funnel_change_state (GstElement *element,
- GstStateChange transition);
-
-static GstPad *fs_funnel_request_new_pad (GstElement * element,
- GstPadTemplate * templ, const gchar * name);
-static void fs_funnel_release_pad (GstElement * element, GstPad * pad);
-
-static GstFlowReturn fs_funnel_chain (GstPad * pad, GstBuffer * buffer);
-static gboolean fs_funnel_event (GstPad * pad, GstEvent * event);
-
-
-typedef struct {
- GstSegment segment;
-} FsFunnelPadPrivate;
-
-static void
-fs_funnel_base_init (gpointer g_class)
-{
- GstElementClass *gstelement_class = GST_ELEMENT_CLASS (g_class);
-
- gst_element_class_set_details (gstelement_class, &gst_fsfunnel_details);
-
- gst_element_class_add_pad_template (gstelement_class,
- gst_static_pad_template_get (&funnel_sink_template));
- gst_element_class_add_pad_template (gstelement_class,
- gst_static_pad_template_get (&funnel_src_template));
-}
-
-
-static void
-fs_funnel_finalize (GObject * object)
-{
- G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-static void
-fs_funnel_class_init (FsFunnelClass * klass)
-{
- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);
-
- gobject_class->finalize = GST_DEBUG_FUNCPTR (fs_funnel_finalize);
-
- gstelement_class->request_new_pad =
- GST_DEBUG_FUNCPTR (fs_funnel_request_new_pad);
- gstelement_class->release_pad = GST_DEBUG_FUNCPTR (fs_funnel_release_pad);
- gstelement_class->change_state = GST_DEBUG_FUNCPTR (fs_funnel_change_state);
-}
-
-
-
-static void
-fs_funnel_init (FsFunnel * funnel, FsFunnelClass * g_class)
-{
- funnel->srcpad = gst_pad_new_from_static_template (&funnel_src_template,
- "src");
-
- gst_element_add_pad (GST_ELEMENT (funnel), funnel->srcpad);
-}
-
-
-static GstPad *
-fs_funnel_request_new_pad (GstElement * element, GstPadTemplate * templ,
- const gchar * name)
-{
- GstPad *sinkpad;
- FsFunnel *funnel = FS_FUNNEL (element);
- FsFunnelPadPrivate *priv = g_slice_alloc0 (sizeof(FsFunnelPadPrivate));
-
- GST_DEBUG_OBJECT (funnel, "requesting pad");
-
- sinkpad = gst_pad_new_from_template (templ, name);
-
- gst_pad_set_chain_function (sinkpad, GST_DEBUG_FUNCPTR (fs_funnel_chain));
- gst_pad_set_event_function (sinkpad, GST_DEBUG_FUNCPTR (fs_funnel_event));
-
- gst_segment_init (&priv->segment, GST_FORMAT_UNDEFINED);
- gst_pad_set_element_private (sinkpad, priv);
-
- gst_pad_set_active (sinkpad, TRUE);
-
- gst_element_add_pad (element, sinkpad);
-
- return sinkpad;
-}
-
-static void
-fs_funnel_release_pad (GstElement * element, GstPad * pad)
-{
- FsFunnel *funnel = FS_FUNNEL (element);
- FsFunnelPadPrivate *priv = gst_pad_get_element_private (pad);
-
- GST_DEBUG_OBJECT (funnel, "releasing pad");
-
- gst_pad_set_active (pad, FALSE);
-
- if (priv)
- g_slice_free1 (sizeof(FsFunnelPadPrivate), priv);
-
- gst_element_remove_pad (GST_ELEMENT_CAST (funnel), pad);
-}
-
-static GstFlowReturn
-fs_funnel_chain (GstPad * pad, GstBuffer * buffer)
-{
- GstFlowReturn res;
- FsFunnel *funnel = FS_FUNNEL (gst_pad_get_parent (pad));
- FsFunnelPadPrivate *priv = gst_pad_get_element_private (pad);
- GstEvent *event = NULL;
- GstClockTime newts;
-
- GST_DEBUG_OBJECT (funnel, "received buffer %p", buffer);
-
- GST_OBJECT_LOCK (funnel);
- if (priv->segment.format == GST_FORMAT_UNDEFINED) {
- GST_WARNING_OBJECT (funnel, "Got buffer without segment,"
- " setting segment [0,inf[");
- gst_segment_set_newsegment_full (&priv->segment, FALSE, 1.0, 1.0,
- GST_FORMAT_TIME, 0, -1, 0);
- }
-
- if (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_TIMESTAMP (buffer)))
- gst_segment_set_last_stop (&priv->segment, priv->segment.format,
- GST_BUFFER_TIMESTAMP (buffer));
-
- newts = gst_segment_to_running_time (&priv->segment,
- priv->segment.format, GST_BUFFER_TIMESTAMP (buffer));
- if (newts != GST_BUFFER_TIMESTAMP (buffer)) {
- buffer = gst_buffer_make_metadata_writable (buffer);
- GST_BUFFER_TIMESTAMP (buffer) = newts;
- }
-
- if (!funnel->has_segment)
- {
- event = gst_event_new_new_segment_full (FALSE, 1.0, 1.0, GST_FORMAT_TIME,
- 0, -1, 0);
- funnel->has_segment = TRUE;
- }
- GST_OBJECT_UNLOCK (funnel);
-
- if (event) {
- if (!gst_pad_push_event (funnel->srcpad, event)) {
- GST_WARNING_OBJECT (funnel, "Could not push out newsegment event");
- res = GST_FLOW_ERROR;
- goto out;
- }
- }
-
- res = gst_pad_push (funnel->srcpad, buffer);
-
- GST_LOG_OBJECT (funnel, "handled buffer %s", gst_flow_get_name (res));
-
- out:
- gst_object_unref (funnel);
-
- return res;
-}
-
-static gboolean
-fs_funnel_event (GstPad * pad, GstEvent * event)
-{
- FsFunnel *funnel = FS_FUNNEL (gst_pad_get_parent (pad));
- FsFunnelPadPrivate *priv = gst_pad_get_element_private (pad);
- gboolean forward = TRUE;
- gboolean res = TRUE;
-
- switch (GST_EVENT_TYPE (event)) {
- case GST_EVENT_NEWSEGMENT:
- {
- gboolean update;
- gdouble rate, arate;
- GstFormat format;
- gint64 start;
- gint64 stop;
- gint64 time;
-
- gst_event_parse_new_segment_full (event, &update, &rate, &arate,
- &format, &start, &stop, &time);
-
-
- GST_OBJECT_LOCK (funnel);
- gst_segment_set_newsegment_full (&priv->segment, update, rate, arate,
- format, start, stop, time);
- GST_OBJECT_UNLOCK (funnel);
-
- forward = FALSE;
- gst_event_unref (event);
- }
- break;
- case GST_EVENT_FLUSH_STOP:
- {
- GST_OBJECT_LOCK (funnel);
- gst_segment_init (&priv->segment, GST_FORMAT_UNDEFINED);
- GST_OBJECT_UNLOCK (funnel);
- }
- break;
- default:
- break;
- }
-
-
- if (forward)
- res = gst_pad_push_event (funnel->srcpad, event);
-
- gst_object_unref (funnel);
-
- return res;
-}
-
-
-static void
-reset_pad (gpointer data, gpointer user_data)
-{
- GstPad *pad = data;
- FsFunnelPadPrivate *priv = gst_pad_get_element_private (pad);
-
- GST_OBJECT_LOCK (pad);
- gst_segment_init (&priv->segment, GST_FORMAT_UNDEFINED);
- GST_OBJECT_UNLOCK (pad);
-}
-
-static GstStateChangeReturn
-fs_funnel_change_state (GstElement *element, GstStateChange transition)
-{
- FsFunnel *funnel = FS_FUNNEL (element);
- GstStateChangeReturn ret;
-
- switch (transition) {
- case GST_STATE_CHANGE_READY_TO_PAUSED:
- {
- GstIterator *iter = gst_element_iterate_sink_pads (element);
- GstIteratorResult res;
-
- do {
- res = gst_iterator_foreach (iter, reset_pad, NULL);
- } while (res == GST_ITERATOR_RESYNC);
-
- gst_iterator_free (iter);
-
- if (res == GST_ITERATOR_ERROR)
- return GST_STATE_CHANGE_FAILURE;
-
- GST_OBJECT_LOCK (funnel);
- funnel->has_segment = FALSE;
- GST_OBJECT_UNLOCK (funnel);
- }
- break;
- default:
- break;
- }
-
- ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
-
- return ret;
-}
-
-
-static gboolean plugin_init (GstPlugin * plugin)
-{
- return gst_element_register (plugin, "fsfunnel",
- GST_RANK_NONE, FS_TYPE_FUNNEL);
-}
-
-GST_PLUGIN_DEFINE (
- GST_VERSION_MAJOR,
- GST_VERSION_MINOR,
- "fsfunnel",
- "Farsight Funnel plugin",
- plugin_init,
- VERSION,
- "LGPL",
- "Farsight",
- "http://farsight.freedesktop.org/"
-)
diff --git a/gst/funnel/gstfsfunnel.h b/gst/funnel/gstfsfunnel.h
deleted file mode 100644
index f22082e..0000000
--- a/gst/funnel/gstfsfunnel.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Farsight2 - Farsight Funnel element
- *
- * Copyright 2007 Collabora Ltd.
- * @author: Olivier Crete <olivier.crete at collabora.co.uk>
- * Copyright 2007 Nokia Corp.
- *
- * gstfsfunnel.h: Simple Funnel element
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-
-#ifndef __FS_FUNNEL_H__
-#define __FS_FUNNEL_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define FS_TYPE_FUNNEL \
- (fs_funnel_get_type ())
-#define FS_FUNNEL(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj),FS_TYPE_FUNNEL,FsFunnel))
-#define FS_FUNNEL_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass),FS_TYPE_FUNNEL,FsFunnelClass))
-#define FS_IS_FUNNEL(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj),FS_TYPE_FUNNEL))
-#define FS_IS_FUNNEL_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass),FS_TYPE_FUNNEL))
-
-typedef struct _FsFunnel FsFunnel;
-typedef struct _FsFunnelClass FsFunnelClass;
-
-/**
- * FsFunnel:
- *
- * Opaque #FsFunnel data structure.
- */
-struct _FsFunnel {
- GstElement element;
-
- /*< private >*/
- GstPad *srcpad;
-
- gboolean has_segment;
-};
-
-struct _FsFunnelClass {
- GstElementClass parent_class;
-};
-
-GType fs_funnel_get_type (void);
-
-G_END_DECLS
-
-#endif /* __FS_FUNNEL_H__ */
--
1.5.6.5
More information about the farsight-commits
mailing list