Make the Kaiser-Bessel window generator a common function

Patch by Robert Swain, robert d swain a gmail d com

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@11514 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index fb23725269b02740f83318aef269edb917cb0751..5b0f868397ebd094a38979bfbca607fa3b4c4010 100644 (file)
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -196,30 +196,6 @@ typedef struct {
     AVCodecContext *avctx;                  ///< parent context
 } 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
@@ -301,7 +277,7 @@ static int ac3_decode_init(AVCodecContext *avctx)
     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 --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index d541fe0abdf444a3fb708e4cfaaaafa83fa3684c..da4c3a9089ccb56d77682e9f8491cc89f5755f80 100644 (file)
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -645,6 +645,12 @@ typedef struct MDCTContext {
     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 --git a/libavcodec/mdct.c b/libavcodec/mdct.c
index de32752899cbf3d2f476e01c61e7d4eca88e921f..c7008df4f148b4512d56237a7bd51af8690304ef 100644 (file)
--- a/libavcodec/mdct.c
+++ b/libavcodec/mdct.c
@@ -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.
  */