mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

iirequalizer: fix equalizer and unit test

Browse source
This commit is contained in:
Wim Taymans 2012-02-06 15:20:55 +01:00
parent 41648135b2
commit dd26b14930
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gst/equalizer/gstiirequalizer.c
View file

@ -612,12 +612,12 @@ update_coefficients (GstIirEqualizer * equ)
/* Must be called with transform lock! */ /* Must be called with transform lock! */
static void static void
alloc_history (GstIirEqualizer * equ) alloc_history (GstIirEqualizer * equ, const GstAudioInfo * info)
{ {
/* 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 * GST_AUDIO_FILTER_CHANNELS (equ) * g_malloc0 (equ->history_size * GST_AUDIO_INFO_CHANNELS (info) *
equ->freq_band_count); equ->freq_band_count);
} }
@ -667,7 +667,7 @@ gst_iir_equalizer_compute_frequencies (GstIirEqualizer * equ, guint new_count)
} }
} }
alloc_history (equ); alloc_history (equ, GST_AUDIO_FILTER_INFO (equ));
/* set center frequencies and name band objects /* set center frequencies and name band objects
* FIXME: arg! we can't change the name of parented objects :( * FIXME: arg! we can't change the name of parented objects :(
@ -851,7 +851,7 @@ gst_iir_equalizer_transform_ip (GstBaseTransform * btrans, GstBuffer * buf)
} }
BANDS_UNLOCK (equ); BANDS_UNLOCK (equ);
gst_buffer_map (buf, &map, GST_MAP_WRITE); gst_buffer_map (buf, &map, GST_MAP_READWRITE);
equ->process (equ, map.data, map.size, channels); equ->process (equ, map.data, map.size, channels);
gst_buffer_unmap (buf, &map); gst_buffer_unmap (buf, &map);
@ -880,7 +880,7 @@ gst_iir_equalizer_setup (GstAudioFilter * audio, const GstAudioInfo * info)
return FALSE; return FALSE;
} }
alloc_history (equ); alloc_history (equ, info);
return TRUE; return TRUE;
} }

3
tests/check/elements/equalizer.c
View file

@ -35,6 +35,7 @@ GstPad *mysrcpad, *mysinkpad;
#define EQUALIZER_CAPS_STRING \ #define EQUALIZER_CAPS_STRING \
"audio/x-raw, " \ "audio/x-raw, " \
"format = (string) "GST_AUDIO_NE (F64) ", " \ "format = (string) "GST_AUDIO_NE (F64) ", " \
"layout = (string) interleaved, " \
"channels = (int) 1, " \ "channels = (int) 1, " \
"rate = (int) 48000" "rate = (int) 48000"
@ -43,6 +44,7 @@ static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/x-raw, " GST_STATIC_CAPS ("audio/x-raw, "
"format = (string) " GST_AUDIO_NE (F64) ", " "format = (string) " GST_AUDIO_NE (F64) ", "
"layout = (string) interleaved, "
"channels = (int) 1, " "rate = (int) 48000") "channels = (int) 1, " "rate = (int) 48000")
); );
static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
@ -50,6 +52,7 @@ static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/x-raw, " GST_STATIC_CAPS ("audio/x-raw, "
"format = (string) " GST_AUDIO_NE (F64) ", " "format = (string) " GST_AUDIO_NE (F64) ", "
"layout = (string) interleaved, "
"channels = (int) 1, " "rate = (int) 48000") "channels = (int) 1, " "rate = (int) 48000")
); );