diff options
| author | Michael Giacomelli <giac2000@hotmail.com> | 2008-09-04 18:02:10 +0000 |
|---|---|---|
| committer | Michael Giacomelli <giac2000@hotmail.com> | 2008-09-04 18:02:10 +0000 |
| commit | 46f85c4c547188d08fd90bad7734d38c654f13ea (patch) | |
| tree | f868536dccac3a8d4047d11f29310e99b896b03b /apps/codecs/libwma/wmadeci.c | |
| parent | 6c608263d7e19ea9189e6812eed8fc29996b4ef2 (diff) | |
Combine the Vorbis, WMA and AAC IMDCT functions and put them into the codeclib. Combined IMDCT is now based on existing Tremor transform. Reduces CPU for 192k AAC by 21MHz on Coldfire, and 5MHz on PP5024. WMA and Vorbis should have no functional changes since they already used this code. Further optimization is possible and would benefit all 3 codecs.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18412 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libwma/wmadeci.c')
| -rw-r--r-- | apps/codecs/libwma/wmadeci.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/apps/codecs/libwma/wmadeci.c b/apps/codecs/libwma/wmadeci.c index a96907135d..5677ac69f8 100644 --- a/apps/codecs/libwma/wmadeci.c +++ b/apps/codecs/libwma/wmadeci.c @@ -28,7 +28,6 @@ #include "wmadec.h" #include "wmafixed.h" #include "bitstream.h" -#include "mdct2.h" #define VLCBITS 7 /*7 is the lowest without glitching*/ @@ -1389,7 +1388,7 @@ static int wma_decode_block(WMADecodeContext *s, int32_t *scratch_buffer) n4 = s->block_len >>1; /*faster IMDCT from Vorbis*/ - mdct_backward( (1 << (12-bsize)), (int*)(*(s->coefs))[ch], (int*)scratch_buffer); + mdct_backward( (1 << (12-bsize)), (int32_t*)(*(s->coefs))[ch], (int32_t*)scratch_buffer); /*slower but more easily understood IMDCT from FFMPEG*/ //ff_imdct_calc(&s->mdct_ctx[bsize], @@ -1435,7 +1434,7 @@ static int wma_decode_frame(WMADecodeContext *s, int32_t *samples) /* read each block */ s->block_num = 0; s->block_pos = 0; - + for(;;) { |