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
This commit is contained in:
Jan Schmidt 2008-02-08 02:49:20 +00:00
parent c54301aabe
commit 5aa6c44ee8
14 changed files with 330 additions and 19 deletions

View file

@ -1,3 +1,24 @@
2008-02-08 Jan Schmidt <jan.schmidt@sun.com>
* 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 <jan.schmidt@sun.com>
* configure.ac:

View file

@ -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

View file

@ -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 \

View file

@ -36,6 +36,9 @@
<xi:include href="xml/element-directsoundsink.xml" />
<xi:include href="xml/element-dvdec.xml" />
<xi:include href="xml/element-dvdemux.xml" />
<xi:include href="xml/element-equalizer-10bands.xml" />
<xi:include href="xml/element-equalizer-3bands.xml" />
<xi:include href="xml/element-equalizer-nbands.xml" />
<xi:include href="xml/element-esdsink.xml" />
<xi:include href="xml/element-flacdec.xml" />
<xi:include href="xml/element-gamma.xml" />
@ -102,6 +105,7 @@
<xi:include href="xml/plugin-directsound.xml" />
<xi:include href="xml/plugin-dv.xml" />
<xi:include href="xml/plugin-efence.xml" />
<xi:include href="xml/plugin-equalizer.xml" />
<xi:include href="xml/plugin-effectv.xml" />
<xi:include href="xml/plugin-esdsink.xml" />
<xi:include href="xml/plugin-flac.xml" />

View file

@ -375,6 +375,68 @@ GST_IS_DVDEMUX_CLASS
gst_dvdemux_get_type
</SECTION>
<SECTION>
<FILE>gstiirequalizer</FILE>
<TITLE>GstIirEqualize</TITLE>
GstIirEqualizer
<SUBSECTION Standard>
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
</SECTION>
<SECTION>
<FILE>element-equalizer-3bands</FILE>
<TITLE>equalizer-3bands</TITLE>
GstIirEqualizer3Bands
<SUBSECTION Standard>
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
</SECTION>
<SECTION>
<FILE>element-equalizer-10bands</FILE>
<TITLE>equalizer-10bands</TITLE>
GstIirEqualizer10Bands
<SUBSECTION Standard>
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
</SECTION>
<SECTION>
<FILE>element-equalizer-nbands</FILE>
<TITLE>equalizer-nbands</TITLE>
GstIirEqualizerNBands
<SUBSECTION Standard>
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
<SUBSECTION Private>
HIGHEST_FREQ
LOWEST_FREQ
ProcessFunc
</SECTION>
<SECTION>
<FILE>element-esdsink</FILE>
<TITLE>esdsink</TITLE>

View file

@ -1,3 +1,143 @@
<ARG>
<NAME>GstIirEqualizer10Bands::band0</NAME>
<TYPE>gdouble</TYPE>
<RANGE>[-24,12]</RANGE>
<FLAGS>rw</FLAGS>
<NICK>29 Hz</NICK>
<BLURB>gain for the frequency band 29 Hz, ranging from -24 dB to +12 dB.</BLURB>
<DEFAULT>0</DEFAULT>
</ARG>
<ARG>
<NAME>GstIirEqualizer10Bands::band1</NAME>
<TYPE>gdouble</TYPE>
<RANGE>[-24,12]</RANGE>
<FLAGS>rw</FLAGS>
<NICK>59 Hz</NICK>
<BLURB>gain for the frequency band 59 Hz, ranging from -24 dB to +12 dB.</BLURB>
<DEFAULT>0</DEFAULT>
</ARG>
<ARG>
<NAME>GstIirEqualizer10Bands::band2</NAME>
<TYPE>gdouble</TYPE>
<RANGE>[-24,12]</RANGE>
<FLAGS>rw</FLAGS>
<NICK>119 Hz</NICK>
<BLURB>gain for the frequency band 119 Hz, ranging from -24 dB to +12 dB.</BLURB>
<DEFAULT>0</DEFAULT>
</ARG>
<ARG>
<NAME>GstIirEqualizer10Bands::band3</NAME>
<TYPE>gdouble</TYPE>
<RANGE>[-24,12]</RANGE>
<FLAGS>rw</FLAGS>
<NICK>227 Hz</NICK>
<BLURB>gain for the frequency band 227 Hz, ranging from -24 dB to +12 dB.</BLURB>
<DEFAULT>0</DEFAULT>
</ARG>
<ARG>
<NAME>GstIirEqualizer10Bands::band4</NAME>
<TYPE>gdouble</TYPE>
<RANGE>[-24,12]</RANGE>
<FLAGS>rw</FLAGS>
<NICK>474 Hz</NICK>
<BLURB>gain for the frequency band 474 Hz, ranging from -24 dB to +12 dB.</BLURB>
<DEFAULT>0</DEFAULT>
</ARG>
<ARG>
<NAME>GstIirEqualizer10Bands::band5</NAME>
<TYPE>gdouble</TYPE>
<RANGE>[-24,12]</RANGE>
<FLAGS>rw</FLAGS>
<NICK>947 Hz</NICK>
<BLURB>gain for the frequency band 947 Hz, ranging from -24 dB to +12 dB.</BLURB>
<DEFAULT>0</DEFAULT>
</ARG>
<ARG>
<NAME>GstIirEqualizer10Bands::band6</NAME>
<TYPE>gdouble</TYPE>
<RANGE>[-24,12]</RANGE>
<FLAGS>rw</FLAGS>
<NICK>1889 Hz</NICK>
<BLURB>gain for the frequency band 1889 Hz, ranging from -24 dB to +12 dB.</BLURB>
<DEFAULT>0</DEFAULT>
</ARG>
<ARG>
<NAME>GstIirEqualizer10Bands::band7</NAME>
<TYPE>gdouble</TYPE>
<RANGE>[-24,12]</RANGE>
<FLAGS>rw</FLAGS>
<NICK>3770 Hz</NICK>
<BLURB>gain for the frequency band 3770 Hz, ranging from -24 dB to +12 dB.</BLURB>
<DEFAULT>0</DEFAULT>
</ARG>
<ARG>
<NAME>GstIirEqualizer10Bands::band8</NAME>
<TYPE>gdouble</TYPE>
<RANGE>[-24,12]</RANGE>
<FLAGS>rw</FLAGS>
<NICK>7523 Hz</NICK>
<BLURB>gain for the frequency band 7523 Hz, ranging from -24 dB to +12 dB.</BLURB>
<DEFAULT>0</DEFAULT>
</ARG>
<ARG>
<NAME>GstIirEqualizer10Bands::band9</NAME>
<TYPE>gdouble</TYPE>
<RANGE>[-24,12]</RANGE>
<FLAGS>rw</FLAGS>
<NICK>15011 Hz</NICK>
<BLURB>gain for the frequency band 15011 Hz, ranging from -24 dB to +12 dB.</BLURB>
<DEFAULT>0</DEFAULT>
</ARG>
<ARG>
<NAME>GstIirEqualizer3Bands::band0</NAME>
<TYPE>gdouble</TYPE>
<RANGE>[-24,12]</RANGE>
<FLAGS>rw</FLAGS>
<NICK>110 Hz</NICK>
<BLURB>gain for the frequency band 100 Hz, ranging from -24.0 to +12.0.</BLURB>
<DEFAULT>0</DEFAULT>
</ARG>
<ARG>
<NAME>GstIirEqualizer3Bands::band1</NAME>
<TYPE>gdouble</TYPE>
<RANGE>[-24,12]</RANGE>
<FLAGS>rw</FLAGS>
<NICK>1100 Hz</NICK>
<BLURB>gain for the frequency band 1100 Hz, ranging from -24.0 to +12.0.</BLURB>
<DEFAULT>0</DEFAULT>
</ARG>
<ARG>
<NAME>GstIirEqualizer3Bands::band2</NAME>
<TYPE>gdouble</TYPE>
<RANGE>[-24,12]</RANGE>
<FLAGS>rw</FLAGS>
<NICK>11 kHz</NICK>
<BLURB>gain for the frequency band 11 kHz, ranging from -24.0 to +12.0.</BLURB>
<DEFAULT>0</DEFAULT>
</ARG>
<ARG>
<NAME>GstIirEqualizerNBands::num-bands</NAME>
<TYPE>guint</TYPE>
<RANGE>[1,64]</RANGE>
<FLAGS>rwx</FLAGS>
<NICK>num-bands</NICK>
<BLURB>number of different bands to use.</BLURB>
<DEFAULT>10</DEFAULT>
</ARG>
<ARG>
<NAME>GstOssSrc::device</NAME>
<TYPE>gchararray</TYPE>

View file

@ -49,6 +49,11 @@ GObject
GstDVDec
GstCairoTextOverlay
GstBaseTransform
GstAudioFilter
GstIirEqualizer
GstIirEqualizerNBands
GstIirEqualizer3Bands
GstIirEqualizer10Bands
GstAudioPanorama
GstCairoTimeOverlay
GstVideoFilter

View file

@ -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

View file

@ -0,0 +1,76 @@
<plugin>
<name>equalizer</name>
<description>GStreamer audio equalizers</description>
<filename>../../gst/equalizer/.libs/libgstequalizer.so</filename>
<basename>libgstequalizer.so</basename>
<version>0.10.6.1</version>
<license>LGPL</license>
<source>gst-plugins-good</source>
<package>GStreamer Good Plug-ins CVS/prerelease</package>
<origin>Unknown package origin</origin>
<elements>
<element>
<name>equalizer-10bands</name>
<longname>10 Band Equalizer</longname>
<class>Filter/Effect/Audio</class>
<description>Direct Form 10 band IIR equalizer</description>
<author>Stefan Kost &lt;ensonic@users.sf.net&gt;</author>
<pads>
<caps>
<name>src</name>
<direction>source</direction>
<presence>always</presence>
<details>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 ]</details>
</caps>
<caps>
<name>sink</name>
<direction>sink</direction>
<presence>always</presence>
<details>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 ]</details>
</caps>
</pads>
</element>
<element>
<name>equalizer-3bands</name>
<longname>3 Band Equalizer</longname>
<class>Filter/Effect/Audio</class>
<description>Direct Form 3 band IIR equalizer</description>
<author>Stefan Kost &lt;ensonic@users.sf.net&gt;</author>
<pads>
<caps>
<name>src</name>
<direction>source</direction>
<presence>always</presence>
<details>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 ]</details>
</caps>
<caps>
<name>sink</name>
<direction>sink</direction>
<presence>always</presence>
<details>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 ]</details>
</caps>
</pads>
</element>
<element>
<name>equalizer-nbands</name>
<longname>N Band Equalizer</longname>
<class>Filter/Effect/Audio</class>
<description>Direct Form IIR equalizer</description>
<author>Benjamin Otte &lt;otte@gnome.org&gt;, Stefan Kost &lt;ensonic@users.sf.net&gt;</author>
<pads>
<caps>
<name>src</name>
<direction>source</direction>
<presence>always</presence>
<details>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 ]</details>
</caps>
<caps>
<name>sink</name>
<direction>sink</direction>
<presence>always</presence>
<details>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 ]</details>
</caps>
</pads>
</element>
</elements>
</plugin>

View file

@ -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)

View file

@ -63,6 +63,7 @@ check_PROGRAMS = \
elements/audiowsinclimit \
elements/avimux \
elements/avisubtitle \
elements/equalizer \
elements/icydemux \
elements/id3demux \
elements/level \

View file

@ -4,12 +4,15 @@ apev2mux
audioamplify
audiochebband
audiocheblimit
audiosincwband
audiosincwlimit
audiodynamic
audioinvert
audiopanorama
autodetect
avimux
avisubtitle
equalizer
cmmldec
cmmlenc
icydemux

View file

@ -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);

View file

@ -1,3 +1,3 @@
SUBDIRS = level rtp
SUBDIRS = level rtp equalizer
DIST_SUBDIRS = level rtp
DIST_SUBDIRS = level rtp equalizer