diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-03-11 02:49:55 +0000 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-03-29 19:31:45 +0100 |
| commit | 6d9f52b2cd760eacf6cc6b7d694b0b00d991f1de (patch) | |
| tree | b6275771445a9cf058d92cb5fb2847698a3414a8 /libavcodec/ac3dec.c | |
| parent | d38345878cbb89e4d8d33bd79f47836d4e9cd637 (diff) | |
| download | ffmpeg-6d9f52b2cd760eacf6cc6b7d694b0b00d991f1de.tar.gz | |
ac3: move ff_ac3_bit_alloc_calc_bap to ac3dsp
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec/ac3dec.c')
| -rw-r--r-- | libavcodec/ac3dec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index e08efa104c..396df87fed 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -184,6 +184,7 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx) ff_mdct_init(&s->imdct_512, 9, 1, 1.0); ff_kbd_window_init(s->window, 5.0, 256); dsputil_init(&s->dsp, avctx); + ff_ac3dsp_init(&s->ac3dsp, avctx->flags & CODEC_FLAG_BITEXACT); ff_fmt_convert_init(&s->fmt_conv, avctx); av_lfg_init(&s->dith_state, 0); @@ -1213,7 +1214,7 @@ static int decode_audio_block(AC3DecodeContext *s, int blk) /* Compute bit allocation */ const uint8_t *bap_tab = s->channel_uses_aht[ch] ? ff_eac3_hebap_tab : ff_ac3_bap_tab; - ff_ac3_bit_alloc_calc_bap(s->mask[ch], s->psd[ch], + s->ac3dsp.bit_alloc_calc_bap(s->mask[ch], s->psd[ch], s->start_freq[ch], s->end_freq[ch], s->snr_offset[ch], s->bit_alloc_params.floor, |