diff options
Diffstat (limited to 'apps/codecs/libwma/wmadeci.c')
-rw-r--r-- | apps/codecs/libwma/wmadeci.c | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/apps/codecs/libwma/wmadeci.c b/apps/codecs/libwma/wmadeci.c index ae1a93ecf2..6ff6a176ee 100644 --- a/apps/codecs/libwma/wmadeci.c +++ b/apps/codecs/libwma/wmadeci.c | |||
@@ -452,17 +452,6 @@ int wma_decode_init(WMADecodeContext* s, asf_waveformatex_t *wfx) | |||
452 | } | 452 | } |
453 | } | 453 | } |
454 | 454 | ||
455 | /*Not using the ffmpeg IMDCT anymore*/ | ||
456 | |||
457 | /* mdct_init_global(); | ||
458 | |||
459 | for(i = 0; i < s->nb_block_sizes; ++i) | ||
460 | { | ||
461 | ff_mdct_init(&s->mdct_ctx[i], s->frame_len_bits - i + 1, 1); | ||
462 | |||
463 | } | ||
464 | */ | ||
465 | |||
466 | /* ffmpeg uses malloc to only allocate as many window sizes as needed. | 455 | /* ffmpeg uses malloc to only allocate as many window sizes as needed. |
467 | * However, we're really only interested in the worst case memory usage. | 456 | * However, we're really only interested in the worst case memory usage. |
468 | * In the worst case you can have 5 window sizes, 128 doubling up 2048 | 457 | * In the worst case you can have 5 window sizes, 128 doubling up 2048 |
@@ -1253,14 +1242,9 @@ static int wma_decode_block(WMADecodeContext *s, int32_t *scratch_buffer) | |||
1253 | 1242 | ||
1254 | n4 = s->block_len >>1; | 1243 | n4 = s->block_len >>1; |
1255 | 1244 | ||
1256 | /*faster IMDCT from Vorbis*/ | 1245 | ff_imdct_calc( (s->frame_len_bits - bsize + 1), |
1257 | mdct_backward( (1 << (s->block_len_bits+1)), (int32_t*)(*(s->coefs))[ch], (int32_t*)scratch_buffer); | 1246 | (int32_t*)scratch_buffer, |
1258 | 1247 | (*(s->coefs))[ch]); | |
1259 | /*slower but more easily understood IMDCT from FFMPEG*/ | ||
1260 | //ff_imdct_calc(&s->mdct_ctx[bsize], | ||
1261 | // output, | ||
1262 | // (*(s->coefs))[ch]); | ||
1263 | |||
1264 | 1248 | ||
1265 | /* add in the frame */ | 1249 | /* add in the frame */ |
1266 | index = (s->frame_len / 2) + s->block_pos - n4; | 1250 | index = (s->frame_len / 2) + s->block_pos - n4; |