diff options
author | Nils Wallménius <nils@rockbox.org> | 2012-09-25 17:19:05 +0200 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2012-09-25 17:19:05 +0200 |
commit | 5f60590e807dab79e46efa29b62a5d64e56f3451 (patch) | |
tree | 78e9f61e20600f82c59229653774accaeca1bf05 | |
parent | afc6b3f0215037821382c957d975dfc8f727b2a9 (diff) | |
download | rockbox-5f60590e807dab79e46efa29b62a5d64e56f3451.tar.gz rockbox-5f60590e807dab79e46efa29b62a5d64e56f3451.zip |
opus: put some const tables and structs in iram
Speeds up decoding of a 64kbps test file by 20MHz on h300 (cf)
and 1MHz on c200 (pp)
Change-Id: Ia2adc0a3ad86abce8f948062eb53a8ac14c2cdf2
-rw-r--r-- | lib/rbcodec/codecs/libopus/celt/static_modes_fixed.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/rbcodec/codecs/libopus/celt/static_modes_fixed.h b/lib/rbcodec/codecs/libopus/celt/static_modes_fixed.h index 216df9e605..92e5fe5877 100644 --- a/lib/rbcodec/codecs/libopus/celt/static_modes_fixed.h +++ b/lib/rbcodec/codecs/libopus/celt/static_modes_fixed.h | |||
@@ -6,7 +6,7 @@ | |||
6 | 6 | ||
7 | #ifndef DEF_WINDOW120 | 7 | #ifndef DEF_WINDOW120 |
8 | #define DEF_WINDOW120 | 8 | #define DEF_WINDOW120 |
9 | static const opus_val16 window120[120] = { | 9 | static const opus_val16 window120[120] ICONST_ATTR = { |
10 | 2, 20, 55, 108, 178, | 10 | 2, 20, 55, 108, 178, |
11 | 266, 372, 494, 635, 792, | 11 | 266, 372, 494, 635, 792, |
12 | 966, 1157, 1365, 1590, 1831, | 12 | 966, 1157, 1365, 1590, 1831, |
@@ -96,7 +96,7 @@ static const unsigned char cache_caps50[168] = { | |||
96 | 96 | ||
97 | #ifndef FFT_TWIDDLES48000_960 | 97 | #ifndef FFT_TWIDDLES48000_960 |
98 | #define FFT_TWIDDLES48000_960 | 98 | #define FFT_TWIDDLES48000_960 |
99 | static const kiss_twiddle_cpx fft_twiddles48000_960[480] = { | 99 | static const kiss_twiddle_cpx fft_twiddles48000_960[480] ICONST_ATTR = { |
100 | {32767, 0}, {32766, -429}, | 100 | {32767, 0}, {32766, -429}, |
101 | {32757, -858}, {32743, -1287}, | 101 | {32757, -858}, {32743, -1287}, |
102 | {32724, -1715}, {32698, -2143}, | 102 | {32724, -1715}, {32698, -2143}, |
@@ -424,7 +424,7 @@ static const opus_int16 fft_bitrev60[60] = { | |||
424 | 424 | ||
425 | #ifndef FFT_STATE48000_960_0 | 425 | #ifndef FFT_STATE48000_960_0 |
426 | #define FFT_STATE48000_960_0 | 426 | #define FFT_STATE48000_960_0 |
427 | static const kiss_fft_state fft_state48000_960_0 = { | 427 | static const kiss_fft_state fft_state48000_960_0 ICONST_ATTR = { |
428 | 480, /* nfft */ | 428 | 480, /* nfft */ |
429 | -1, /* shift */ | 429 | -1, /* shift */ |
430 | {4, 120, 4, 30, 2, 15, 3, 5, 5, 1, 0, 0, 0, 0, 0, 0, }, /* factors */ | 430 | {4, 120, 4, 30, 2, 15, 3, 5, 5, 1, 0, 0, 0, 0, 0, 0, }, /* factors */ |
@@ -435,7 +435,7 @@ fft_twiddles48000_960, /* bitrev */ | |||
435 | 435 | ||
436 | #ifndef FFT_STATE48000_960_1 | 436 | #ifndef FFT_STATE48000_960_1 |
437 | #define FFT_STATE48000_960_1 | 437 | #define FFT_STATE48000_960_1 |
438 | static const kiss_fft_state fft_state48000_960_1 = { | 438 | static const kiss_fft_state fft_state48000_960_1 ICONST_ATTR = { |
439 | 240, /* nfft */ | 439 | 240, /* nfft */ |
440 | 1, /* shift */ | 440 | 1, /* shift */ |
441 | {4, 60, 4, 15, 3, 5, 5, 1, 0, 0, 0, 0, 0, 0, 0, 0, }, /* factors */ | 441 | {4, 60, 4, 15, 3, 5, 5, 1, 0, 0, 0, 0, 0, 0, 0, 0, }, /* factors */ |
@@ -446,7 +446,7 @@ fft_twiddles48000_960, /* bitrev */ | |||
446 | 446 | ||
447 | #ifndef FFT_STATE48000_960_2 | 447 | #ifndef FFT_STATE48000_960_2 |
448 | #define FFT_STATE48000_960_2 | 448 | #define FFT_STATE48000_960_2 |
449 | static const kiss_fft_state fft_state48000_960_2 = { | 449 | static const kiss_fft_state fft_state48000_960_2 ICONST_ATTR = { |
450 | 120, /* nfft */ | 450 | 120, /* nfft */ |
451 | 2, /* shift */ | 451 | 2, /* shift */ |
452 | {4, 30, 2, 15, 3, 5, 5, 1, 0, 0, 0, 0, 0, 0, 0, 0, }, /* factors */ | 452 | {4, 30, 2, 15, 3, 5, 5, 1, 0, 0, 0, 0, 0, 0, 0, 0, }, /* factors */ |
@@ -457,7 +457,7 @@ fft_twiddles48000_960, /* bitrev */ | |||
457 | 457 | ||
458 | #ifndef FFT_STATE48000_960_3 | 458 | #ifndef FFT_STATE48000_960_3 |
459 | #define FFT_STATE48000_960_3 | 459 | #define FFT_STATE48000_960_3 |
460 | static const kiss_fft_state fft_state48000_960_3 = { | 460 | static const kiss_fft_state fft_state48000_960_3 ICONST_ATTR = { |
461 | 60, /* nfft */ | 461 | 60, /* nfft */ |
462 | 3, /* shift */ | 462 | 3, /* shift */ |
463 | {4, 15, 3, 5, 5, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }, /* factors */ | 463 | {4, 15, 3, 5, 5, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }, /* factors */ |
@@ -470,7 +470,7 @@ fft_twiddles48000_960, /* bitrev */ | |||
470 | 470 | ||
471 | #ifndef MDCT_TWIDDLES960 | 471 | #ifndef MDCT_TWIDDLES960 |
472 | #define MDCT_TWIDDLES960 | 472 | #define MDCT_TWIDDLES960 |
473 | static const opus_val16 mdct_twiddles960[481] = { | 473 | static const opus_val16 mdct_twiddles960[481] ICONST_ATTR = { |
474 | 32767, 32767, 32767, 32767, 32766, | 474 | 32767, 32767, 32767, 32767, 32766, |
475 | 32763, 32762, 32759, 32757, 32753, | 475 | 32763, 32762, 32759, 32757, 32753, |
476 | 32751, 32747, 32743, 32738, 32733, | 476 | 32751, 32747, 32743, 32738, 32733, |
@@ -570,7 +570,7 @@ static const opus_val16 mdct_twiddles960[481] = { | |||
570 | 0, }; | 570 | 0, }; |
571 | #endif | 571 | #endif |
572 | 572 | ||
573 | static const CELTMode mode48000_960_120 = { | 573 | static const CELTMode mode48000_960_120 ICONST_ATTR = { |
574 | 48000, /* Fs */ | 574 | 48000, /* Fs */ |
575 | 120, /* overlap */ | 575 | 120, /* overlap */ |
576 | 21, /* nbEBands */ | 576 | 21, /* nbEBands */ |