From cc210b8ff677c9e3e170d72b71a66b0130da1965 Mon Sep 17 00:00:00 2001 From: Stefan Sauer Date: Sun, 20 Nov 2011 20:16:03 +0100 Subject: [PATCH] passthrough: remove obsolete element It is not built by default. We have identity for some of the needs and otherwise audio/videofilter base classes. --- gst/passthrough/.gitignore | 7 - gst/passthrough/Makefile.am | 10 - gst/passthrough/filter.func | 18 -- gst/passthrough/gstpassthrough.c | 306 ----------------------------- gst/passthrough/gstpassthrough.h | 79 -------- gst/passthrough/passthrough.vcproj | 151 -------------- 6 files changed, 571 deletions(-) delete mode 100644 gst/passthrough/.gitignore delete mode 100644 gst/passthrough/Makefile.am delete mode 100644 gst/passthrough/filter.func delete mode 100644 gst/passthrough/gstpassthrough.c delete mode 100644 gst/passthrough/gstpassthrough.h delete mode 100644 gst/passthrough/passthrough.vcproj diff --git a/gst/passthrough/.gitignore b/gst/passthrough/.gitignore deleted file mode 100644 index 08f5ed37d8..0000000000 --- a/gst/passthrough/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -Makefile -Makefile.in -*.o -*.lo -*.la -.deps -.libs diff --git a/gst/passthrough/Makefile.am b/gst/passthrough/Makefile.am deleted file mode 100644 index e3dc9e3410..0000000000 --- a/gst/passthrough/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ - -plugin_LTLIBRARIES = libgstpassthrough.la - -libgstpassthrough_la_SOURCES = gstpassthrough.c -libgstpassthrough_la_CFLAGS = $(GST_CFLAGS) -libgstpassthrough_la_LIBADD = -libgstpassthrough_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -libgstpassthrough_la_LIBTOOLFLAGS = --tag=disable-static - -noinst_HEADERS = gstpassthrough.h filter.func diff --git a/gst/passthrough/filter.func b/gst/passthrough/filter.func deleted file mode 100644 index 99a9308bbe..0000000000 --- a/gst/passthrough/filter.func +++ /dev/null @@ -1,18 +0,0 @@ -{ - guint j; - static long int sample = 0; /* you can use this to count samples */ - - /* - * process data here - * *data contains the original 8 or 16 bit samples and is modified in place - * channels are interleaved in input data - */ - - /* do nothing */ - - for (j = 0; j < num_samples; j++) - { - data[j] = data[j]; - } - sample += num_samples; -} diff --git a/gst/passthrough/gstpassthrough.c b/gst/passthrough/gstpassthrough.c deleted file mode 100644 index 3951b26783..0000000000 --- a/gst/passthrough/gstpassthrough.c +++ /dev/null @@ -1,306 +0,0 @@ -/* -*- c-basic-offset: 2 -*- - * GStreamer - * Copyright (C) 1999-2001 Erik Walthinsen - * - * 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 -#include -#include -#include "gstpassthrough.h" - -#define PASSTHRU_BUF_SIZE 4096 -#define PASSTHRU_NUM_BUFS 4 - -enum -{ - /* FILL ME */ - LAST_SIGNAL -}; - -/* static guint gst_filter_signals[LAST_SIGNAL] = { 0 }; */ - -enum -{ - ARG_0, - ARG_SILENT -}; - -static GstStaticPadTemplate passthrough_sink_template = - GST_STATIC_PAD_TEMPLATE ("sink", - GST_PAD_SINK, - GST_PAD_ALWAYS, - GST_STATIC_CAPS (GST_AUDIO_INT_PAD_TEMPLATE_CAPS "; " - GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_CAPS) - ); - -static GstStaticPadTemplate passthrough_src_template = - GST_STATIC_PAD_TEMPLATE ("src", - GST_PAD_SRC, - GST_PAD_ALWAYS, - GST_STATIC_CAPS (GST_AUDIO_INT_PAD_TEMPLATE_CAPS "; " - GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_CAPS) - ); - -static void passthrough_class_init (GstPassthroughClass * klass); -static void passthrough_base_init (GstPassthroughClass * klass); -static void passthrough_init (GstPassthrough * filter); - -static void passthrough_set_property (GObject * object, guint prop_id, - const GValue * value, GParamSpec * pspec); -static void passthrough_get_property (GObject * object, guint prop_id, - GValue * value, GParamSpec * pspec); - -static GstPadLinkReturn passthrough_connect_sink (GstPad * pad, - const GstCaps * caps); - -static void passthrough_chain (GstPad * pad, GstData * _data); -static void inline passthrough_fast_float_chain (gfloat * data, - guint numsamples); -static void inline passthrough_fast_16bit_chain (gint16 * data, - guint numsamples); -static void inline passthrough_fast_8bit_chain (gint8 * data, guint numsamples); - -static GstElementClass *parent_class = NULL; - -static GstPadLinkReturn -passthrough_connect_sink (GstPad * pad, const GstCaps * caps) -{ - const gchar *mimetype; - GstPassthrough *filter; - GstStructure *structure; - - g_return_val_if_fail (pad != NULL, GST_PAD_LINK_DELAYED); - g_return_val_if_fail (caps != NULL, GST_PAD_LINK_DELAYED); - - filter = GST_PASSTHROUGH (gst_pad_get_parent (pad)); - g_return_val_if_fail (filter != NULL, GST_PAD_LINK_REFUSED); - g_return_val_if_fail (GST_IS_PASSTHROUGH (filter), GST_PAD_LINK_REFUSED); - - structure = gst_caps_get_structure (caps, 0); - - mimetype = gst_structure_get_name (structure); - gst_structure_get_int (structure, "rate", &filter->rate); - gst_structure_get_int (structure, "channels", &filter->channels); - gst_structure_get_int (structure, "width", &filter->width); - gst_structure_get_int (structure, "endianness", &filter->endianness); - - if (strcmp (mimetype, "audio/x-raw-int") == 0) { - filter->format = GST_PASSTHROUGH_FORMAT_INT; - - gst_structure_get_int (structure, "depth", &filter->depth); - gst_structure_get_boolean (structure, "signed", &filter->is_signed); - - if (!filter->silent) { - g_print ("Passthrough : channels %d, rate %d\n", filter->channels, - filter->rate); - g_print - ("Passthrough : format int, bit width %d, endianness %d, signed %s\n", - filter->width, filter->endianness, filter->is_signed ? "yes" : "no"); - } - } else if (strcmp (mimetype, "audio/x-raw-float") == 0) { - filter->format = GST_PASSTHROUGH_FORMAT_FLOAT; - - if (!filter->silent) { - g_print ("Passthrough : channels %d, rate %d\n", filter->channels, - filter->rate); - g_print ("Passthrough : format float, width %d\n", filter->width); - } - } - - return gst_pad_try_set_caps (filter->srcpad, caps); -} - -GType -gst_passthrough_get_type (void) -{ - static GType passthrough_type = 0; - - if (!passthrough_type) { - static const GTypeInfo passthrough_info = { - sizeof (GstPassthroughClass), - (GBaseInitFunc) passthrough_base_init, - NULL, - (GClassInitFunc) passthrough_class_init, - NULL, - NULL, - sizeof (GstPassthrough), - 0, - (GInstanceInitFunc) passthrough_init, - }; - - passthrough_type = - g_type_register_static (GST_TYPE_ELEMENT, "GstPassthrough", - &passthrough_info, 0); - } - return passthrough_type; -} - -static void -passthrough_base_init (GstPassthroughClass * klass) -{ - GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - - gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&passthrough_src_template)); - gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&passthrough_sink_template)); - gst_element_class_set_details_simple (element_class, "Passthrough", - "Filter/Effect/Audio", - "Transparent filter for audio/raw (boilerplate for effects)", - "Thomas , " "Andy Wingo "); -} - -static void -passthrough_class_init (GstPassthroughClass * klass) -{ - GObjectClass *gobject_class; - GstElementClass *gstelement_class; - - gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; - - parent_class = g_type_class_peek_parent (klass); - - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SILENT, - g_param_spec_boolean ("silent", "silent", "silent", TRUE, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - - gobject_class->set_property = passthrough_set_property; - gobject_class->get_property = passthrough_get_property; -} - -static void -passthrough_init (GstPassthrough * filter) -{ - filter->srcpad = - gst_pad_new_from_static_template (&passthrough_src_template, "src"); - gst_element_add_pad (GST_ELEMENT (filter), filter->srcpad); - filter->sinkpad = - gst_pad_new_from_static_template (&passthrough_sink_template, "sink"); - gst_element_add_pad (GST_ELEMENT (filter), filter->sinkpad); - - gst_pad_set_link_function (filter->sinkpad, passthrough_connect_sink); - gst_pad_set_chain_function (filter->sinkpad, passthrough_chain); - - filter->silent = FALSE; -} - -static void -passthrough_chain (GstPad * pad, GstData * _data) -{ - GstBuffer *buf = GST_BUFFER (_data); - GstPassthrough *filter; - gint16 *int_data; - gfloat *float_data; - - g_return_if_fail (pad != NULL); - g_return_if_fail (GST_IS_PAD (pad)); - g_return_if_fail (buf != NULL); - - filter = GST_PASSTHROUGH (gst_pad_get_parent (pad)); - g_return_if_fail (filter != NULL); - g_return_if_fail (GST_IS_PASSTHROUGH (filter)); - - switch (filter->format) { - case GST_PASSTHROUGH_FORMAT_INT: - int_data = (gint16 *) GST_BUFFER_DATA (buf); - - switch (filter->width) { - case 16: - passthrough_fast_16bit_chain (int_data, GST_BUFFER_SIZE (buf) / 2); - break; - case 8: - passthrough_fast_8bit_chain ((gint8 *) int_data, - GST_BUFFER_SIZE (buf)); - break; - } - - break; - case GST_PASSTHROUGH_FORMAT_FLOAT: - float_data = (gfloat *) GST_BUFFER_DATA (buf); - - passthrough_fast_float_chain (float_data, - GST_BUFFER_SIZE (buf) / sizeof (gfloat)); - - break; - } - - gst_pad_push (filter->srcpad, GST_DATA (buf)); -} - -static void inline -passthrough_fast_float_chain (gfloat * data, guint num_samples) -#include "filter.func" - static void inline - passthrough_fast_16bit_chain (gint16 * data, guint num_samples) -#include "filter.func" - static void inline - passthrough_fast_8bit_chain (gint8 * data, guint num_samples) -#include "filter.func" - static void - passthrough_set_property (GObject * object, guint prop_id, - const GValue * value, GParamSpec * pspec) -{ - GstPassthrough *filter; - - g_return_if_fail (GST_IS_PASSTHROUGH (object)); - filter = GST_PASSTHROUGH (object); - - switch (prop_id) { - case ARG_SILENT: - filter->silent = g_value_get_boolean (value); - break; - default: - break; - } -} - -static void -passthrough_get_property (GObject * object, guint prop_id, GValue * value, - GParamSpec * pspec) -{ - GstPassthrough *filter; - - g_return_if_fail (GST_IS_PASSTHROUGH (object)); - filter = GST_PASSTHROUGH (object); - - switch (prop_id) { - case ARG_SILENT: - g_value_set_boolean (value, filter->silent); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static gboolean -plugin_init (GstPlugin * plugin) -{ - return gst_element_register (plugin, "passthrough", - GST_RANK_NONE, GST_TYPE_PASSTHROUGH); -} - -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, - GST_VERSION_MINOR, - "passthrough", - "Transparent filter for audio/raw (boilerplate for effects)", - plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/passthrough/gstpassthrough.h b/gst/passthrough/gstpassthrough.h deleted file mode 100644 index 722b08f531..0000000000 --- a/gst/passthrough/gstpassthrough.h +++ /dev/null @@ -1,79 +0,0 @@ -/* -*- c-basic-offset: 2 -*- - * GStreamer - * Copyright (C) <1999> Erik Walthinsen - * - * 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_PASSTHROUGH_H__ -#define __GST_PASSTHROUGH_H__ - -#include - -G_BEGIN_DECLS - -#define GST_TYPE_PASSTHROUGH \ - (gst_passthrough_get_type()) -#define GST_PASSTHROUGH(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_PASSTHROUGH,GstPassthrough)) -#define GST_PASSTHROUGH_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_PASSTHROUGH,GstPassthroughClass)) -#define GST_PASSTHROUGH_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_PASSTHROUGH,GstPassthroughClass)) -#define GST_IS_PASSTHROUGH(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_PASSTHROUGH)) -#define GST_IS_PASSTHROUGH_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_PASSTHROUGH)) - -typedef struct _GstPassthrough GstPassthrough; -typedef struct _GstPassthroughClass GstPassthroughClass; -typedef enum _GstPassthroughFormat GstPassthroughFormat; - -enum _GstPassthroughFormat { - GST_PASSTHROUGH_FORMAT_INT, - GST_PASSTHROUGH_FORMAT_FLOAT -}; - -struct _GstPassthrough { - GstElement element; - - GstPad *sinkpad, *srcpad; - - gboolean silent; - - /* the next are valid for both int and float */ - GstPassthroughFormat format; - guint rate; - guint channels; - guint width; - guint endianness; - guint buffer_size; - - /* the next are valid only for int formats */ - guint depth; - gboolean is_signed; -}; - -struct _GstPassthroughClass { - GstElementClass parent_class; -}; - -GType gst_passthrough_get_type(void); - -G_END_DECLS - -#endif /* __GST_PASSTHROUGH_H__ */ diff --git a/gst/passthrough/passthrough.vcproj b/gst/passthrough/passthrough.vcproj deleted file mode 100644 index cdea19dad4..0000000000 --- a/gst/passthrough/passthrough.vcproj +++ /dev/null @@ -1,151 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -