[FFmpeg-cvslog] r16657 - trunk/libavcodec/nellymoserdec.c

[vitor]

Author: vitor
Date: Sat Jan 17 21:06:08 2009
New Revision: 16657

Log:
Use shared sine window instead of defining another one.

Modified:
   trunk/libavcodec/nellymoserdec.c

Modified: trunk/libavcodec/nellymoserdec.c
==============================================================================
--- trunk/libavcodec/nellymoserdec.c	Sat Jan 17 19:34:47 2009	(r16656)
+++ trunk/libavcodec/nellymoserdec.c	Sat Jan 17 21:06:08 2009	(r16657)
@@ -53,8 +53,6 @@ typedef struct NellyMoserDecodeContext {
     DECLARE_ALIGNED_16(float,imdct_out[NELLY_BUF_LEN * 2]);
 } NellyMoserDecodeContext;
 
-static DECLARE_ALIGNED_16(float,sine_window[128]);
-
 static void overlap_and_window(NellyMoserDecodeContext *s, float *state, float *audio, float *a_in)
 {
     int bot, top;
@@ -63,8 +61,8 @@ static void overlap_and_window(NellyMose
     top = NELLY_BUF_LEN-1;
 
     while (bot < NELLY_BUF_LEN) {
-        audio[bot] = a_in [bot]*sine_window[bot]
-                    +state[bot]*sine_window[top] + s->add_bias;
+        audio[bot] = a_in [bot]*ff_sine_128[bot]
+                    +state[bot]*ff_sine_128[top] + s->add_bias;
 
         bot++;
         top--;
@@ -144,8 +142,8 @@ static av_cold int decode_init(AVCodecCo
     }
 
     /* Generate overlap window */
-    if (!sine_window[0])
-        ff_sine_window_init(sine_window, 128);
+    if (!ff_sine_128[127])
+        ff_sine_window_init(ff_sine_128, 128);
 
     avctx->sample_fmt = SAMPLE_FMT_S16;
     avctx->channel_layout = CH_LAYOUT_MONO;