From 6d9f52b2cd760eacf6cc6b7d694b0b00d991f1de Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Fri, 11 Mar 2011 02:49:55 +0000 Subject: ac3: move ff_ac3_bit_alloc_calc_bap to ac3dsp Signed-off-by: Mans Rullgard --- libavcodec/ac3dsp.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'libavcodec/ac3dsp.h') diff --git a/libavcodec/ac3dsp.h b/libavcodec/ac3dsp.h index eeaa56c..bf4fc14 100644 --- a/libavcodec/ac3dsp.h +++ b/libavcodec/ac3dsp.h @@ -81,6 +81,25 @@ typedef struct AC3DSPContext { * constraints: multiple of 32 greater than zero */ void (*float_to_fixed24)(int32_t *dst, const float *src, unsigned int len); + + /** + * Calculate bit allocation pointers. + * The SNR is the difference between the masking curve and the signal. AC-3 + * uses this value for each frequency bin to allocate bits. The snroffset + * parameter is a global adjustment to the SNR for all bins. + * + * @param[in] mask masking curve + * @param[in] psd signal power for each frequency bin + * @param[in] start starting bin location + * @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 (*bit_alloc_calc_bap)(int16_t *mask, int16_t *psd, int start, int end, + int snr_offset, int floor, + const uint8_t *bap_tab, uint8_t *bap); } AC3DSPContext; void ff_ac3dsp_init (AC3DSPContext *c, int bit_exact); -- cgit v1.1 From 52fd16a264d1eb14b1a84b7b38041da1756fb216 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Fri, 11 Mar 2011 17:16:27 +0000 Subject: ac3enc: move compute_mantissa_size() to ac3dsp Signed-off-by: Mans Rullgard --- libavcodec/ac3dsp.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'libavcodec/ac3dsp.h') diff --git a/libavcodec/ac3dsp.h b/libavcodec/ac3dsp.h index bf4fc14..aa605a8 100644 --- a/libavcodec/ac3dsp.h +++ b/libavcodec/ac3dsp.h @@ -100,6 +100,11 @@ typedef struct AC3DSPContext { void (*bit_alloc_calc_bap)(int16_t *mask, int16_t *psd, int start, int end, int snr_offset, int floor, const uint8_t *bap_tab, uint8_t *bap); + + /** + * Calculate the number of bits needed to encode a set of mantissas. + */ + int (*compute_mantissa_size)(int mant_cnt[5], uint8_t *bap, int nb_coefs); } AC3DSPContext; void ff_ac3dsp_init (AC3DSPContext *c, int bit_exact); -- cgit v1.1