mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

Port equalizer plugin to 0.10 (#403572).

Browse source 
Original commit message from CVS:
Patch by: James "Doc" Livingston  <doclivingston at gmail com>
* configure.ac:
* gst/equalizer/Makefile.am:
* gst/equalizer/gstiirequalizer.c: (gst_iir_equalizer_get_type),
(gst_iir_equalizer_base_init), (gst_iir_equalizer_class_init),
(gst_iir_equalizer_compute_frequencies),
(gst_iir_equalizer_set_property),
(gst_iir_equalizer_filter_inplace), (gst_iir_equalizer_setup),
(plugin_init):
Port equalizer plugin to 0.10 (#403572).
This commit is contained in:
James Doc Livingston 2007-02-02 17:39:21 +00:00 committed by Tim-Philipp Müller
parent 91e91243a9
commit c2306bc88f
4 changed files with 40 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ChangeLog
View file

@ -1,3 +1,17 @@
2007-02-02 Tim-Philipp Müller <tim at centricular dot net>
Patch by: James "Doc" Livingston <doclivingston at gmail com>
* configure.ac:
* gst/equalizer/Makefile.am:
* gst/equalizer/gstiirequalizer.c: (gst_iir_equalizer_get_type),
(gst_iir_equalizer_base_init), (gst_iir_equalizer_class_init),
(gst_iir_equalizer_compute_frequencies),
(gst_iir_equalizer_set_property),
(gst_iir_equalizer_filter_inplace), (gst_iir_equalizer_setup),
(plugin_init):
Port equalizer plugin to 0.10 (#403572).
2007-02-02 Andy Wingo <wingo@pobox.com> 2007-02-02 Andy Wingo <wingo@pobox.com>
* configure.ac: * configure.ac:

6
configure.ac
View file

@ -78,16 +78,18 @@ dnl these are all the gst plug-ins, compilable without additional libs
GST_PLUGINS_ALL="\ GST_PLUGINS_ALL="\
cdxaparse \ cdxaparse \
deinterlace \ deinterlace \
equalizer \
filter \ filter \
freeze \ freeze \
h264parse \ h264parse \
interleave \ interleave \
librfb \ librfb \
nuvdemux \
modplug \ modplug \
multifile \ multifile \
mve \ mve \
nsf \ nsf \
nuvdemux \
real \
replaygain \ replaygain \
spectrum \ spectrum \
speed \ speed \
@ -97,7 +99,6 @@ GST_PLUGINS_ALL="\
videoparse \ videoparse \
xingheader \ xingheader \
y4m \ y4m \
real \
" "
AC_SUBST(GST_PLUGINS_ALL) AC_SUBST(GST_PLUGINS_ALL)
@ -960,6 +961,7 @@ gst-plugins-bad.spec
gst/Makefile gst/Makefile
gst/cdxaparse/Makefile gst/cdxaparse/Makefile
gst/deinterlace/Makefile gst/deinterlace/Makefile
gst/equalizer/Makefile
gst/filter/Makefile gst/filter/Makefile
gst/freeze/Makefile gst/freeze/Makefile
gst/h264parse/Makefile gst/h264parse/Makefile

6
gst/equalizer/Makefile.am
View file

@ -1,6 +1,6 @@
plugin_LTLIBRARIES = libgstequalizer.la plugin_LTLIBRARIES = libgstequalizer.la
libgstequalizer_la_SOURCES = gstiirequalizer.c libgstequalizer_la_SOURCES = gstiirequalizer.c
libgstequalizer_la_CFLAGS = $(GST_CFLAGS) libgstequalizer_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
libgstequalizer_la_LIBADD = libgstequalizer_la_LIBADD = $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR)
libgstequalizer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -lm libgstequalizer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

41
gst/equalizer/gstiirequalizer.c
View file

@ -56,7 +56,7 @@ typedef struct
struct _GstIirEqualizer struct _GstIirEqualizer
{ {
GstAudiofilter audiofilter; GstAudioFilter audiofilter;
/* properties */ /* properties */
guint freq_count; guint freq_count;
@ -73,7 +73,7 @@ struct _GstIirEqualizer
struct _GstIirEqualizerClass struct _GstIirEqualizerClass
{ {
GstAudiofilterClass audiofilter_class; GstAudioFilterClass audiofilter_class;
}; };
enum enum
@ -96,11 +96,11 @@ static void gst_iir_equalizer_set_property (GObject * object,
static void gst_iir_equalizer_get_property (GObject * object, static void gst_iir_equalizer_get_property (GObject * object,
guint prop_id, GValue * value, GParamSpec * pspec); guint prop_id, GValue * value, GParamSpec * pspec);
static void gst_iir_equalizer_setup (GstAudiofilter * iir_equalizer); static void gst_iir_equalizer_setup (GstAudioFilter * iir_equalizer);
static void gst_iir_equalizer_filter_inplace (GstAudiofilter * static void gst_iir_equalizer_filter_inplace (GstAudioFilter *
iir_equalizer, GstBuffer * buf); iir_equalizer, GstBuffer * buf);
static GstAudiofilterClass *parent_class; static GstAudioFilterClass *parent_class;
GType GType
gst_iir_equalizer_get_type (void) gst_iir_equalizer_get_type (void)
@ -120,7 +120,7 @@ gst_iir_equalizer_get_type (void)
NULL, NULL,
}; };
iir_equalizer_type = g_type_register_static (GST_TYPE_AUDIOFILTER, iir_equalizer_type = g_type_register_static (GST_TYPE_AUDIO_FILTER,
"GstIirEqualizer", &iir_equalizer_info, 0); "GstIirEqualizer", &iir_equalizer_info, 0);
} }
return iir_equalizer_type; return iir_equalizer_type;
@ -145,9 +145,9 @@ gst_iir_equalizer_base_init (gpointer g_class)
"rate=(int)[1000,MAX], channels=(int)[1,6];" "rate=(int)[1000,MAX], channels=(int)[1,6];"
"audio/x-raw-float, width=(int)32, endianness=(int)BYTE_ORDER," "audio/x-raw-float, width=(int)32, endianness=(int)BYTE_ORDER,"
"rate=(int)[1000,MAX], channels=(int)[1,6]"); "rate=(int)[1000,MAX], channels=(int)[1,6]");
gst_audiofilter_class_add_pad_templates (GST_AUDIOFILTER_CLASS (g_class), gst_audio_filter_class_add_pad_templates (GST_AUDIO_FILTER_CLASS (g_class),
caps); caps);
gst_caps_free (caps); gst_caps_unref (caps);
} }
static void static void
@ -156,12 +156,12 @@ gst_iir_equalizer_class_init (gpointer g_class, gpointer class_data)
GObjectClass *gobject_class; GObjectClass *gobject_class;
GstElementClass *gstelement_class; GstElementClass *gstelement_class;
GstIirEqualizerClass *klass; GstIirEqualizerClass *klass;
GstAudiofilterClass *audiofilter_class; GstAudioFilterClass *audio_filter_class;
klass = (GstIirEqualizerClass *) g_class; klass = (GstIirEqualizerClass *) g_class;
gobject_class = (GObjectClass *) klass; gobject_class = (GObjectClass *) klass;
gstelement_class = (GstElementClass *) klass; gstelement_class = (GstElementClass *) klass;
audiofilter_class = (GstAudiofilterClass *) g_class; audio_filter_class = (GstAudioFilterClass *) g_class;
gobject_class->set_property = gst_iir_equalizer_set_property; gobject_class->set_property = gst_iir_equalizer_set_property;
gobject_class->get_property = gst_iir_equalizer_get_property; gobject_class->get_property = gst_iir_equalizer_get_property;
@ -182,8 +182,8 @@ gst_iir_equalizer_class_init (gpointer g_class, gpointer class_data)
"expects a gdouble* of values to use for the bands", "expects a gdouble* of values to use for the bands",
G_PARAM_WRITABLE)); G_PARAM_WRITABLE));
audiofilter_class->setup = gst_iir_equalizer_setup; audio_filter_class->setup = gst_iir_equalizer_setup;
audiofilter_class->filter_inplace = gst_iir_equalizer_filter_inplace; audio_filter_class->filter_inplace = gst_iir_equalizer_filter_inplace;
} }
static void static void
@ -239,7 +239,7 @@ gst_iir_equalizer_compute_frequencies (GstIirEqualizer * equ, guint band_count)
gdouble *old_values; gdouble *old_values;
guint old_count, i; guint old_count, i;
gdouble step = pow (HIGHEST_FREQ / LOWEST_FREQ, 1.0 / (band_count - 1)); gdouble step = pow (HIGHEST_FREQ / LOWEST_FREQ, 1.0 / (band_count - 1));
GstAudiofilter *audio = GST_AUDIOFILTER (equ); GstAudioFilter *audio = GST_AUDIO_FILTER (equ);
old_count = equ->freq_count; old_count = equ->freq_count;
equ->freq_count = band_count; equ->freq_count = band_count;
@ -288,12 +288,12 @@ gst_iir_equalizer_set_property (GObject * object, guint prop_id,
case ARG_BANDWIDTH: case ARG_BANDWIDTH:
if (g_value_get_double (value) != equ->bandwidth) { if (g_value_get_double (value) != equ->bandwidth) {
equ->bandwidth = g_value_get_double (value); equ->bandwidth = g_value_get_double (value);
if (GST_AUDIOFILTER (equ)->rate) { if (GST_AUDIO_FILTER (equ)->rate) {
guint i; guint i;
for (i = 0; i < equ->freq_count; i++) { for (i = 0; i < equ->freq_count; i++) {
setup_filter (equ, &equ->filter[i], arg_to_scale (equ->values[i]), setup_filter (equ, &equ->filter[i], arg_to_scale (equ->values[i]),
equ->freqs[i] / GST_AUDIOFILTER (equ)->rate); equ->freqs[i] / GST_AUDIO_FILTER (equ)->rate);
} }
} }
} }
@ -307,7 +307,7 @@ gst_iir_equalizer_set_property (GObject * object, guint prop_id,
if (new[i] != equ->values[i]) { if (new[i] != equ->values[i]) {
equ->values[i] = new[i]; equ->values[i] = new[i];
setup_filter (equ, &equ->filter[i], arg_to_scale (new[i]), setup_filter (equ, &equ->filter[i], arg_to_scale (new[i]),
equ->freqs[i] / GST_AUDIOFILTER (equ)->rate); equ->freqs[i] / GST_AUDIO_FILTER (equ)->rate);
} }
} }
} }
@ -396,7 +396,7 @@ CREATE_OPTIMIZED_FUNCTIONS (gint16, gint, -32768, 32767);
CREATE_OPTIMIZED_FUNCTIONS (gfloat, gfloat, -1.0, 1.0); CREATE_OPTIMIZED_FUNCTIONS (gfloat, gfloat, -1.0, 1.0);
static void static void
gst_iir_equalizer_filter_inplace (GstAudiofilter * filter, GstBuffer * buf) gst_iir_equalizer_filter_inplace (GstAudioFilter * filter, GstBuffer * buf)
{ {
GstIirEqualizer *equ = GST_IIR_EQUALIZER (filter); GstIirEqualizer *equ = GST_IIR_EQUALIZER (filter);
@ -405,7 +405,7 @@ gst_iir_equalizer_filter_inplace (GstAudiofilter * filter, GstBuffer * buf)
} }
static void static void
gst_iir_equalizer_setup (GstAudiofilter * audio) gst_iir_equalizer_setup (GstAudioFilter * audio)
{ {
GstIirEqualizer *equ = GST_IIR_EQUALIZER (audio); GstIirEqualizer *equ = GST_IIR_EQUALIZER (audio);
@ -424,9 +424,6 @@ gst_iir_equalizer_setup (GstAudiofilter * audio)
static gboolean static gboolean
plugin_init (GstPlugin * plugin) plugin_init (GstPlugin * plugin)
{ {
if (!gst_library_load ("gstaudiofilter"))
return FALSE;
return gst_element_register (plugin, "equalizer", GST_RANK_NONE, return gst_element_register (plugin, "equalizer", GST_RANK_NONE,
GST_TYPE_IIR_EQUALIZER); GST_TYPE_IIR_EQUALIZER);
} }
@ -435,4 +432,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR, GST_VERSION_MINOR,
"equalizer", "equalizer",
"GStreamer equalizers", "GStreamer equalizers",
plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)