diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2007-12-09 03:21:33 +0000 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2007-12-09 03:21:33 +0000 |
| commit | 66ecf18e3864aa908319e7cb5fd73f308cb4302c (patch) | |
| tree | ca62f5b50dc1468e913a2bd71bc52aaddbf89309 /libavcodec/ac3dec.c | |
| parent | 59e6f60a99741137811dea2c2980e1f8adbdf0df (diff) | |
| download | ffmpeg-66ecf18e3864aa908319e7cb5fd73f308cb4302c.tar.gz | |
cosmetics: rename ac3 tables
Originally committed as revision 11193 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/ac3dec.c')
| -rw-r--r-- | libavcodec/ac3dec.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 2996881e7b..be061854ec 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -947,11 +947,11 @@ static int ac3_parse_audio_block(AC3DecodeContext *ctx, int blk) /* bit allocation information */ if (get_bits1(gb)) { - ctx->bit_alloc_params.sdecay = ff_sdecaytab[get_bits(gb, 2)] >> ctx->bit_alloc_params.halfratecod; - ctx->bit_alloc_params.fdecay = ff_fdecaytab[get_bits(gb, 2)] >> ctx->bit_alloc_params.halfratecod; - ctx->bit_alloc_params.sgain = ff_sgaintab[get_bits(gb, 2)]; - ctx->bit_alloc_params.dbknee = ff_dbkneetab[get_bits(gb, 2)]; - ctx->bit_alloc_params.floor = ff_floortab[get_bits(gb, 3)]; + ctx->bit_alloc_params.sdecay = ff_ac3_slow_decay_tab[get_bits(gb, 2)] >> ctx->bit_alloc_params.halfratecod; + ctx->bit_alloc_params.fdecay = ff_ac3_fast_decay_tab[get_bits(gb, 2)] >> ctx->bit_alloc_params.halfratecod; + ctx->bit_alloc_params.sgain = ff_ac3_slow_gain_tab[get_bits(gb, 2)]; + ctx->bit_alloc_params.dbknee = ff_ac3_db_per_bit_tab[get_bits(gb, 2)]; + ctx->bit_alloc_params.floor = ff_ac3_floor_tab[get_bits(gb, 3)]; for(ch=!ctx->cplinu; ch<=ctx->nchans; ch++) { bit_alloc_stages[ch] = FFMAX(bit_alloc_stages[ch], 2); } @@ -963,7 +963,7 @@ static int ac3_parse_audio_block(AC3DecodeContext *ctx, int blk) csnr = (get_bits(gb, 6) - 15) << 4; for (ch = !ctx->cplinu; ch <= ctx->nchans; ch++) { /* snr offset and fast gain */ ctx->snroffst[ch] = (csnr + get_bits(gb, 4)) << 2; - ctx->fgain[ch] = ff_fgaintab[get_bits(gb, 3)]; + ctx->fgain[ch] = ff_ac3_fast_gain_tab[get_bits(gb, 3)]; } memset(bit_alloc_stages, 3, AC3_MAX_CHANNELS); } |