mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-03 16:09:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/equalizer/: Refactor plugin into a base class and a first subclass (nband eq). The nband eq uses GstChildProxy an...

Browse source 
Original commit message from CVS:
* gst/equalizer/Makefile.am:
* gst/equalizer/gstiirequalizer.c: (_do_init),
(gst_iir_equalizer_band_set_property),
(gst_iir_equalizer_band_get_property),
(gst_iir_equalizer_band_class_init),
(gst_iir_equalizer_band_get_type),
(gst_iir_equalizer_child_proxy_get_child_by_index),
(gst_iir_equalizer_child_proxy_get_children_count),
(gst_iir_equalizer_child_proxy_interface_init),
(gst_iir_equalizer_base_init), (gst_iir_equalizer_class_init),
(gst_iir_equalizer_finalize), (setup_filter),
(gst_iir_equalizer_compute_frequencies),
(gst_iir_equalizer_set_property), (gst_iir_equalizer_get_property),
(gst_iir_equalizer_setup), (plugin_init):
* gst/equalizer/gstiirequalizer.h:
* gst/equalizer/gstiirequalizernbands.c:
(gst_iir_equalizer_nbands_base_init),
(gst_iir_equalizer_nbands_class_init),
(gst_iir_equalizer_nbands_init),
(gst_iir_equalizer_nbands_set_property),
(gst_iir_equalizer_nbands_get_property):
* gst/equalizer/gstiirequalizernbands.h:
Refactor plugin into a base class and a first subclass (nband eq). The
nband eq uses GstChildProxy and is controlable. More subclasses will
follow.
This commit is contained in:
Stefan Kost 2007-03-09 08:58:26 +00:00
parent f1b91e369d
commit ab6e3e5e06
7 changed files with 515 additions and 133 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
ChangeLog
View file

@ -1,3 +1,31 @@
2007-03-09 Stefan Kost <ensonic@users.sf.net>
* gst/equalizer/Makefile.am:
* gst/equalizer/gstiirequalizer.c: (_do_init),
(gst_iir_equalizer_band_set_property),
(gst_iir_equalizer_band_get_property),
(gst_iir_equalizer_band_class_init),
(gst_iir_equalizer_band_get_type),
(gst_iir_equalizer_child_proxy_get_child_by_index),
(gst_iir_equalizer_child_proxy_get_children_count),
(gst_iir_equalizer_child_proxy_interface_init),
(gst_iir_equalizer_base_init), (gst_iir_equalizer_class_init),
(gst_iir_equalizer_finalize), (setup_filter),
(gst_iir_equalizer_compute_frequencies),
(gst_iir_equalizer_set_property), (gst_iir_equalizer_get_property),
(gst_iir_equalizer_setup), (plugin_init):
* gst/equalizer/gstiirequalizer.h:
* gst/equalizer/gstiirequalizernbands.c:
(gst_iir_equalizer_nbands_base_init),
(gst_iir_equalizer_nbands_class_init),
(gst_iir_equalizer_nbands_init),
(gst_iir_equalizer_nbands_set_property),
(gst_iir_equalizer_nbands_get_property):
* gst/equalizer/gstiirequalizernbands.h:
Refactor plugin into a base class and a first subclass (nband eq). The
nband eq uses GstChildProxy and is controlable. More subclasses will
follow.
2007-03-08 Wim Taymans <wim@fluendo.com> 2007-03-08 Wim Taymans <wim@fluendo.com>
Includes patch by: Paul Davis <paul at linuxaudiosystems dot com> Includes patch by: Paul Davis <paul at linuxaudiosystems dot com>

2
common

@ -1 +1 @@
Subproject commit 7c5a0ab68de1fed4e5a1fd473160debc2c4c7b89 Subproject commit ea828a478fe11561881a6eaf1f7bf2b0b77c8c85

9
gst/equalizer/Makefile.am
View file

@ -1,8 +1,11 @@
plugin_LTLIBRARIES = libgstequalizer.la plugin_LTLIBRARIES = libgstequalizer.la
libgstequalizer_la_SOURCES = gstiirequalizer.c gstiirequalizer.h libgstequalizer_la_SOURCES = \
libgstequalizer_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) gstiirequalizer.c gstiirequalizer.h \
libgstequalizer_la_LIBADD = $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(LIBM) gstiirequalizernbands.c gstiirequalizernbands.h
libgstequalizer_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS)
libgstequalizer_la_LIBADD = $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) $(LIBM)
libgstequalizer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstequalizer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstiirequalizer.h noinst_HEADERS = gstiirequalizer.h

400
gst/equalizer/gstiirequalizer.c
View file

@ -1,5 +1,6 @@
/* GStreamer /* GStreamer
* Copyright (C) <2004> Benjamin Otte <otte@gnome.org> * Copyright (C) <2004> Benjamin Otte <otte@gnome.org>
* <2007> Stefan Kost <ensonic@users.sf.net>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -25,21 +26,20 @@
#include <string.h> #include <string.h>
#include "gstiirequalizer.h" #include "gstiirequalizer.h"
#include "gstiirequalizernbands.h"
#define GST_EQUALIZER_TRANSFORM_LOCK(eq) \ GST_DEBUG_CATEGORY (equalizer_debug);
g_mutex_lock (GST_BASE_TRANSFORM(eq)->transform_lock) #define GST_CAT_DEFAULT equalizer_debug
#define GST_EQUALIZER_TRANSFORM_UNLOCK(eq) \
g_mutex_unlock (GST_BASE_TRANSFORM(eq)->transform_lock)
enum enum
{ {
ARG_0, ARG_BAND_WIDTH = 1
ARG_NUM_BANDS,
ARG_BAND_WIDTH,
ARG_BAND_VALUES
}; };
static void gst_iir_equalizer_child_proxy_interface_init (gpointer g_iface,
gpointer iface_data);
static void gst_iir_equalizer_finalize (GObject * object); static void gst_iir_equalizer_finalize (GObject * object);
static void gst_iir_equalizer_set_property (GObject * object, static void gst_iir_equalizer_set_property (GObject * object,
guint prop_id, const GValue * value, GParamSpec * pspec); guint prop_id, const GValue * value, GParamSpec * pspec);
@ -51,7 +51,7 @@ static gboolean gst_iir_equalizer_setup (GstAudioFilter * filter,
static GstFlowReturn gst_iir_equalizer_transform_ip (GstBaseTransform * btrans, static GstFlowReturn gst_iir_equalizer_transform_ip (GstBaseTransform * btrans,
GstBuffer * buf); GstBuffer * buf);
GST_DEBUG_CATEGORY_STATIC (equalizer_debug); GST_DEBUG_CATEGORY_EXTERN ()(equalizer_debug);
#define GST_CAT_DEFAULT equalizer_debug #define GST_CAT_DEFAULT equalizer_debug
#define ALLOWED_CAPS \ #define ALLOWED_CAPS \
@ -68,23 +68,201 @@ GST_DEBUG_CATEGORY_STATIC (equalizer_debug);
" rate=(int)[1000,MAX]," \ " rate=(int)[1000,MAX]," \
" channels=(int)[1,MAX]" " channels=(int)[1,MAX]"
GST_BOILERPLATE (GstIirEqualizer, gst_iir_equalizer, GstAudioFilter, static void
GST_TYPE_AUDIO_FILTER); _do_init (GType object_type)
{
const GInterfaceInfo child_proxy_interface_info = {
(GInterfaceInitFunc) gst_iir_equalizer_child_proxy_interface_init,
NULL, /* interface_finalize */
NULL /* interface_data */
};
g_type_add_interface_static (object_type, GST_TYPE_CHILD_PROXY,
&child_proxy_interface_info);
}
GST_BOILERPLATE_FULL (GstIirEqualizer, gst_iir_equalizer,
GstAudioFilter, GST_TYPE_AUDIO_FILTER, _do_init);
/* child object */
enum
{
ARG_GAIN = 1,
ARG_FREQ
};
typedef struct _GstIirEqualizerBandClass GstIirEqualizerBandClass;
#define GST_TYPE_IIR_EQUALIZER_BAND \
(gst_iir_equalizer_band_get_type())
#define GST_IIR_EQUALIZER_BAND(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_IIR_EQUALIZER_BAND,GstIirEqualizerBand))
#define GST_IIR_EQUALIZER_BAND_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_IIR_EQUALIZER_BAND,GstIirEqualizerBandClass))
#define GST_IS_IIR_EQUALIZER_BAND(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_IIR_EQUALIZER_BAND))
#define GST_IS_IIR_EQUALIZER_BAND_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_IIR_EQUALIZER_BAND))
struct _GstIirEqualizerBand
{
GstObject object;
/*< private > */
/* center frequency and gain */
gdouble freq;
gdouble gain;
/* second order iir filter */
gdouble alpha; /* IIR coefficients for outputs */
gdouble beta; /* IIR coefficients for inputs */
gdouble gamma; /* IIR coefficients for inputs */
};
struct _GstIirEqualizerBandClass
{
GstObjectClass parent_class;
};
static GType gst_iir_equalizer_band_get_type (void);
static void setup_filter (GstIirEqualizer * equ, GstIirEqualizerBand * band);
static void
gst_iir_equalizer_band_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec)
{
GstIirEqualizerBand *band = GST_IIR_EQUALIZER_BAND (object);
switch (prop_id) {
case ARG_GAIN:{
gdouble gain;
gain = g_value_get_double (value);
GST_INFO_OBJECT (band, "gain = %lf -> %lf", band->gain, gain);
if (gain != band->gain) {
GstIirEqualizer *equ =
GST_IIR_EQUALIZER (gst_object_get_parent (GST_OBJECT (band)));
band->gain = gain;
setup_filter (equ, band);
gst_object_unref (equ);
}
break;
}
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void
gst_iir_equalizer_band_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec)
{
GstIirEqualizerBand *band = GST_IIR_EQUALIZER_BAND (object);
switch (prop_id) {
case ARG_GAIN:
g_value_set_double (value, band->gain);
break;
case ARG_FREQ:
g_value_set_double (value, band->freq);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void
gst_iir_equalizer_band_class_init (GstIirEqualizerBandClass * klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
gobject_class->set_property = gst_iir_equalizer_band_set_property;
gobject_class->get_property = gst_iir_equalizer_band_get_property;
g_object_class_install_property (gobject_class, ARG_GAIN,
g_param_spec_double ("gain", "gain",
"gain for the frequency band ranging from -1.0 to +1.0",
-1.0, 1.0, 0.0, G_PARAM_READWRITE | GST_PARAM_CONTROLLABLE));
g_object_class_install_property (gobject_class, ARG_FREQ,
g_param_spec_double ("freq", "freq",
"center frequency of the band",
0.0, 100000.0, 0.0, G_PARAM_READABLE));
}
static GType
gst_iir_equalizer_band_get_type (void)
{
static GType type = 0;
if (G_UNLIKELY (!type)) {
const GTypeInfo type_info = {
sizeof (GstIirEqualizerBandClass),
NULL,
NULL,
(GClassInitFunc) gst_iir_equalizer_band_class_init,
NULL,
NULL,
sizeof (GstIirEqualizerBand),
0,
NULL,
};
type =
g_type_register_static (GST_TYPE_OBJECT, "GstIirEqualizerBand",
&type_info, 0);
}
return (type);
}
/* child proxy iface */
static GstObject *
gst_iir_equalizer_child_proxy_get_child_by_index (GstChildProxy * child_proxy,
guint index)
{
GstIirEqualizer *equ = GST_IIR_EQUALIZER (child_proxy);
g_return_val_if_fail (index < equ->freq_band_count, NULL);
GST_INFO ("return child[%d] '%s'", index,
GST_OBJECT_NAME (equ->bands[index]));
return (gst_object_ref (equ->bands[index]));
}
static guint
gst_iir_equalizer_child_proxy_get_children_count (GstChildProxy * child_proxy)
{
GstIirEqualizer *equ = GST_IIR_EQUALIZER (child_proxy);
GST_INFO ("we have %d children", equ->freq_band_count);
return (equ->freq_band_count);
}
static void
gst_iir_equalizer_child_proxy_interface_init (gpointer g_iface,
gpointer iface_data)
{
GstChildProxyInterface *iface = g_iface;
GST_INFO ("initializing iface");
iface->get_child_by_index = gst_iir_equalizer_child_proxy_get_child_by_index;
iface->get_children_count = gst_iir_equalizer_child_proxy_get_children_count;
}
/* equalizer implementation */
static void static void
gst_iir_equalizer_base_init (gpointer g_class) gst_iir_equalizer_base_init (gpointer g_class)
{ {
GstAudioFilterClass *audiofilter_class = GST_AUDIO_FILTER_CLASS (g_class); GstAudioFilterClass *audiofilter_class = GST_AUDIO_FILTER_CLASS (g_class);
GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
const GstElementDetails iir_equalizer_details =
GST_ELEMENT_DETAILS ("Equalizer",
"Filter/Effect/Audio",
"Direct Form IIR equalizer",
"Benjamin Otte <otte@gnome.org>");
GstCaps *caps; GstCaps *caps;
gst_element_class_set_details (element_class, &iir_equalizer_details);
caps = gst_caps_from_string (ALLOWED_CAPS); caps = gst_caps_from_string (ALLOWED_CAPS);
gst_audio_filter_class_add_pad_templates (audiofilter_class, caps); gst_audio_filter_class_add_pad_templates (audiofilter_class, caps);
gst_caps_unref (caps); gst_caps_unref (caps);
@ -101,21 +279,11 @@ gst_iir_equalizer_class_init (GstIirEqualizerClass * klass)
gobject_class->get_property = gst_iir_equalizer_get_property; gobject_class->get_property = gst_iir_equalizer_get_property;
gobject_class->finalize = gst_iir_equalizer_finalize; gobject_class->finalize = gst_iir_equalizer_finalize;
g_object_class_install_property (gobject_class, ARG_NUM_BANDS, /* FIXME: move to GstIirEqualizerBand to make a full parametric eq */
g_param_spec_uint ("num-bands", "num-bands",
"number of different bands to use", 2, 64, 15,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
g_object_class_install_property (gobject_class, ARG_BAND_WIDTH, g_object_class_install_property (gobject_class, ARG_BAND_WIDTH,
g_param_spec_double ("band-width", "band-width", g_param_spec_double ("band-width", "band-width",
"band width calculated as distance between bands * this value", 0.1, "band width calculated as distance between bands * this value", 0.1,
5.0, 1.0, G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); 5.0, 1.0, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
g_object_class_install_property (gobject_class, ARG_BAND_VALUES,
g_param_spec_value_array ("band-values", "band values",
"GValueArray holding gdouble values, one for each band with values "
"ranging from -1.0 to +1.0",
g_param_spec_double ("band-value", "band-value",
"Equaliser Band Value", -1.0, 1.0, 0.0, G_PARAM_WRITABLE),
G_PARAM_WRITABLE));
audio_filter_class->setup = gst_iir_equalizer_setup; audio_filter_class->setup = gst_iir_equalizer_setup;
btrans_class->transform_ip = gst_iir_equalizer_transform_ip; btrans_class->transform_ip = gst_iir_equalizer_transform_ip;
@ -132,9 +300,7 @@ gst_iir_equalizer_finalize (GObject * object)
{ {
GstIirEqualizer *equ = GST_IIR_EQUALIZER (object); GstIirEqualizer *equ = GST_IIR_EQUALIZER (object);
g_free (equ->freqs); g_free (equ->bands);
g_free (equ->values);
g_free (equ->filter);
g_free (equ->history); g_free (equ->history);
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
@ -151,63 +317,98 @@ arg_to_scale (gdouble arg)
} }
static void static void
setup_filter (GstIirEqualizer * equ, SecondOrderFilter * filter, gdouble gain, setup_filter (GstIirEqualizer * equ, GstIirEqualizerBand * band)
gdouble frequency)
{ {
gdouble gain = arg_to_scale (band->gain);
gdouble frequency = band->freq / GST_AUDIO_FILTER (equ)->format.rate;
gdouble q = pow (HIGHEST_FREQ / LOWEST_FREQ, gdouble q = pow (HIGHEST_FREQ / LOWEST_FREQ,
1.0 / (equ->freq_count - 1)) * equ->band_width; 1.0 / (equ->freq_band_count - 1)) * equ->band_width;
gdouble theta = frequency * 2 * M_PI; gdouble theta = frequency * 2 * M_PI;
filter->beta = (q - theta / 2) / (2 * q + theta); band->beta = (q - theta / 2) / (2 * q + theta);
filter->gamma = (0.5 + filter->beta) * cos (theta); band->gamma = (0.5 + band->beta) * cos (theta);
filter->alpha = (0.5 - filter->beta) / 2; band->alpha = (0.5 - band->beta) / 2;
filter->beta *= 2.0; band->beta *= 2.0;
filter->alpha *= 2.0 * gain; band->alpha *= 2.0 * gain;
filter->gamma *= 2.0; band->gamma *= 2.0;
GST_INFO ("gain = %g, frequency = %g, alpha = %g, beta = %g, gamma=%g\n", GST_INFO ("gain = %g, frequency = %g, alpha = %g, beta = %g, gamma=%g",
gain, frequency, filter->alpha, filter->beta, filter->gamma); gain, frequency, band->alpha, band->beta, band->gamma);
} }
static void void
gst_iir_equalizer_compute_frequencies (GstIirEqualizer * equ, guint band_count) gst_iir_equalizer_compute_frequencies (GstIirEqualizer * equ, guint new_count)
{ {
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 / (new_count - 1));
GstAudioFilter *audio = GST_AUDIO_FILTER (equ); gchar name[20];
old_count = equ->freq_count; old_count = equ->freq_band_count;
equ->freq_count = band_count; equ->freq_band_count = new_count;
old_values = equ->values; GST_DEBUG ("bands %u -> %u", old_count, new_count);
if (old_count < band_count) {
equ->freqs = g_realloc (equ->freqs, sizeof (gdouble) * band_count); if (old_count < new_count) {
memset (equ->freqs + sizeof (gdouble) * old_count, 0, /* add new bands */
sizeof (gdouble) * (band_count - old_count)); equ->bands = g_realloc (equ->bands, sizeof (GstObject *) * new_count);
equ->values = g_realloc (equ->values, sizeof (gdouble) * band_count); for (i = old_count; i < new_count; i++) {
memset (equ->values + sizeof (gdouble) * old_count, 0, equ->bands[i] = g_object_new (GST_TYPE_IIR_EQUALIZER_BAND, NULL);
sizeof (gdouble) * (band_count - old_count)); /* otherwise they get names like 'iirequalizerband5' */
equ->filter = sprintf (name, "band%u", i);
g_realloc (equ->filter, sizeof (SecondOrderFilter) * band_count); gst_object_set_name (GST_OBJECT (equ->bands[i]), name);
memset (equ->filter + sizeof (SecondOrderFilter) * old_count, 0,
sizeof (SecondOrderFilter) * (band_count - old_count)); gst_object_set_parent (GST_OBJECT (equ->bands[i]), GST_OBJECT (equ));
gst_child_proxy_child_added (GST_OBJECT (equ),
GST_OBJECT (equ->bands[i]));
}
} else {
/* free unused bands */
for (i = new_count; i < old_count; i++) {
gst_child_proxy_child_removed (GST_OBJECT (equ),
GST_OBJECT (equ->bands[i]));
gst_object_unref (equ->bands[i]);
equ->bands[i] = NULL;
}
} }
/* free + alloc = no memcpy */ /* free + alloc = no memcpy */
g_free (equ->history); g_free (equ->history);
equ->history = equ->history =
g_malloc0 (equ->history_size * audio->format.channels * band_count); g_malloc0 (equ->history_size * GST_AUDIO_FILTER (equ)->format.channels *
equ->freqs[0] = LOWEST_FREQ; new_count);
for (i = 1; i < band_count; i++) {
equ->freqs[i] = equ->freqs[i - 1] * step; /* set center frequencies and name band objects
* FIXME: arg! we can't change the name of parented objects :(
* application should read band->freq
*/
equ->bands[0]->freq = LOWEST_FREQ;
/*
if(equ->bands[0]->freq<10000.0) {
sprintf (name,"%dHz",(gint)equ->bands[0]->freq);
}
else {
sprintf (name,"%dkHz",(gint)(equ->bands[0]->freq/1000.0));
}
gst_object_set_name( GST_OBJECT (equ->bands[0]), name);
GST_DEBUG ("band[ 0] = '%s'",name);
*/
for (i = 1; i < new_count; i++) {
equ->bands[i]->freq = equ->bands[i - 1]->freq * step;
/*
if(equ->bands[i]->freq<10000.0) {
sprintf (name,"%dHz",(gint)equ->bands[i]->freq);
}
else {
sprintf (name,"%dkHz",(gint)(equ->bands[i]->freq/1000.0));
}
gst_object_set_name( GST_OBJECT (equ->bands[i]), name);
GST_DEBUG ("band[%2d] = '%s'",i,name);
*/
} }
if (audio->format.rate > 0) { if (GST_AUDIO_FILTER (equ)->format.rate) {
guint i; for (i = 0; i < new_count; i++) {
setup_filter (equ, equ->bands[i]);
for (i = 0; i < band_count; i++) {
setup_filter (equ, &equ->filter[i], arg_to_scale (equ->values[i]),
equ->freqs[i] / audio->format.rate);
} }
} }
} }
@ -221,47 +422,18 @@ gst_iir_equalizer_set_property (GObject * object, guint prop_id,
GST_EQUALIZER_TRANSFORM_LOCK (equ); GST_EQUALIZER_TRANSFORM_LOCK (equ);
GST_OBJECT_LOCK (equ); GST_OBJECT_LOCK (equ);
switch (prop_id) { switch (prop_id) {
case ARG_NUM_BANDS:
gst_iir_equalizer_compute_frequencies (equ, g_value_get_uint (value));
break;
case ARG_BAND_WIDTH: case ARG_BAND_WIDTH:
if (g_value_get_double (value) != equ->band_width) { if (g_value_get_double (value) != equ->band_width) {
equ->band_width = g_value_get_double (value); equ->band_width = g_value_get_double (value);
if (GST_AUDIO_FILTER (equ)->format.rate) { if (GST_AUDIO_FILTER (equ)->format.rate) {
guint i; guint i;
for (i = 0; i < equ->freq_count; i++) { for (i = 0; i < equ->freq_band_count; i++) {
setup_filter (equ, &equ->filter[i], arg_to_scale (equ->values[i]), setup_filter (equ, equ->bands[i]);
equ->freqs[i] / GST_AUDIO_FILTER (equ)->format.rate);
} }
} }
} }
break; break;
case ARG_BAND_VALUES:{
GValueArray *arr;
arr = (GValueArray *) g_value_get_boxed (value);
if (arr == NULL) {
g_warning ("Application tried to set empty band value array");
} else if (arr->n_values != equ->freq_count) {
g_warning ("Application tried to set %u band values, but there are "
"%u bands", arr->n_values, equ->freq_count);
} else {
guint i;
for (i = 0; i < arr->n_values; ++i) {
gdouble new_val;
new_val = g_value_get_double (g_value_array_get_nth (arr, i));
if (new_val != equ->values[i]) {
equ->values[i] = new_val;
setup_filter (equ, &equ->filter[i], arg_to_scale (new_val),
equ->freqs[i] / GST_AUDIO_FILTER (equ)->format.rate);
}
}
}
break;
}
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;
@ -279,9 +451,6 @@ gst_iir_equalizer_get_property (GObject * object, guint prop_id,
GST_EQUALIZER_TRANSFORM_LOCK (equ); GST_EQUALIZER_TRANSFORM_LOCK (equ);
GST_OBJECT_LOCK (equ); GST_OBJECT_LOCK (equ);
switch (prop_id) { switch (prop_id) {
case ARG_NUM_BANDS:
g_value_set_uint (value, equ->freq_count);
break;
case ARG_BAND_WIDTH: case ARG_BAND_WIDTH:
g_value_set_double (value, equ->band_width); g_value_set_double (value, equ->band_width);
break; break;
@ -302,7 +471,7 @@ typedef struct { \
} SecondOrderHistory ## TYPE; \ } SecondOrderHistory ## TYPE; \
\ \
static inline TYPE \ static inline TYPE \
one_step_ ## TYPE (SecondOrderFilter *filter, \ one_step_ ## TYPE (GstIirEqualizerBand *filter, \
SecondOrderHistory ## TYPE *history, TYPE input) \ SecondOrderHistory ## TYPE *history, TYPE input) \
{ \ { \
/* calculate output */ \ /* calculate output */ \
@ -321,7 +490,7 @@ static const guint \
history_size_ ## TYPE = sizeof (SecondOrderHistory ## TYPE); \ history_size_ ## TYPE = sizeof (SecondOrderHistory ## TYPE); \
\ \
static void \ static void \
gst_iir_equ_process_ ## TYPE (GstIirEqualizer *equ, guint8 *data, \ gst_iir_equ_process_ ## TYPE (GstIirEqualizer *equ, guint8 *data, \
guint size, guint channels) \ guint size, guint channels) \
{ \ { \
guint frames = size / channels / sizeof (TYPE); \ guint frames = size / channels / sizeof (TYPE); \
@ -334,8 +503,8 @@ guint size, guint channels) \
SecondOrderHistory ## TYPE *history = equ->history; \ SecondOrderHistory ## TYPE *history = equ->history; \
val = *((TYPE *) data); \ val = *((TYPE *) data); \
cur = 0; \ cur = 0; \
for (f = 0; f < equ->freq_count; f++) { \ for (f = 0; f < equ->freq_band_count; f++) { \
SecondOrderFilter *filter = &equ->filter[f]; \ GstIirEqualizerBand *filter = equ->bands[f]; \
\ \
cur += one_step_ ## TYPE (filter, history, val); \ cur += one_step_ ## TYPE (filter, history, val); \
history++; \ history++; \
@ -383,21 +552,22 @@ gst_iir_equalizer_setup (GstAudioFilter * audio, GstRingBufferSpec * fmt)
default: default:
return FALSE; return FALSE;
} }
gst_iir_equalizer_compute_frequencies (equ, equ->freq_count); gst_iir_equalizer_compute_frequencies (equ, equ->freq_band_count);
return TRUE; return TRUE;
} }
static gboolean static gboolean
plugin_init (GstPlugin * plugin) plugin_init (GstPlugin * plugin)
{ {
GST_DEBUG_CATEGORY_INIT (equalizer_debug, "equalizer", 0, "equalizer"); GST_DEBUG_CATEGORY_INIT (equalizer_debug, "equalizer", 0, "equalizer");
return gst_element_register (plugin, "equalizer", GST_RANK_NONE, return gst_element_register (plugin, "equalizer-nbands", GST_RANK_NONE,
GST_TYPE_IIR_EQUALIZER); GST_TYPE_IIR_EQUALIZER_NBANDS);
} }
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR, GST_VERSION_MINOR,
"equalizer", "equalizer",
"GStreamer equalizers", "GStreamer audio equalizers",
plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)

37
gst/equalizer/gstiirequalizer.h
View file

@ -1,5 +1,6 @@
/* GStreamer IIR equalizer /* GStreamer IIR equalizer
* Copyright (C) <2004> Benjamin Otte <otte@gnome.org> * Copyright (C) <2004> Benjamin Otte <otte@gnome.org>
* <2007> Stefan Kost <ensonic@users.sf.net>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -22,9 +23,19 @@
#include <gst/audio/gstaudiofilter.h> #include <gst/audio/gstaudiofilter.h>
#include <gst/audio/gstringbuffer.h> #include <gst/audio/gstringbuffer.h>
#include <gst/controller/gstcontroller.h>
#define GST_EQUALIZER_TRANSFORM_LOCK(eq) \
g_mutex_lock (GST_BASE_TRANSFORM(eq)->transform_lock)
#define GST_EQUALIZER_TRANSFORM_UNLOCK(eq) \
g_mutex_unlock (GST_BASE_TRANSFORM(eq)->transform_lock)
typedef struct _GstIirEqualizer GstIirEqualizer; typedef struct _GstIirEqualizer GstIirEqualizer;
typedef struct _GstIirEqualizerClass GstIirEqualizerClass; typedef struct _GstIirEqualizerClass GstIirEqualizerClass;
typedef struct _GstIirEqualizerBand GstIirEqualizerBand;
#define GST_TYPE_IIR_EQUALIZER \ #define GST_TYPE_IIR_EQUALIZER \
(gst_iir_equalizer_get_type()) (gst_iir_equalizer_get_type())
@ -43,30 +54,22 @@ typedef struct _GstIirEqualizerClass GstIirEqualizerClass;
typedef void (*ProcessFunc) (GstIirEqualizer * eq, guint8 * data, guint size, typedef void (*ProcessFunc) (GstIirEqualizer * eq, guint8 * data, guint size,
guint channels); guint channels);
typedef struct
{
gdouble alpha; /* IIR coefficients for outputs */
gdouble beta; /* IIR coefficients for inputs */
gdouble gamma; /* IIR coefficients for inputs */
} SecondOrderFilter;
struct _GstIirEqualizer struct _GstIirEqualizer
{ {
GstAudioFilter audiofilter; GstAudioFilter audiofilter;
/*< private >*/ /*< private >*/
/* properties */ GstIirEqualizerBand **bands;
guint freq_count;
gdouble band_width;
gdouble *freqs;
gdouble *values;
/* data */ /* properties */
SecondOrderFilter *filter; guint freq_band_count;
gdouble band_width;
/* for each band and channel */
gpointer history; gpointer history;
ProcessFunc process;
guint history_size; guint history_size;
ProcessFunc process;
}; };
struct _GstIirEqualizerClass struct _GstIirEqualizerClass
@ -74,4 +77,8 @@ struct _GstIirEqualizerClass
GstAudioFilterClass audiofilter_class; GstAudioFilterClass audiofilter_class;
}; };
extern void gst_iir_equalizer_compute_frequencies (GstIirEqualizer * equ, guint new_count);
extern GType gst_iir_equalizer_get_type(void);
#endif /* __GST_IIR_EQUALIZER__ */ #endif /* __GST_IIR_EQUALIZER__ */

122
gst/equalizer/gstiirequalizernbands.c Normal file
View file

@ -0,0 +1,122 @@
/* GStreamer
* Copyright (C) <2004> Benjamin Otte <otte@gnome.org>
* <2007> Stefan Kost <ensonic@users.sf.net>
*
* 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., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
/*
*
* gst-launch filesrc location=song.ogg ! oggdemux ! vorbisdec ! audioconvert ! equalizer-nbands rband5::gain=-1.0 ! alsasink
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "gstiirequalizer.h"
#include "gstiirequalizernbands.h"
enum
{
ARG_NUM_BANDS = 1
};
static void gst_iir_equalizer_nbands_set_property (GObject * object,
guint prop_id, const GValue * value, GParamSpec * pspec);
static void gst_iir_equalizer_nbands_get_property (GObject * object,
guint prop_id, GValue * value, GParamSpec * pspec);
GST_DEBUG_CATEGORY_EXTERN ()(equalizer_debug);
#define GST_CAT_DEFAULT equalizer_debug
GST_BOILERPLATE (GstIirEqualizerNBands, gst_iir_equalizer_nbands,
GstIirEqualizer, GST_TYPE_IIR_EQUALIZER);
/* equalizer implementation */
static void
gst_iir_equalizer_nbands_base_init (gpointer g_class)
{
GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
const GstElementDetails iir_equalizer_details =
GST_ELEMENT_DETAILS ("N Band Equalizer",
"Filter/Effect/Audio",
"Direct Form IIR equalizer",
"Benjamin Otte <otte@gnome.org>," " Stefan Kost <ensonic@user.sf.net>");
gst_element_class_set_details (element_class, &iir_equalizer_details);
}
static void
gst_iir_equalizer_nbands_class_init (GstIirEqualizerNBandsClass * klass)
{
GObjectClass *gobject_class = (GObjectClass *) klass;
gobject_class->set_property = gst_iir_equalizer_nbands_set_property;
gobject_class->get_property = gst_iir_equalizer_nbands_get_property;
g_object_class_install_property (gobject_class, ARG_NUM_BANDS,
g_param_spec_uint ("num-bands", "num-bands",
"number of different bands to use", 2, 64, 10,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
}
static void
gst_iir_equalizer_nbands_init (GstIirEqualizerNBands * equ_n,
GstIirEqualizerNBandsClass * g_class)
{
GstIirEqualizer *equ = GST_IIR_EQUALIZER (equ_n);
gst_iir_equalizer_compute_frequencies (equ, 10);
}
static void
gst_iir_equalizer_nbands_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec)
{
GstIirEqualizer *equ = GST_IIR_EQUALIZER (object);
GST_EQUALIZER_TRANSFORM_LOCK (equ);
GST_OBJECT_LOCK (equ);
switch (prop_id) {
case ARG_NUM_BANDS:
gst_iir_equalizer_compute_frequencies (equ, g_value_get_uint (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
GST_OBJECT_UNLOCK (equ);
GST_EQUALIZER_TRANSFORM_UNLOCK (equ);
}
static void
gst_iir_equalizer_nbands_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec)
{
GstIirEqualizer *equ = GST_IIR_EQUALIZER (object);
switch (prop_id) {
case ARG_NUM_BANDS:
g_value_set_uint (value, equ->freq_band_count);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}

52
gst/equalizer/gstiirequalizernbands.h Normal file
View file

@ -0,0 +1,52 @@
/* GStreamer
* Copyright (C) <2004> Benjamin Otte <otte@gnome.org>
* <2007> Stefan Kost <ensonic@users.sf.net>
*
* 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., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef __GST_IIR_EQUALIZER_NBANDS__
#define __GST_IIR_EQUALIZER_NBANDS__
#include "gstiirequalizer.h"
typedef struct _GstIirEqualizerNBands GstIirEqualizerNBands;
typedef struct _GstIirEqualizerNBandsClass GstIirEqualizerNBandsClass;
#define GST_TYPE_IIR_EQUALIZER_NBANDS \
(gst_iir_equalizer_nbands_get_type())
#define GST_IIR_EQUALIZER_NBANDS(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_IIR_EQUALIZER_NBANDS,GstIirEqualizerNBands))
#define GST_IIR_EQUALIZER_NBANDS_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_IIR_EQUALIZER_NBANDS,GstIirEqualizerNBandsClass))
#define GST_IS_IIR_EQUALIZER_NBANDS(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_IIR_EQUALIZER_NBANDS))
#define GST_IS_IIR_EQUALIZER_NBANDS_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_IIR_EQUALIZER_NBANDS))
struct _GstIirEqualizerNBands
{
GstIirEqualizer equalizer;
};
struct _GstIirEqualizerNBandsClass
{
GstIirEqualizer equalizer_class;
};
extern GType gst_iir_equalizer_nbands_get_type(void);
#endif /* __GST_IIR_EQUALIZER_NBANDS__ */