summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Giacomelli <giac2000@hotmail.com>2010-02-20 00:29:31 +0000
committerMichael Giacomelli <giac2000@hotmail.com>2010-02-20 00:29:31 +0000
commit93caf52db5e0afe826278c148936bdfa563724f1 (patch)
tree6dcb12c82459e8997bfbf4ef1fb4f73d1ad37f45
parentccd50dd2d7bc15b98d21b19d2f6cba8dc4b6217b (diff)
downloadrockbox-93caf52db5e0afe826278c148936bdfa563724f1.tar.gz
rockbox-93caf52db5e0afe826278c148936bdfa563724f1.zip
Use new MDCT library for libfaad. Speeds up AAC-LC by 2.5MHz.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24781 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/codecs/libfaad/filtbank.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/apps/codecs/libfaad/filtbank.c b/apps/codecs/libfaad/filtbank.c
index 90175d953c..41c8291d9a 100644
--- a/apps/codecs/libfaad/filtbank.c
+++ b/apps/codecs/libfaad/filtbank.c
@@ -267,7 +267,7 @@ void ifilter_bank(uint8_t window_sequence, uint8_t window_shape,
267 { 267 {
268 case ONLY_LONG_SEQUENCE: 268 case ONLY_LONG_SEQUENCE:
269 /* perform iMDCT */ 269 /* perform iMDCT */
270 mdct_backward(2048, freq_in, transf_buf); 270 ff_imdct_calc(11, transf_buf, freq_in);
271 271
272 /* add second half output of previous frame to windowed output of current frame */ 272 /* add second half output of previous frame to windowed output of current frame */
273 vector_fmul_add_add(time_out, transf_buf, window_long_prev, overlap, nlong); 273 vector_fmul_add_add(time_out, transf_buf, window_long_prev, overlap, nlong);
@@ -279,7 +279,7 @@ void ifilter_bank(uint8_t window_sequence, uint8_t window_shape,
279 279
280 case LONG_START_SEQUENCE: 280 case LONG_START_SEQUENCE:
281 /* perform iMDCT */ 281 /* perform iMDCT */
282 mdct_backward(2048, freq_in, transf_buf); 282 ff_imdct_calc(11, transf_buf, freq_in);
283 283
284 /* add second half output of previous frame to windowed output of current frame */ 284 /* add second half output of previous frame to windowed output of current frame */
285 vector_fmul_add_add(time_out, transf_buf, window_long_prev, overlap, nlong); 285 vector_fmul_add_add(time_out, transf_buf, window_long_prev, overlap, nlong);
@@ -298,14 +298,14 @@ void ifilter_bank(uint8_t window_sequence, uint8_t window_shape,
298 /*this could be assemblerized too, but this case is extremely uncommon*/ 298 /*this could be assemblerized too, but this case is extremely uncommon*/
299 299
300 /* perform iMDCT for each short block */ 300 /* perform iMDCT for each short block */
301 mdct_backward(256, freq_in+0*nshort, transf_buf+2*nshort*0); 301 ff_imdct_calc(8, transf_buf+2*nshort*0, freq_in+0*nshort);
302 mdct_backward(256, freq_in+1*nshort, transf_buf+2*nshort*1); 302 ff_imdct_calc(8, transf_buf+2*nshort*1, freq_in+1*nshort);
303 mdct_backward(256, freq_in+2*nshort, transf_buf+2*nshort*2); 303 ff_imdct_calc(8, transf_buf+2*nshort*2, freq_in+2*nshort);
304 mdct_backward(256, freq_in+3*nshort, transf_buf+2*nshort*3); 304 ff_imdct_calc(8, transf_buf+2*nshort*3, freq_in+3*nshort);
305 mdct_backward(256, freq_in+4*nshort, transf_buf+2*nshort*4); 305 ff_imdct_calc(8, transf_buf+2*nshort*4, freq_in+4*nshort);
306 mdct_backward(256, freq_in+5*nshort, transf_buf+2*nshort*5); 306 ff_imdct_calc(8, transf_buf+2*nshort*5, freq_in+5*nshort);
307 mdct_backward(256, freq_in+6*nshort, transf_buf+2*nshort*6); 307 ff_imdct_calc(8, transf_buf+2*nshort*6, freq_in+6*nshort);
308 mdct_backward(256, freq_in+7*nshort, transf_buf+2*nshort*7); 308 ff_imdct_calc(8, transf_buf+2*nshort*7, freq_in+7*nshort);
309 309
310 /* add second half output of previous frame to windowed output of current frame */ 310 /* add second half output of previous frame to windowed output of current frame */
311 for (i = 0; i < nflat_ls; i++) 311 for (i = 0; i < nflat_ls; i++)
@@ -336,7 +336,7 @@ void ifilter_bank(uint8_t window_sequence, uint8_t window_shape,
336 336
337 case LONG_STOP_SEQUENCE: 337 case LONG_STOP_SEQUENCE:
338 /* perform iMDCT */ 338 /* perform iMDCT */
339 mdct_backward(2048, freq_in, transf_buf); 339 ff_imdct_calc(11, transf_buf, freq_in);
340 340
341 /* add second half output of previous frame to windowed output of current frame */ 341 /* add second half output of previous frame to windowed output of current frame */
342 /* construct first half window using padding with 1's and 0's */ 342 /* construct first half window using padding with 1's and 0's */