summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2018-10-08 23:45:28 +0100
committerTim-Philipp Müller <tim@centricular.com>2018-12-25 13:06:40 +0100
commit63e961ff7a30a4f31b3c01bb3ff66cdbc2c10191 (patch)
treef97215693fc8cb061b3066d4227b099b68646f86
parent373580c7be89f248f3bf87de41a6e4fbf4459cc4 (diff)
downloadgstreamer-plugins-bad-63e961ff7a30a4f31b3c01bb3ff66cdbc2c10191.tar.gz
stereo: remove plugin which has been merged into audiofx in -good
https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/issues/457
-rw-r--r--configure.ac2
-rw-r--r--docs/plugins/Makefile.am1
-rw-r--r--docs/plugins/gst-plugins-bad-plugins-docs.sgml2
-rw-r--r--docs/plugins/gst-plugins-bad-plugins-sections.txt16
-rw-r--r--docs/plugins/gst-plugins-bad-plugins.args20
-rw-r--r--docs/plugins/gst-plugins-bad-plugins.hierarchy1
-rw-r--r--docs/plugins/inspect/plugin-stereo.xml34
-rw-r--r--gst/meson.build2
-rw-r--r--gst/stereo/.gitignore7
-rw-r--r--gst/stereo/Makefile.am9
-rw-r--r--gst/stereo/gststereo.c214
-rw-r--r--gst/stereo/gststereo.h55
-rw-r--r--gst/stereo/meson.build13
-rw-r--r--meson_options.txt1
14 files changed, 1 insertions, 376 deletions
diff --git a/configure.ac b/configure.ac
index 9a047e917..fc7f126e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -485,7 +485,6 @@ AG_GST_CHECK_PLUGIN(siren)
AG_GST_CHECK_PLUGIN(smooth)
AG_GST_CHECK_PLUGIN(speed)
AG_GST_CHECK_PLUGIN(subenc)
-AG_GST_CHECK_PLUGIN(stereo)
AG_GST_CHECK_PLUGIN(timecode)
AG_GST_CHECK_PLUGIN(videofilters)
AG_GST_CHECK_PLUGIN(videoparsers)
@@ -2572,7 +2571,6 @@ gst/siren/Makefile
gst/smooth/Makefile
gst/speed/Makefile
gst/subenc/Makefile
-gst/stereo/Makefile
gst/timecode/Makefile
gst/videofilters/Makefile
gst/videoparsers/Makefile
diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index 887dc4e91..ab659a559 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -154,7 +154,6 @@ EXTRA_HFILES = \
$(top_srcdir)/gst/rawparse/gstvideoparse.h \
$(top_srcdir)/gst/sdp/gstsdpdemux.h \
$(top_srcdir)/gst/speed/gstspeed.h \
- $(top_srcdir)/gst/stereo/gststereo.h \
$(top_srcdir)/gst/videosignal/gstvideoanalyse.h \
$(top_srcdir)/sys/dvb/gstdvbsrc.h \
$(top_srcdir)/sys/shm/gstshmsink.h \
diff --git a/docs/plugins/gst-plugins-bad-plugins-docs.sgml b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
index 9ac8e6707..4a84128b5 100644
--- a/docs/plugins/gst-plugins-bad-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
@@ -235,7 +235,6 @@
<xi:include href="xml/element-srtenc.xml" />
<xi:include href="xml/element-srtpdec.xml" />
<xi:include href="xml/element-srtpenc.xml" />
- <xi:include href="xml/element-stereo.xml" />
<xi:include href="xml/element-stretch.xml" />
<xi:include href="xml/element-synaescope.xml" />
<xi:include href="xml/element-teletextdec.xml" />
@@ -397,7 +396,6 @@
<xi:include href="xml/plugin-spandsp.xml" />
<xi:include href="xml/plugin-speed.xml" />
<xi:include href="xml/plugin-srtp.xml" />
- <xi:include href="xml/plugin-stereo.xml" />
<xi:include href="xml/plugin-subenc.xml" />
<xi:include href="xml/plugin-teletext.xml" />
<xi:include href="xml/plugin-timecode.xml" />
diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt
index 88039634f..30167ee0c 100644
--- a/docs/plugins/gst-plugins-bad-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-bad-plugins-sections.txt
@@ -3491,22 +3491,6 @@ gst_srtp_enc_get_type
</SECTION>
<SECTION>
-<FILE>element-stereo</FILE>
-<TITLE>stereo</TITLE>
-GstStereo
-<SUBSECTION Standard>
-GstStereoClass
-GST_STEREO
-GST_STEREO_CAST
-GST_IS_STEREO
-GST_STEREO_CLASS
-GST_IS_STEREO_CLASS
-GST_TYPE_STEREO
-<SUBSECTION Private>
-gst_stereo_get_type
-</SECTION>
-
-<SECTION>
<FILE>element-stretch</FILE>
<TITLE>stretch</TITLE>
GstStretch
diff --git a/docs/plugins/gst-plugins-bad-plugins.args b/docs/plugins/gst-plugins-bad-plugins.args
index 04cab220f..a2ab77d01 100644
--- a/docs/plugins/gst-plugins-bad-plugins.args
+++ b/docs/plugins/gst-plugins-bad-plugins.args
@@ -17889,26 +17889,6 @@
</ARG>
<ARG>
-<NAME>GstStereo::active</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>active</NICK>
-<BLURB>active.</BLURB>
-<DEFAULT>TRUE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstStereo::stereo</NAME>
-<TYPE>gfloat</TYPE>
-<RANGE>[0,1]</RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>stereo</NICK>
-<BLURB>stereo.</BLURB>
-<DEFAULT>0.1</DEFAULT>
-</ARG>
-
-<ARG>
<NAME>MpegTSParse::pat-info</NAME>
<TYPE>GValueArray</TYPE>
<RANGE></RANGE>
diff --git a/docs/plugins/gst-plugins-bad-plugins.hierarchy b/docs/plugins/gst-plugins-bad-plugins.hierarchy
index 5d8516e9c..799e2a706 100644
--- a/docs/plugins/gst-plugins-bad-plugins.hierarchy
+++ b/docs/plugins/gst-plugins-bad-plugins.hierarchy
@@ -137,7 +137,6 @@ GObject
ladspa-sine-so-sine-faac
ladspa-sine-so-sine-fcaa
GstOFA
- GstStereo
GstAudioMixMatrix
GstBayer2RGB
GstDebugSpy
diff --git a/docs/plugins/inspect/plugin-stereo.xml b/docs/plugins/inspect/plugin-stereo.xml
deleted file mode 100644
index 9b43df7d7..000000000
--- a/docs/plugins/inspect/plugin-stereo.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<plugin>
- <name>stereo</name>
- <description>Muck with the stereo signal, enhance its &apos;stereo-ness&apos;</description>
- <filename>../../gst/stereo/.libs/libgststereo.so</filename>
- <basename>libgststereo.so</basename>
- <version>1.15.0.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>stereo</name>
- <longname>Stereo effect</longname>
- <class>Filter/Effect/Audio</class>
- <description>Muck with the stereo signal to enhance its &apos;stereo-ness&apos;</description>
- <author>Erik Walthinsen &lt;omega@cse.ogi.edu&gt;</author>
- <pads>
- <caps>
- <name>sink</name>
- <direction>sink</direction>
- <presence>always</presence>
- <details>audio/x-raw, format=(string)S16LE, rate=(int)[ 1, 2147483647 ], channels=(int)2</details>
- </caps>
- <caps>
- <name>src</name>
- <direction>source</direction>
- <presence>always</presence>
- <details>audio/x-raw, format=(string)S16LE, rate=(int)[ 1, 2147483647 ], channels=(int)2</details>
- </caps>
- </pads>
- </element>
- </elements>
-</plugin> \ No newline at end of file
diff --git a/gst/meson.build b/gst/meson.build
index 9809f1a56..55883d465 100644
--- a/gst/meson.build
+++ b/gst/meson.build
@@ -9,7 +9,7 @@ foreach plugin : ['accurip', 'adpcmdec', 'adpcmenc', 'aiff', 'asfmux',
'midi', 'mpegdemux', 'mpegpsmux', 'mpegtsdemux', 'mpegtsmux',
'mxf', 'netsim', 'onvif', 'pcapparse', 'pnm', 'proxy',
'rawparse', 'removesilence', 'sdp', 'segmentclip', 'siren',
- 'smooth', 'speed', 'stereo', 'subenc', 'timecode',
+ 'smooth', 'speed', 'subenc', 'timecode',
'videofilters', 'videoframe_audiolevel', 'videoparsers',
'videosignal', 'vmnc', 'y4m', 'yadif']
if not get_option(plugin).disabled()
diff --git a/gst/stereo/.gitignore b/gst/stereo/.gitignore
deleted file mode 100644
index 08f5ed37d..000000000
--- a/gst/stereo/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-Makefile
-Makefile.in
-*.o
-*.lo
-*.la
-.deps
-.libs
diff --git a/gst/stereo/Makefile.am b/gst/stereo/Makefile.am
deleted file mode 100644
index 21c07e304..000000000
--- a/gst/stereo/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-
-plugin_LTLIBRARIES = libgststereo.la
-
-libgststereo_la_SOURCES = gststereo.c
-libgststereo_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS)
-libgststereo_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION)
-libgststereo_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-
-noinst_HEADERS = gststereo.h
diff --git a/gst/stereo/gststereo.c b/gst/stereo/gststereo.c
deleted file mode 100644
index 95ca3526a..000000000
--- a/gst/stereo/gststereo.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- *
- * 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 St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-/* This effect is borrowed from xmms-0.6.1, though I mangled it so badly in
- * the process of copying it over that the xmms people probably won't want
- * any credit for it ;-)
- */
-/**
- * SECTION:element-stereo
- * @title: stereo
- *
- * Create a wide stereo effect.
- *
- * ## Example pipelines
- * |[
- * gst-launch-1.0 -v filesrc location=sine.ogg ! oggdemux ! vorbisdec ! audioconvert ! stereo ! audioconvert ! audioresample ! alsasink
- * ]| Play an Ogg/Vorbis file.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include "gststereo.h"
-
-#include <gst/gst.h>
-#include <gst/base/gstbasetransform.h>
-#include <gst/audio/audio.h>
-#include <gst/audio/gstaudiofilter.h>
-
-#define ALLOWED_CAPS \
- "audio/x-raw," \
- " format = "GST_AUDIO_NE (S16) "," \
- " rate = (int) [ 1, MAX ]," \
- " channels = (int) 2"
-
-/* Stereo signals and args */
-enum
-{
- /* FILL ME */
- LAST_SIGNAL
-};
-
-enum
-{
- PROP_0,
- PROP_ACTIVE,
- PROP_STEREO
-};
-
-static void gst_stereo_set_property (GObject * object, guint prop_id,
- const GValue * value, GParamSpec * pspec);
-static void gst_stereo_get_property (GObject * object, guint prop_id,
- GValue * value, GParamSpec * pspec);
-
-static GstFlowReturn gst_stereo_transform_ip (GstBaseTransform * base,
- GstBuffer * outbuf);
-
-G_DEFINE_TYPE (GstStereo, gst_stereo, GST_TYPE_AUDIO_FILTER);
-
-static void
-gst_stereo_class_init (GstStereoClass * klass)
-{
- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
- GstBaseTransformClass *trans_class = GST_BASE_TRANSFORM_CLASS (klass);
- GstAudioFilterClass *audiofilter_class = GST_AUDIO_FILTER_CLASS (klass);
- GstCaps *caps;
-
- gst_element_class_set_static_metadata (element_class, "Stereo effect",
- "Filter/Effect/Audio",
- "Muck with the stereo signal to enhance its 'stereo-ness'",
- "Erik Walthinsen <omega@cse.ogi.edu>");
-
- caps = gst_caps_from_string (ALLOWED_CAPS);
- gst_audio_filter_class_add_pad_templates (audiofilter_class, caps);
- gst_caps_unref (caps);
-
- gobject_class->set_property = gst_stereo_set_property;
- gobject_class->get_property = gst_stereo_get_property;
-
- g_object_class_install_property (gobject_class, PROP_ACTIVE,
- g_param_spec_boolean ("active", "active", "active",
- TRUE,
- G_PARAM_READWRITE | GST_PARAM_CONTROLLABLE | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property (gobject_class, PROP_STEREO,
- g_param_spec_float ("stereo", "stereo", "stereo",
- 0.0, 1.0, 0.1f,
- G_PARAM_READWRITE | GST_PARAM_CONTROLLABLE | G_PARAM_STATIC_STRINGS));
-
- trans_class->transform_ip = GST_DEBUG_FUNCPTR (gst_stereo_transform_ip);
-}
-
-static void
-gst_stereo_init (GstStereo * stereo)
-{
- stereo->active = TRUE;
- stereo->stereo = 0.1f;
-}
-
-static GstFlowReturn
-gst_stereo_transform_ip (GstBaseTransform * base, GstBuffer * outbuf)
-{
- GstStereo *stereo = GST_STEREO (base);
- gint samples;
- gint i;
- gdouble avg, ldiff, rdiff, tmp;
- gdouble mul = stereo->stereo;
- gint16 *data;
- GstMapInfo info;
-
- if (!gst_buffer_map (outbuf, &info, GST_MAP_READWRITE))
- return GST_FLOW_ERROR;
-
- data = (gint16 *) info.data;
- samples = info.size / 2;
-
- if (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_TIMESTAMP (outbuf)))
- gst_object_sync_values (GST_OBJECT (stereo), GST_BUFFER_TIMESTAMP (outbuf));
-
- if (stereo->active) {
- for (i = 0; i < samples / 2; i += 2) {
- avg = (data[i] + data[i + 1]) / 2;
- ldiff = data[i] - avg;
- rdiff = data[i + 1] - avg;
-
- tmp = avg + ldiff * mul;
- if (tmp < -32768)
- tmp = -32768;
- if (tmp > 32767)
- tmp = 32767;
- data[i] = tmp;
-
- tmp = avg + rdiff * mul;
- if (tmp < -32768)
- tmp = -32768;
- if (tmp > 32767)
- tmp = 32767;
- data[i + 1] = tmp;
- }
- }
-
- gst_buffer_unmap (outbuf, &info);
-
- return GST_FLOW_OK;
-}
-
-static void
-gst_stereo_set_property (GObject * object, guint prop_id, const GValue * value,
- GParamSpec * pspec)
-{
- GstStereo *stereo = GST_STEREO (object);
-
- switch (prop_id) {
- case PROP_ACTIVE:
- stereo->active = g_value_get_boolean (value);
- break;
- case PROP_STEREO:
- stereo->stereo = g_value_get_float (value) * 10.0;
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static void
-gst_stereo_get_property (GObject * object, guint prop_id, GValue * value,
- GParamSpec * pspec)
-{
- GstStereo *stereo = GST_STEREO (object);
-
- switch (prop_id) {
- case PROP_ACTIVE:
- g_value_set_boolean (value, stereo->active);
- break;
- case PROP_STEREO:
- g_value_set_float (value, stereo->stereo / 10.0);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static gboolean
-plugin_init (GstPlugin * plugin)
-{
- return gst_element_register (plugin, "stereo", GST_RANK_NONE,
- GST_TYPE_STEREO);
-}
-
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
- GST_VERSION_MINOR,
- stereo,
- "Muck with the stereo signal, enhance its 'stereo-ness'",
- plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/stereo/gststereo.h b/gst/stereo/gststereo.h
deleted file mode 100644
index bd7b6c15b..000000000
--- a/gst/stereo/gststereo.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- *
- * 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 St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-
-#ifndef __GST_STEREO_H__
-#define __GST_STEREO_H__
-
-
-#include <gst/gst.h>
-#include <gst/audio/gstaudiofilter.h>
-
-#define GST_TYPE_STEREO \
- (gst_stereo_get_type())
-#define GST_STEREO(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_STEREO,GstStereo))
-#define GST_STEREO_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_STEREO,GstStereoClass))
-#define GST_IS_STEREO(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_STEREO))
-#define GST_IS_STEREO_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_STEREO))
-
-typedef struct _GstStereo GstStereo;
-typedef struct _GstStereoClass GstStereoClass;
-
-struct _GstStereo {
- GstAudioFilter element;
-
- gboolean active;
- gfloat stereo;
-};
-
-struct _GstStereoClass {
- GstAudioFilterClass parent_class;
-};
-
-GType gst_stereo_get_type(void);
-
-#endif /* __GST_STEREO_H__ */
diff --git a/gst/stereo/meson.build b/gst/stereo/meson.build
deleted file mode 100644
index 6a766aaf0..000000000
--- a/gst/stereo/meson.build
+++ /dev/null
@@ -1,13 +0,0 @@
-stereo_sources = [
- 'gststereo.c',
-]
-
-gststereo = library('gststereo',
- stereo_sources,
- c_args : gst_plugins_bad_args,
- include_directories : [configinc],
- dependencies : [gstbase_dep, gstaudio_dep],
- install : true,
- install_dir : plugins_install_dir,
-)
-pkgconfig.generate(gststereo, install_dir : plugins_pkgconfig_install_dir)
diff --git a/meson_options.txt b/meson_options.txt
index e9cc3e52f..07846b4fb 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -54,7 +54,6 @@ option('segmentclip', type : 'feature', value : 'auto')
option('siren', type : 'feature', value : 'auto')
option('smooth', type : 'feature', value : 'auto')
option('speed', type : 'feature', value : 'auto')
-option('stereo', type : 'feature', value : 'auto')
option('subenc', type : 'feature', value : 'auto')
option('timecode', type : 'feature', value : 'auto')
option('videofilters', type : 'feature', value : 'auto')