diff options
Diffstat (limited to 'apps/codecs/libatrac')
-rw-r--r-- | apps/codecs/libatrac/atrac3.c | 7 | ||||
-rw-r--r-- | apps/codecs/libatrac/atrac3.h | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/apps/codecs/libatrac/atrac3.c b/apps/codecs/libatrac/atrac3.c index ad57ad6237..3555f74cfb 100644 --- a/apps/codecs/libatrac/atrac3.c +++ b/apps/codecs/libatrac/atrac3.c | |||
@@ -40,7 +40,6 @@ | |||
40 | #include "atrac3data.h" | 40 | #include "atrac3data.h" |
41 | #include "atrac3data_fixed.h" | 41 | #include "atrac3data_fixed.h" |
42 | #include "fixp_math.h" | 42 | #include "fixp_math.h" |
43 | #include "../lib/mdct2.h" | ||
44 | 43 | ||
45 | #define JOINT_STEREO 0x12 | 44 | #define JOINT_STEREO 0x12 |
46 | #define STEREO 0x2 | 45 | #define STEREO 0x2 |
@@ -260,7 +259,7 @@ static void iqmf (int32_t *inlo, int32_t *inhi, unsigned int nIn, int32_t *pOut, | |||
260 | static void IMLT(int32_t *pInput, int32_t *pOutput) | 259 | static void IMLT(int32_t *pInput, int32_t *pOutput) |
261 | { | 260 | { |
262 | /* Apply the imdct. */ | 261 | /* Apply the imdct. */ |
263 | mdct_backward(512, pInput, pOutput); | 262 | ff_imdct_calc(9, pOutput, pInput); |
264 | 263 | ||
265 | /* Windowing. */ | 264 | /* Windowing. */ |
266 | atrac3_imdct_windowing(pOutput, window_lookup); | 265 | atrac3_imdct_windowing(pOutput, window_lookup); |
@@ -297,7 +296,7 @@ static int decode_bytes(const uint8_t* inbuffer, uint8_t* out, int bytes){ | |||
297 | } | 296 | } |
298 | 297 | ||
299 | 298 | ||
300 | static void init_atrac3_transforms(void) { | 299 | static void init_atrac3_transforms() { |
301 | int32_t s; | 300 | int32_t s; |
302 | int i; | 301 | int i; |
303 | 302 | ||
@@ -312,7 +311,7 @@ static void init_atrac3_transforms(void) { | |||
312 | qmf_window[i] = s; | 311 | qmf_window[i] = s; |
313 | qmf_window[47 - i] = s; | 312 | qmf_window[47 - i] = s; |
314 | } | 313 | } |
315 | } | 314 | } |
316 | 315 | ||
317 | 316 | ||
318 | /** | 317 | /** |
diff --git a/apps/codecs/libatrac/atrac3.h b/apps/codecs/libatrac/atrac3.h index 1878efeb1b..d3fdc5056a 100644 --- a/apps/codecs/libatrac/atrac3.h +++ b/apps/codecs/libatrac/atrac3.h | |||
@@ -21,9 +21,7 @@ | |||
21 | 21 | ||
22 | #include "ffmpeg_bitstream.h" | 22 | #include "ffmpeg_bitstream.h" |
23 | #include "../librm/rm.h" | 23 | #include "../librm/rm.h" |
24 | #ifdef ROCKBOX | ||
25 | #include "codeclib.h" | 24 | #include "codeclib.h" |
26 | #endif | ||
27 | 25 | ||
28 | #if (CONFIG_CPU == PP5022) || (CONFIG_CPU == PP5024) || (CONFIG_CPU == MCF5250) | 26 | #if (CONFIG_CPU == PP5022) || (CONFIG_CPU == PP5024) || (CONFIG_CPU == MCF5250) |
29 | /* PP5022/24 and MCF5250 have larger IRAM */ | 27 | /* PP5022/24 and MCF5250 have larger IRAM */ |