diff options
| -rw-r--r-- | libavcodec/ac3.c | 8 | ||||
| -rw-r--r-- | libavcodec/ac3.h | 4 | ||||
| -rw-r--r-- | libavcodec/ac3dec.c | 2 | ||||
| -rw-r--r-- | libavcodec/ac3enc.c | 3 |
4 files changed, 11 insertions, 6 deletions
diff --git a/libavcodec/ac3.c b/libavcodec/ac3.c index 132ea0f8b5..6b18930ca1 100644 --- a/libavcodec/ac3.c +++ b/libavcodec/ac3.c @@ -173,7 +173,8 @@ void ff_ac3_bit_alloc_calc_mask(AC3BitAllocParameters *s, int16_t *band_psd, } void ff_ac3_bit_alloc_calc_bap(int16_t *mask, int16_t *psd, int start, int end, - int snr_offset, int floor, uint8_t *bap) + int snr_offset, int floor, + const uint8_t *bap_tab, uint8_t *bap) { int i, j, k, end1, v, address; @@ -190,7 +191,7 @@ void ff_ac3_bit_alloc_calc_bap(int16_t *mask, int16_t *psd, int start, int end, end1 = FFMIN(band_start_tab[j] + ff_ac3_critical_band_size_tab[j], end); for (k = i; k < end1; k++) { address = av_clip((psd[i] - v) >> 5, 0, 63); - bap[i] = ff_ac3_bap_tab[address]; + bap[i] = bap_tab[address]; i++; } } while (end > band_start_tab[j++]); @@ -215,7 +216,8 @@ void ac3_parametric_bit_allocation(AC3BitAllocParameters *s, uint8_t *bap, dba_mode, dba_nsegs, dba_offsets, dba_lengths, dba_values, mask); - ff_ac3_bit_alloc_calc_bap(mask, psd, start, end, snr_offset, s->floor, bap); + ff_ac3_bit_alloc_calc_bap(mask, psd, start, end, snr_offset, s->floor, + ff_ac3_bap_tab, bap); } /** diff --git a/libavcodec/ac3.h b/libavcodec/ac3.h index abe40a5617..2eae0ea8cc 100644 --- a/libavcodec/ac3.h +++ b/libavcodec/ac3.h @@ -168,10 +168,12 @@ void ff_ac3_bit_alloc_calc_mask(AC3BitAllocParameters *s, int16_t *band_psd, * @param[in] end ending bin location * @param[in] snr_offset SNR adjustment * @param[in] floor noise floor + * @param[in] bap_tab look-up table for bit allocation pointers * @param[out] bap bit allocation pointers */ void ff_ac3_bit_alloc_calc_bap(int16_t *mask, int16_t *psd, int start, int end, - int snr_offset, int floor, uint8_t *bap); + int snr_offset, int floor, + const uint8_t *bap_tab, uint8_t *bap); void ac3_parametric_bit_allocation(AC3BitAllocParameters *s, uint8_t *bap, int8_t *exp, int start, int end, diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 982dfbc31b..e7fcd87728 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -1047,7 +1047,7 @@ static int ac3_parse_audio_block(AC3DecodeContext *s, int blk) s->start_freq[ch], s->end_freq[ch], s->snr_offset[ch], s->bit_alloc_params.floor, - s->bap[ch]); + ff_ac3_bap_tab, s->bap[ch]); } } diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c index e85d86c901..b171055715 100644 --- a/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c @@ -463,7 +463,8 @@ static int bit_alloc(AC3EncodeContext *s, for(ch=0;ch<s->nb_all_channels;ch++) { ff_ac3_bit_alloc_calc_bap(mask[i][ch], psd[i][ch], 0, s->nb_coefs[ch], snr_offset, - s->bit_alloc.floor, bap[i][ch]); + s->bit_alloc.floor, ff_ac3_bap_tab, + bap[i][ch]); frame_bits += compute_mantissa_size(s, bap[i][ch], s->nb_coefs[ch]); } |