commit 3dbc1d0df9eb82b0d376d6db70d976e2c4b0c668
author Jean-Marc Valin <jean-marc.valin@usherbrooke.ca> Sat Mar 08 15:21:24 2008 +1100
committer Jean-Marc Valin <jean-marc.valin@usherbrooke.ca> Sat Mar 08 15:21:24 2008 +1100
tree 87deaab87b9e657341aa38a3c028231180936993
parent 03f9ed300583c4eb8ebb81abf49c427d24893153

cleaning up some of the mode stuff

libcelt/modes.c

diff --git a/libcelt/modes.c b/libcelt/modes.c
index b99dc0a..87bdd10 100644
--- a/libcelt/modes.c
+++ b/libcelt/modes.c
@@ -218,7 +218,8 @@
    int res;
    int N, i;
    CELTMode *mode;
-   
+   celt_word16_t *window;
+
    /* The good thing here is that permutation of the arguments will automatically be invalid */
    
    if (Fs < 32000 || Fs > 64000)
@@ -268,15 +269,16 @@
    N = mode->mdctSize;
    mdct_init(&mode->mdct, 2*N);
 
-   mode->window = (celt_word16_t*)celt_alloc(mode->overlap*sizeof(celt_word16_t));
+   window = (celt_word16_t*)celt_alloc(mode->overlap*sizeof(celt_word16_t));
 
 #ifndef FIXED_POINT
    for (i=0;i<mode->overlap;i++)
-      mode->window[i] = Q15ONE*sin(.5*M_PI* sin(.5*M_PI*(i+.5)/mode->overlap) * sin(.5*M_PI*(i+.5)/mode->overlap));
+      window[i] = Q15ONE*sin(.5*M_PI* sin(.5*M_PI*(i+.5)/mode->overlap) * sin(.5*M_PI*(i+.5)/mode->overlap));
 #else
    for (i=0;i<mode->overlap;i++)
-      mode->window[i] = MIN32(32767,32768.*sin(.5*M_PI* sin(.5*M_PI*(i+.5)/mode->overlap) * sin(.5*M_PI*(i+.5)/mode->overlap)));
+      window[i] = MIN32(32767,32768.*sin(.5*M_PI* sin(.5*M_PI*(i+.5)/mode->overlap) * sin(.5*M_PI*(i+.5)/mode->overlap)));
 #endif
+   mode->window = window;
 
    mode->marker_start = MODEVALID;
    mode->marker_end = MODEVALID;
@@ -303,7 +305,7 @@
    }
    celt_free((int**)mode->bits);
    mdct_clear(&mode->mdct);
-   celt_free(mode->window);
+   celt_free((celt_word16_t*)mode->window);
 
    mode->marker_start = MODEFREED;
    mode->marker_end = MODEFREED;