equalizer: fix filter history usage. Fixes #597397

The process functions where overwriting the history for each channel. Also pull
some static things out of the inner loop.
This commit is contained in:
Stefan Kost 2009-10-05 22:43:11 +03:00
parent 0040d01265
commit 7b6e594b69

View file

@ -577,17 +577,16 @@ 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); \
guint i, c, f; \ guint i, c, f, nf = equ->freq_band_count; \
BIG_TYPE cur; \ BIG_TYPE cur; \
GstIirEqualizerBand **filters = equ->bands; \
\ \
for (i = 0; i < frames; i++) { \ for (i = 0; i < frames; i++) { \
for (c = 0; c < channels; c++) { \
SecondOrderHistory ## TYPE *history = equ->history; \ SecondOrderHistory ## TYPE *history = equ->history; \
for (c = 0; c < channels; c++) { \
cur = *((TYPE *) data); \ cur = *((TYPE *) data); \
for (f = 0; f < equ->freq_band_count; f++) { \ for (f = 0; f < nf; f++) { \
GstIirEqualizerBand *filter = equ->bands[f]; \ cur = one_step_ ## TYPE (filters[f], history, cur); \
\
cur = one_step_ ## TYPE (filter, history, cur); \
history++; \ history++; \
} \ } \
cur = CLAMP (cur, MIN_VAL, MAX_VAL); \ cur = CLAMP (cur, MIN_VAL, MAX_VAL); \
@ -628,17 +627,16 @@ 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); \
guint i, c, f; \ guint i, c, f, nf = equ->freq_band_count; \
TYPE cur; \ TYPE cur; \
GstIirEqualizerBand **filters = equ->bands; \
\ \
for (i = 0; i < frames; i++) { \ for (i = 0; i < frames; i++) { \
for (c = 0; c < channels; c++) { \
SecondOrderHistory ## TYPE *history = equ->history; \ SecondOrderHistory ## TYPE *history = equ->history; \
for (c = 0; c < channels; c++) { \
cur = *((TYPE *) data); \ cur = *((TYPE *) data); \
for (f = 0; f < equ->freq_band_count; f++) { \ for (f = 0; f < nf; f++) { \
GstIirEqualizerBand *filter = equ->bands[f]; \ cur = one_step_ ## TYPE (filters[f], history, cur); \
\
cur = one_step_ ## TYPE (filter, history, cur); \
history++; \ history++; \
} \ } \
*((TYPE *) data) = (TYPE) cur; \ *((TYPE *) data) = (TYPE) cur; \