diff options
-rw-r--r-- | apps/codecs/libwma/wmadeci.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/apps/codecs/libwma/wmadeci.c b/apps/codecs/libwma/wmadeci.c index e78b5a6962..99a098ea1f 100644 --- a/apps/codecs/libwma/wmadeci.c +++ b/apps/codecs/libwma/wmadeci.c | |||
@@ -26,7 +26,7 @@ | |||
26 | #include <codecs/lib/codeclib.h> | 26 | #include <codecs/lib/codeclib.h> |
27 | #include "asf.h" | 27 | #include "asf.h" |
28 | #include "wmadec.h" | 28 | #include "wmadec.h" |
29 | #include "wmafixed.c" | 29 | #include "wmafixed.h" |
30 | #include "bitstream.h" | 30 | #include "bitstream.h" |
31 | 31 | ||
32 | 32 | ||
@@ -115,8 +115,6 @@ typedef struct CoefVLCTable | |||
115 | CoefVLCTable; | 115 | CoefVLCTable; |
116 | 116 | ||
117 | static void wma_lsp_to_curve_init(WMADecodeContext *s, int frame_len); | 117 | static void wma_lsp_to_curve_init(WMADecodeContext *s, int frame_len); |
118 | int fft_calc(FFTContext *s, FFTComplex *z); | ||
119 | |||
120 | 118 | ||
121 | fixed32 coefsarray[MAX_CHANNELS][BLOCK_MAX_SIZE] IBSS_ATTR; | 119 | fixed32 coefsarray[MAX_CHANNELS][BLOCK_MAX_SIZE] IBSS_ATTR; |
122 | 120 | ||
@@ -127,10 +125,6 @@ fixed32 *tcosarray[5], *tsinarray[5]; | |||
127 | fixed32 tcos0[1024], tcos1[512], tcos2[256], tcos3[128], tcos4[64]; //these are the sin and cos rotations used by the MDCT | 125 | fixed32 tcos0[1024], tcos1[512], tcos2[256], tcos3[128], tcos4[64]; //these are the sin and cos rotations used by the MDCT |
128 | fixed32 tsin0[1024], tsin1[512], tsin2[256], tsin3[128], tsin4[64]; | 126 | fixed32 tsin0[1024], tsin1[512], tsin2[256], tsin3[128], tsin4[64]; |
129 | 127 | ||
130 | FFTComplex *exparray[5]; //these are the fft lookup tables | ||
131 | |||
132 | uint16_t *revarray[5]; | ||
133 | |||
134 | FFTComplex exptab0[512] IBSS_ATTR; | 128 | FFTComplex exptab0[512] IBSS_ATTR; |
135 | uint16_t revtab0[1024]; | 129 | uint16_t revtab0[1024]; |
136 | 130 | ||
@@ -811,10 +805,6 @@ int wma_decode_init(WMADecodeContext* s, asf_waveformatex_t *wfx) | |||
811 | tcosarray[0] = tcos0; tcosarray[1] = tcos1; tcosarray[2] = tcos2; tcosarray[3] = tcos3;tcosarray[4] = tcos4; | 805 | tcosarray[0] = tcos0; tcosarray[1] = tcos1; tcosarray[2] = tcos2; tcosarray[3] = tcos3;tcosarray[4] = tcos4; |
812 | tsinarray[0] = tsin0; tsinarray[1] = tsin1; tsinarray[2] = tsin2; tsinarray[3] = tsin3;tsinarray[4] = tsin4; | 806 | tsinarray[0] = tsin0; tsinarray[1] = tsin1; tsinarray[2] = tsin2; tsinarray[3] = tsin3;tsinarray[4] = tsin4; |
813 | 807 | ||
814 | /*these are folded up now*/ | ||
815 | exparray[0] = exptab0; //exparray[1] = exptab1; exparray[2] = exptab2; exparray[3] = exptab3; exparray[4] = exptab4; | ||
816 | revarray[0]=revtab0; //revarray[1]=revtab1; revarray[2]=revtab2; revarray[3]=revtab3; revarray[4]=revtab4; | ||
817 | |||
818 | s->mdct_tmp = mdct_tmp; /* temporary storage for imdct */ | 808 | s->mdct_tmp = mdct_tmp; /* temporary storage for imdct */ |
819 | for(i = 0; i < s->nb_block_sizes; ++i) | 809 | for(i = 0; i < s->nb_block_sizes; ++i) |
820 | { | 810 | { |