diff options
| author | Andree Buschmann <AndreeBuschmann@t-online.de> | 2012-10-01 21:33:27 +0200 |
|---|---|---|
| committer | Nils Wallménius <nils@rockbox.org> | 2012-10-01 21:37:03 +0200 |
| commit | b6bcb1338e06c3cfcc7e844dd248c332743de5c6 (patch) | |
| tree | 23729617eccc0e2b1f9364e9490de82311f01bb8 | |
| parent | 341e2c46ca841c6dd68cbd6a1a07977bf5557784 (diff) | |
opus: allocate buffers for X and freq in iram
speeds up decoding of 64kbps test file by 19MHz on h300 (cf)
and 2.5MHz on c200 (pp)
Change-Id: Idacd2f8962c20c518055d586daeec6b932b7ded2
Signed-off-by: Nils Wallménius <nils@rockbox.org>
| -rw-r--r-- | lib/rbcodec/codecs/libopus/celt/celt.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/lib/rbcodec/codecs/libopus/celt/celt.c b/lib/rbcodec/codecs/libopus/celt/celt.c index d91b8689b5..74ebee91b4 100644 --- a/lib/rbcodec/codecs/libopus/celt/celt.c +++ b/lib/rbcodec/codecs/libopus/celt/celt.c @@ -2296,6 +2296,9 @@ static void celt_decode_lost(CELTDecoder * OPUS_RESTRICT st, opus_val16 * OPUS_R RESTORE_STACK; } +#define FREQ_X_BUF_SIZE (2*8*120) /* stereo * nbShortMdcts * shortMdctSize */ +static celt_sig s_freq[FREQ_X_BUF_SIZE] IBSS_ATTR MEM_ALIGN_ATTR; /* 7680 byte */ +static celt_norm s_X[FREQ_X_BUF_SIZE] IBSS_ATTR MEM_ALIGN_ATTR; /* 3840 byte */ int celt_decode_with_ec(CELTDecoder * OPUS_RESTRICT st, const unsigned char *data, int len, opus_val16 * OPUS_RESTRICT pcm, int frame_size, ec_dec *dec) { int c, i, N; @@ -2398,8 +2401,18 @@ int celt_decode_with_ec(CELTDecoder * OPUS_RESTRICT st, const unsigned char *dat if (effEnd > st->mode->effEBands) effEnd = st->mode->effEBands; - ALLOC(freq, IMAX(CC,C)*N, celt_sig); /**< Interleaved signal MDCTs */ - ALLOC(X, C*N, celt_norm); /**< Interleaved normalised MDCTs */ + /**< Interleaved signal MDCTs */ + if (FREQ_X_BUF_SIZE >= IMAX(CC,C)*N) + freq = s_freq; + else + ALLOC(freq, IMAX(CC,C)*N, celt_sig); + + /**< Interleaved normalised MDCTs */ + if (FREQ_X_BUF_SIZE >= C*N) + X = s_X; + else + ALLOC(X, C*N, celt_norm); + ALLOC(bandE, st->mode->nbEBands*C, celt_ener); c=0; do for (i=0;i<M*st->mode->eBands[st->start];i++) |