From 5aa6c44ee8048d9c156137e7d906093b6afd6953 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Fri, 8 Feb 2008 02:49:20 +0000 Subject: [PATCH] Move the equalizer plugin across from -bad Original commit message from CVS: * configure.ac: * docs/plugins/Makefile.am: * docs/plugins/gst-plugins-good-plugins-docs.sgml: * docs/plugins/gst-plugins-good-plugins-sections.txt: * docs/plugins/gst-plugins-good-plugins.args: * docs/plugins/gst-plugins-good-plugins.hierarchy: * docs/plugins/gst-plugins-good-plugins.interfaces: * docs/plugins/inspect/plugin-equalizer.xml: * gst/equalizer/Makefile.am: * tests/check/Makefile.am: * tests/examples/Makefile.am: Move the equalizer plugin across from -bad * tests/check/elements/.cvsignore: Add equalizer, audiosincwband and audiosincwlimit * tests/check/elements/equalizer.c: Fix compiler warnings --- ChangeLog | 21 +++ configure.ac | 3 + docs/plugins/Makefile.am | 4 + .../gst-plugins-good-plugins-docs.sgml | 4 + .../gst-plugins-good-plugins-sections.txt | 62 ++++++++ docs/plugins/gst-plugins-good-plugins.args | 140 ++++++++++++++++++ .../gst-plugins-good-plugins.hierarchy | 5 + .../gst-plugins-good-plugins.interfaces | 4 + docs/plugins/inspect/plugin-equalizer.xml | 76 ++++++++++ gst/equalizer/Makefile.am | 8 - tests/check/Makefile.am | 1 + tests/check/elements/.gitignore | 3 + tests/check/elements/equalizer.c | 14 +- tests/examples/Makefile.am | 4 +- 14 files changed, 330 insertions(+), 19 deletions(-) create mode 100644 docs/plugins/inspect/plugin-equalizer.xml diff --git a/ChangeLog b/ChangeLog index 890ebb2f38..c25c911287 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2008-02-08 Jan Schmidt + + * configure.ac: + * docs/plugins/Makefile.am: + * docs/plugins/gst-plugins-good-plugins-docs.sgml: + * docs/plugins/gst-plugins-good-plugins-sections.txt: + * docs/plugins/gst-plugins-good-plugins.args: + * docs/plugins/gst-plugins-good-plugins.hierarchy: + * docs/plugins/gst-plugins-good-plugins.interfaces: + * docs/plugins/inspect/plugin-equalizer.xml: + * gst/equalizer/Makefile.am: + * tests/check/Makefile.am: + * tests/examples/Makefile.am: + Move the equalizer plugin across from -bad + + * tests/check/elements/.cvsignore: + Add equalizer, audiosincwband and audiosincwlimit + + * tests/check/elements/equalizer.c: + Fix compiler warnings + 2008-02-07 Jan Schmidt * configure.ac: diff --git a/configure.ac b/configure.ac index 3efd8aee45..0fe788f128 100644 --- a/configure.ac +++ b/configure.ac @@ -89,6 +89,7 @@ GST_PLUGINS_ALL="\ cutter \ debug \ effectv \ + equalizer \ id3demux \ icydemux \ flx \ @@ -1012,6 +1013,7 @@ gst/avi/Makefile gst/cutter/Makefile gst/debug/Makefile gst/effectv/Makefile +gst/equalizer/Makefile gst/id3demux/Makefile gst/icydemux/Makefile gst/goom/Makefile @@ -1066,6 +1068,7 @@ po/Makefile.in tests/Makefile tests/check/Makefile tests/examples/Makefile +tests/examples/equalizer/Makefile tests/examples/level/Makefile tests/examples/rtp/Makefile tests/files/Makefile diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am index b54d287384..8384b765e3 100644 --- a/docs/plugins/Makefile.am +++ b/docs/plugins/Makefile.am @@ -81,6 +81,10 @@ EXTRA_HFILES = \ $(top_srcdir)/ext/cdio/gstcdiocddasrc.h \ $(top_srcdir)/ext/dv/gstdvdec.h \ $(top_srcdir)/ext/dv/gstdvdemux.h \ + $(top_srcdir)/gst/equalizer/gstiirequalizer.h \ + $(top_srcdir)/gst/equalizer/gstiirequalizer3bands.h \ + $(top_srcdir)/gst/equalizer/gstiirequalizer10bands.h \ + $(top_srcdir)/gst/equalizer/gstiirequalizernbands.h \ $(top_srcdir)/ext/esd/esdsink.h \ $(top_srcdir)/ext/flac/gstflacdec.h \ $(top_srcdir)/ext/hal/gsthalaudiosink.h \ diff --git a/docs/plugins/gst-plugins-good-plugins-docs.sgml b/docs/plugins/gst-plugins-good-plugins-docs.sgml index 9a99842c02..b711d34cce 100644 --- a/docs/plugins/gst-plugins-good-plugins-docs.sgml +++ b/docs/plugins/gst-plugins-good-plugins-docs.sgml @@ -36,6 +36,9 @@ + + + @@ -102,6 +105,7 @@ + diff --git a/docs/plugins/gst-plugins-good-plugins-sections.txt b/docs/plugins/gst-plugins-good-plugins-sections.txt index b4ee20b9c0..db844a8b2e 100644 --- a/docs/plugins/gst-plugins-good-plugins-sections.txt +++ b/docs/plugins/gst-plugins-good-plugins-sections.txt @@ -375,6 +375,68 @@ GST_IS_DVDEMUX_CLASS gst_dvdemux_get_type +
+gstiirequalizer +GstIirEqualize +GstIirEqualizer + +GstIirEqualizerBand +GstIirEqualizerClass +GST_IIR_EQUALIZER +GST_IIR_EQUALIZER_CLASS +GST_IS_IIR_EQUALIZER +GST_IS_IIR_EQUALIZER_CLASS +GST_TYPE_IIR_EQUALIZER +gst_iir_equalizer_get_type +gst_iir_equalizer_compute_frequencies +
+ +
+element-equalizer-3bands +equalizer-3bands +GstIirEqualizer3Bands + +GstIirEqualizer3BandsClass +GST_IIR_EQUALIZER_3BANDS +GST_IIR_EQUALIZER_3BANDS_CLASS +GST_IS_IIR_EQUALIZER_3BANDS +GST_IS_IIR_EQUALIZER_3BANDS_CLASS +GST_TYPE_IIR_EQUALIZER_3BANDS +gst_iir_equalizer_3bands_get_type +
+ +
+element-equalizer-10bands +equalizer-10bands +GstIirEqualizer10Bands + +GstIirEqualizer10BandsClass +GST_IIR_EQUALIZER_10BANDS +GST_IIR_EQUALIZER_10BANDS_CLASS +GST_IS_IIR_EQUALIZER_10BANDS +GST_IS_IIR_EQUALIZER_10BANDS_CLASS +GST_TYPE_IIR_EQUALIZER_10BANDS +gst_iir_equalizer_10bands_get_type +
+ +
+element-equalizer-nbands +equalizer-nbands +GstIirEqualizerNBands + +GstIirEqualizerNBandsClass +GST_IIR_EQUALIZER_NBANDS +GST_IIR_EQUALIZER_NBANDS_CLASS +GST_IS_IIR_EQUALIZER_NBANDS +GST_IS_IIR_EQUALIZER_NBANDS_CLASS +GST_TYPE_IIR_EQUALIZER_NBANDS +gst_iir_equalizer_nbands_get_type + +HIGHEST_FREQ +LOWEST_FREQ +ProcessFunc +
+
element-esdsink esdsink diff --git a/docs/plugins/gst-plugins-good-plugins.args b/docs/plugins/gst-plugins-good-plugins.args index 9d6d8b6946..f67e7379cc 100644 --- a/docs/plugins/gst-plugins-good-plugins.args +++ b/docs/plugins/gst-plugins-good-plugins.args @@ -1,3 +1,143 @@ + +GstIirEqualizer10Bands::band0 +gdouble +[-24,12] +rw +29 Hz +gain for the frequency band 29 Hz, ranging from -24 dB to +12 dB. +0 + + + +GstIirEqualizer10Bands::band1 +gdouble +[-24,12] +rw +59 Hz +gain for the frequency band 59 Hz, ranging from -24 dB to +12 dB. +0 + + + +GstIirEqualizer10Bands::band2 +gdouble +[-24,12] +rw +119 Hz +gain for the frequency band 119 Hz, ranging from -24 dB to +12 dB. +0 + + + +GstIirEqualizer10Bands::band3 +gdouble +[-24,12] +rw +227 Hz +gain for the frequency band 227 Hz, ranging from -24 dB to +12 dB. +0 + + + +GstIirEqualizer10Bands::band4 +gdouble +[-24,12] +rw +474 Hz +gain for the frequency band 474 Hz, ranging from -24 dB to +12 dB. +0 + + + +GstIirEqualizer10Bands::band5 +gdouble +[-24,12] +rw +947 Hz +gain for the frequency band 947 Hz, ranging from -24 dB to +12 dB. +0 + + + +GstIirEqualizer10Bands::band6 +gdouble +[-24,12] +rw +1889 Hz +gain for the frequency band 1889 Hz, ranging from -24 dB to +12 dB. +0 + + + +GstIirEqualizer10Bands::band7 +gdouble +[-24,12] +rw +3770 Hz +gain for the frequency band 3770 Hz, ranging from -24 dB to +12 dB. +0 + + + +GstIirEqualizer10Bands::band8 +gdouble +[-24,12] +rw +7523 Hz +gain for the frequency band 7523 Hz, ranging from -24 dB to +12 dB. +0 + + + +GstIirEqualizer10Bands::band9 +gdouble +[-24,12] +rw +15011 Hz +gain for the frequency band 15011 Hz, ranging from -24 dB to +12 dB. +0 + + + +GstIirEqualizer3Bands::band0 +gdouble +[-24,12] +rw +110 Hz +gain for the frequency band 100 Hz, ranging from -24.0 to +12.0. +0 + + + +GstIirEqualizer3Bands::band1 +gdouble +[-24,12] +rw +1100 Hz +gain for the frequency band 1100 Hz, ranging from -24.0 to +12.0. +0 + + + +GstIirEqualizer3Bands::band2 +gdouble +[-24,12] +rw +11 kHz +gain for the frequency band 11 kHz, ranging from -24.0 to +12.0. +0 + + + +GstIirEqualizerNBands::num-bands +guint +[1,64] +rwx +num-bands +number of different bands to use. +10 + + GstOssSrc::device gchararray diff --git a/docs/plugins/gst-plugins-good-plugins.hierarchy b/docs/plugins/gst-plugins-good-plugins.hierarchy index 2926ee44b1..5a72aa53f4 100644 --- a/docs/plugins/gst-plugins-good-plugins.hierarchy +++ b/docs/plugins/gst-plugins-good-plugins.hierarchy @@ -49,6 +49,11 @@ GObject GstDVDec GstCairoTextOverlay GstBaseTransform + GstAudioFilter + GstIirEqualizer + GstIirEqualizerNBands + GstIirEqualizer3Bands + GstIirEqualizer10Bands GstAudioPanorama GstCairoTimeOverlay GstVideoFilter diff --git a/docs/plugins/gst-plugins-good-plugins.interfaces b/docs/plugins/gst-plugins-good-plugins.interfaces index 7e2e281431..a85d9aa4c7 100644 --- a/docs/plugins/gst-plugins-good-plugins.interfaces +++ b/docs/plugins/gst-plugins-good-plugins.interfaces @@ -9,6 +9,10 @@ GstGConfAudioSink GstChildProxy GstDecodeBin GstChildProxy GstID3Mux GstTagSetter GstID3Tag GstTagSetter +GstIirEqualizer GstChildProxy +GstIirEqualizerNBands GstChildProxy +GstIirEqualizer3Bands GstChildProxy +GstIirEqualizer10Bands GstChildProxy GstLame GstTagSetter GstOssMixerElement GstImplementsInterface GstMixer GstOssSrc GstImplementsInterface GstMixer diff --git a/docs/plugins/inspect/plugin-equalizer.xml b/docs/plugins/inspect/plugin-equalizer.xml new file mode 100644 index 0000000000..4db8562e63 --- /dev/null +++ b/docs/plugins/inspect/plugin-equalizer.xml @@ -0,0 +1,76 @@ + + equalizer + GStreamer audio equalizers + ../../gst/equalizer/.libs/libgstequalizer.so + libgstequalizer.so + 0.10.6.1 + LGPL + gst-plugins-good + GStreamer Good Plug-ins CVS/prerelease + Unknown package origin + + + equalizer-10bands + 10 Band Equalizer + Filter/Effect/Audio + Direct Form 10 band IIR equalizer + Stefan Kost <ensonic@users.sf.net> + + + src + source + always +
audio/x-raw-int, depth=(int)16, width=(int)16, endianness=(int)1234, signed=(boolean)true, rate=(int)[ 1000, 2147483647 ], channels=(int)[ 1, 2147483647 ]; audio/x-raw-float, width=(int){ 32, 64 }, endianness=(int)1234, rate=(int)[ 1000, 2147483647 ], channels=(int)[ 1, 2147483647 ]
+ + + sink + sink + always +
audio/x-raw-int, depth=(int)16, width=(int)16, endianness=(int)1234, signed=(boolean)true, rate=(int)[ 1000, 2147483647 ], channels=(int)[ 1, 2147483647 ]; audio/x-raw-float, width=(int){ 32, 64 }, endianness=(int)1234, rate=(int)[ 1000, 2147483647 ], channels=(int)[ 1, 2147483647 ]
+ + + + + equalizer-3bands + 3 Band Equalizer + Filter/Effect/Audio + Direct Form 3 band IIR equalizer + Stefan Kost <ensonic@users.sf.net> + + + src + source + always +
audio/x-raw-int, depth=(int)16, width=(int)16, endianness=(int)1234, signed=(boolean)true, rate=(int)[ 1000, 2147483647 ], channels=(int)[ 1, 2147483647 ]; audio/x-raw-float, width=(int){ 32, 64 }, endianness=(int)1234, rate=(int)[ 1000, 2147483647 ], channels=(int)[ 1, 2147483647 ]
+ + + sink + sink + always +
audio/x-raw-int, depth=(int)16, width=(int)16, endianness=(int)1234, signed=(boolean)true, rate=(int)[ 1000, 2147483647 ], channels=(int)[ 1, 2147483647 ]; audio/x-raw-float, width=(int){ 32, 64 }, endianness=(int)1234, rate=(int)[ 1000, 2147483647 ], channels=(int)[ 1, 2147483647 ]
+ + + + + equalizer-nbands + N Band Equalizer + Filter/Effect/Audio + Direct Form IIR equalizer + Benjamin Otte <otte@gnome.org>, Stefan Kost <ensonic@users.sf.net> + + + src + source + always +
audio/x-raw-int, depth=(int)16, width=(int)16, endianness=(int)1234, signed=(boolean)true, rate=(int)[ 1000, 2147483647 ], channels=(int)[ 1, 2147483647 ]; audio/x-raw-float, width=(int){ 32, 64 }, endianness=(int)1234, rate=(int)[ 1000, 2147483647 ], channels=(int)[ 1, 2147483647 ]
+ + + sink + sink + always +
audio/x-raw-int, depth=(int)16, width=(int)16, endianness=(int)1234, signed=(boolean)true, rate=(int)[ 1000, 2147483647 ], channels=(int)[ 1, 2147483647 ]; audio/x-raw-float, width=(int){ 32, 64 }, endianness=(int)1234, rate=(int)[ 1000, 2147483647 ], channels=(int)[ 1, 2147483647 ]
+ + + + + \ No newline at end of file diff --git a/gst/equalizer/Makefile.am b/gst/equalizer/Makefile.am index ceb6877d2f..a5f132e5ae 100644 --- a/gst/equalizer/Makefile.am +++ b/gst/equalizer/Makefile.am @@ -12,11 +12,3 @@ libgstequalizer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstiirequalizer.h -if HAVE_GTK -noinst_PROGRAMS = demo -endif - -demo_SOURCES = demo.c -demo_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GTK_CFLAGS) -demo_LDFLAGS = $(GST_BASE_LIBS) $(GST_LIBS) $(GTK_LIBS) - diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 68abd27531..ff791a6c72 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -63,6 +63,7 @@ check_PROGRAMS = \ elements/audiowsinclimit \ elements/avimux \ elements/avisubtitle \ + elements/equalizer \ elements/icydemux \ elements/id3demux \ elements/level \ diff --git a/tests/check/elements/.gitignore b/tests/check/elements/.gitignore index 33fe170142..1a8a5c5800 100644 --- a/tests/check/elements/.gitignore +++ b/tests/check/elements/.gitignore @@ -4,12 +4,15 @@ apev2mux audioamplify audiochebband audiocheblimit +audiosincwband +audiosincwlimit audiodynamic audioinvert audiopanorama autodetect avimux avisubtitle +equalizer cmmldec cmmlenc icydemux diff --git a/tests/check/elements/equalizer.c b/tests/check/elements/equalizer.c index 1563f4b434..44270d0cec 100644 --- a/tests/check/elements/equalizer.c +++ b/tests/check/elements/equalizer.c @@ -89,7 +89,7 @@ cleanup_equalizer (GstElement * equalizer) GST_START_TEST (test_equalizer_5bands_passthrough) { GstElement *equalizer; - GstBuffer *inbuffer, *outbuffer; + GstBuffer *inbuffer; GstCaps *caps; gdouble *in, *res; gint i; @@ -134,7 +134,7 @@ GST_END_TEST; GST_START_TEST (test_equalizer_5bands_minus_24) { GstElement *equalizer; - GstBuffer *inbuffer, *outbuffer; + GstBuffer *inbuffer; GstCaps *caps; gdouble *in, *res, rms_in, rms_out; gint i; @@ -150,7 +150,7 @@ GST_START_TEST (test_equalizer_5bands_minus_24) gst_child_proxy_get_child_by_index (GST_CHILD_PROXY (equalizer), i); fail_unless (band != NULL); - g_object_set (G_OBJECT (band), "gain", -24.0, 0); + g_object_set (G_OBJECT (band), "gain", -24.0, NULL); g_object_unref (G_OBJECT (band)); } @@ -197,7 +197,7 @@ GST_END_TEST; GST_START_TEST (test_equalizer_5bands_plus_12) { GstElement *equalizer; - GstBuffer *inbuffer, *outbuffer; + GstBuffer *inbuffer; GstCaps *caps; gdouble *in, *res, rms_in, rms_out; gint i; @@ -213,7 +213,7 @@ GST_START_TEST (test_equalizer_5bands_plus_12) gst_child_proxy_get_child_by_index (GST_CHILD_PROXY (equalizer), i); fail_unless (band != NULL); - g_object_set (G_OBJECT (band), "gain", 12.0, 0); + g_object_set (G_OBJECT (band), "gain", 12.0, NULL); g_object_unref (G_OBJECT (band)); } @@ -260,9 +260,6 @@ GST_END_TEST; GST_START_TEST (test_equalizer_band_number_changing) { GstElement *equalizer; - GstBuffer *inbuffer, *outbuffer; - GstCaps *caps; - gdouble *in, *res; gint i; equalizer = setup_equalizer (); @@ -273,7 +270,6 @@ GST_START_TEST (test_equalizer_band_number_changing) for (i = 0; i < 5; i++) { GstObject *band; - gdouble freq; band = gst_child_proxy_get_child_by_index (GST_CHILD_PROXY (equalizer), i); fail_unless (band != NULL); diff --git a/tests/examples/Makefile.am b/tests/examples/Makefile.am index b5530f123c..1f9144f3fc 100644 --- a/tests/examples/Makefile.am +++ b/tests/examples/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = level rtp +SUBDIRS = level rtp equalizer -DIST_SUBDIRS = level rtp +DIST_SUBDIRS = level rtp equalizer