diff options
| author | Dave Hooper <dave@beermex.com> | 2010-02-17 00:49:53 +0000 |
|---|---|---|
| committer | Dave Hooper <dave@beermex.com> | 2010-02-17 00:49:53 +0000 |
| commit | 42774d3128b91d5a37344cb40d56d3c4d147e5f2 (patch) | |
| tree | bf336b407992ec9a5e454556f3351e3f8a0d10de /apps/codecs/liba52/parse.c | |
| parent | 62257ebc38bc0a3095b25dd0f58c4c8215edf602 (diff) | |
| download | rockbox-42774d3128b91d5a37344cb40d56d3c4d147e5f2.zip rockbox-42774d3128b91d5a37344cb40d56d3c4d147e5f2.tar.gz rockbox-42774d3128b91d5a37344cb40d56d3c4d147e5f2.tar.bz2 rockbox-42774d3128b91d5a37344cb40d56d3c4d147e5f2.tar.xz | |
Merge from branches/mdctexp - faster ifft+imdct in codec lib
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24712 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/liba52/parse.c')
| -rw-r--r-- | apps/codecs/liba52/parse.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/apps/codecs/liba52/parse.c b/apps/codecs/liba52/parse.c index 2a065b4..f2b0ce4 100644 --- a/apps/codecs/liba52/parse.c +++ b/apps/codecs/liba52/parse.c @@ -881,7 +881,7 @@ int a52_block (a52_state_t * state) state->dynrng, 0, 7); for (i = 7; i < 256; i++) (samples-256)[i] = 0; - a52_imdct_512 (samples - 256, samples + 1536 - 256, state->bias); + a52_imdct_512 (samples - 256, samples + 1536 - 256); } else { /* just skip the LFE coefficients */ coeff_get (state, samples + 1280, &state->lfe_expbap, &quant, @@ -910,11 +910,9 @@ int a52_block (a52_state_t * state) if (coeff[i]) { if (blksw[i]) - a52_imdct_256 (samples + 256 * i, samples + 1536 + 256 * i, - bias); + a52_imdct_256 (samples + 256 * i, samples + 1536 + 256 * i); else - a52_imdct_512 (samples + 256 * i, samples + 1536 + 256 * i, - bias); + a52_imdct_512 (samples + 256 * i, samples + 1536 + 256 * i); } else { int j; @@ -923,28 +921,26 @@ int a52_block (a52_state_t * state) } } - a52_downmix (samples, state->acmod, state->output, state->bias, + a52_downmix (samples, state->acmod, state->output, state->clev, state->slev); } else { nfchans = nfchans_tbl[state->output & A52_CHANNEL_MASK]; - a52_downmix (samples, state->acmod, state->output, 0, + a52_downmix (samples, state->acmod, state->output, state->clev, state->slev); if (!state->downmixed) { state->downmixed = 1; - a52_downmix (samples + 1536, state->acmod, state->output, 0, + a52_downmix (samples + 1536, state->acmod, state->output, state->clev, state->slev); } if (blksw[0]) for (i = 0; i < nfchans; i++) - a52_imdct_256 (samples + 256 * i, samples + 1536 + 256 * i, - state->bias); + a52_imdct_256 (samples + 256 * i, samples + 1536 + 256 * i); else for (i = 0; i < nfchans; i++) - a52_imdct_512 (samples + 256 * i, samples + 1536 + 256 * i, - state->bias); + a52_imdct_512 (samples + 256 * i, samples + 1536 + 256 * i); } return 0; |