From 63e961ff7a30a4f31b3c01bb3ff66cdbc2c10191 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 8 Oct 2018 23:45:28 +0100 Subject: [PATCH] stereo: remove plugin which has been merged into audiofx in -good https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/issues/457 --- configure.ac | 2 - docs/plugins/Makefile.am | 1 - docs/plugins/gst-plugins-bad-plugins-docs.sgml | 2 - docs/plugins/gst-plugins-bad-plugins-sections.txt | 16 -- docs/plugins/gst-plugins-bad-plugins.args | 20 -- docs/plugins/gst-plugins-bad-plugins.hierarchy | 1 - docs/plugins/inspect/plugin-stereo.xml | 34 ---- gst/meson.build | 2 +- gst/stereo/.gitignore | 7 - gst/stereo/Makefile.am | 9 - gst/stereo/gststereo.c | 214 ---------------------- gst/stereo/gststereo.h | 55 ------ gst/stereo/meson.build | 13 -- meson_options.txt | 1 - 14 files changed, 1 insertion(+), 376 deletions(-) delete mode 100644 docs/plugins/inspect/plugin-stereo.xml delete mode 100644 gst/stereo/.gitignore delete mode 100644 gst/stereo/Makefile.am delete mode 100644 gst/stereo/gststereo.c delete mode 100644 gst/stereo/gststereo.h delete mode 100644 gst/stereo/meson.build diff --git a/configure.ac b/configure.ac index 9a047e9..fc7f126 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 887dc4e..ab659a5 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 9ac8e67..4a84128 100644 --- a/docs/plugins/gst-plugins-bad-plugins-docs.sgml +++ b/docs/plugins/gst-plugins-bad-plugins-docs.sgml @@ -235,7 +235,6 @@ - @@ -397,7 +396,6 @@ - diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt index 8803963..30167ee 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
-element-stereo -stereo -GstStereo - -GstStereoClass -GST_STEREO -GST_STEREO_CAST -GST_IS_STEREO -GST_STEREO_CLASS -GST_IS_STEREO_CLASS -GST_TYPE_STEREO - -gst_stereo_get_type -
- -
element-stretch stretch GstStretch diff --git a/docs/plugins/gst-plugins-bad-plugins.args b/docs/plugins/gst-plugins-bad-plugins.args index 04cab22..a2ab77d 100644 --- a/docs/plugins/gst-plugins-bad-plugins.args +++ b/docs/plugins/gst-plugins-bad-plugins.args @@ -17889,26 +17889,6 @@ -GstStereo::active -gboolean - -rw -active -active. -TRUE - - - -GstStereo::stereo -gfloat -[0,1] -rw -stereo -stereo. -0.1 - - - MpegTSParse::pat-info GValueArray diff --git a/docs/plugins/gst-plugins-bad-plugins.hierarchy b/docs/plugins/gst-plugins-bad-plugins.hierarchy index 5d8516e..799e2a7 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 9b43df7..0000000 --- a/docs/plugins/inspect/plugin-stereo.xml +++ /dev/null @@ -1,34 +0,0 @@ - - stereo - Muck with the stereo signal, enhance its 'stereo-ness' - ../../gst/stereo/.libs/libgststereo.so - libgststereo.so - 1.15.0.1 - LGPL - gst-plugins-bad - GStreamer Bad Plug-ins git - Unknown package origin - - - stereo - Stereo effect - Filter/Effect/Audio - Muck with the stereo signal to enhance its 'stereo-ness' - Erik Walthinsen <omega@cse.ogi.edu> - - - sink - sink - always -
audio/x-raw, format=(string)S16LE, rate=(int)[ 1, 2147483647 ], channels=(int)2
- - - src - source - always -
audio/x-raw, format=(string)S16LE, rate=(int)[ 1, 2147483647 ], channels=(int)2
- - - - - \ No newline at end of file diff --git a/gst/meson.build b/gst/meson.build index 9809f1a..55883d4 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 08f5ed3..0000000 --- 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 21c07e3..0000000 --- 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 95ca352..0000000 --- a/gst/stereo/gststereo.c +++ /dev/null @@ -1,214 +0,0 @@ -/* 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., 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 -#include -#include -#include - -#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 "); - - 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 bd7b6c1..0000000 --- a/gst/stereo/gststereo.h +++ /dev/null @@ -1,55 +0,0 @@ -/* 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., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - - -#ifndef __GST_STEREO_H__ -#define __GST_STEREO_H__ - - -#include -#include - -#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 6a766aa..0000000 --- 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 e9cc3e5..07846b4 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') -- 2.7.4