# HG changeset patch # User andoma # Date 1200136279 0 # Node ID 5077d15625730d80b18f204fdd8c944375731061 # Parent c7a61f83de7345bdc49c65a8dc365c2dc220c73f Make the Kaiser-Bessel window generator a common function Patch by Robert Swain, robert d swain a gmail d com diff -r c7a61f83de73 -r 5077d1562573 ac3dec.c --- a/ac3dec.c Fri Jan 11 21:34:05 2008 +0000 +++ b/ac3dec.c Sat Jan 12 11:11:19 2008 +0000 @@ -197,30 +197,6 @@ } AC3DecodeContext; /** - * Generate a Kaiser-Bessel Derived Window. - */ -static void ac3_window_init(float *window) -{ - int i, j; - double sum = 0.0, bessel, tmp; - double local_window[256]; - double alpha2 = (5.0 * M_PI / 256.0) * (5.0 * M_PI / 256.0); - - for (i = 0; i < 256; i++) { - tmp = i * (256 - i) * alpha2; - bessel = 1.0; - for (j = 100; j > 0; j--) /* default to 100 iterations */ - bessel = bessel * tmp / (j * j) + 1; - sum += bessel; - local_window[i] = sum; - } - - sum++; - for (i = 0; i < 256; i++) - window[i] = sqrt(local_window[i] / sum); -} - -/** * Symmetrical Dequantization * reference: Section 7.3.3 Expansion of Mantissas for Symmetrical Quantization * Tables 7.19 to 7.23 @@ -301,7 +277,7 @@ ac3_tables_init(); ff_mdct_init(&s->imdct_256, 8, 1); ff_mdct_init(&s->imdct_512, 9, 1); - ac3_window_init(s->window); + ff_kbd_window_init(s->window); dsputil_init(&s->dsp, avctx); av_init_random(0, &s->dith_state); diff -r c7a61f83de73 -r 5077d1562573 dsputil.h --- a/dsputil.h Fri Jan 11 21:34:05 2008 +0000 +++ b/dsputil.h Sat Jan 12 11:11:19 2008 +0000 @@ -645,6 +645,12 @@ FFTContext fft; } MDCTContext; +/** + * Generate a Kaiser-Bessel Derived Window. + * @param window pointer to half window + */ +void ff_kbd_window_init(float *window); + int ff_mdct_init(MDCTContext *s, int nbits, int inverse); void ff_imdct_calc(MDCTContext *s, FFTSample *output, const FFTSample *input, FFTSample *tmp); diff -r c7a61f83de73 -r 5077d1562573 mdct.c --- a/mdct.c Fri Jan 11 21:34:05 2008 +0000 +++ b/mdct.c Sat Jan 12 11:11:19 2008 +0000 @@ -25,6 +25,28 @@ * MDCT/IMDCT transforms. */ +// Generate a Kaiser-Bessel Derived Window. +void ff_kbd_window_init(float *window) +{ + int i, j; + double sum = 0.0, bessel, tmp; + double local_window[256]; + double alpha2 = (5.0 * M_PI / 256.0) * (5.0 * M_PI / 256.0); + + for (i = 0; i < 256; i++) { + tmp = i * (256 - i) * alpha2; + bessel = 1.0; + for (j = 100; j > 0; j--) /* default to 100 iterations */ + bessel = bessel * tmp / (j * j) + 1; + sum += bessel; + local_window[i] = sum; + } + + sum++; + for (i = 0; i < 256; i++) + window[i] = sqrt(local_window[i] / sum); +} + /** * init MDCT or IMDCT computation. */