November 2009 - FFmpeg-soc - lists.ffmpeg.org

[soc]: r5439 - als/alsdec.c
by thilo.borgmann 11 Nov '09

11 Nov '09

Author: thilo.borgmann Date: Wed Nov 11 17:38:00 2009 New Revision: 5439 Log: Moves allocation of buffers for quantized parcor coefficients and direct form coefficients from read_specific_config() into decode_init(). Modified: als/alsdec.c Modified: als/alsdec.c ============================================================================== --- als/alsdec.c Wed Nov 11 17:25:38 2009 (r5438) +++ als/alsdec.c Wed Nov 11 17:38:00 2009 (r5439) @@ -173,7 +173,7 @@ static av_cold int read_specific_config( { GetBitContext gb; uint64_t ht_size; - int i, config_offset, crc_enabled, num_lpc_buffers; + int i, config_offset, crc_enabled; MPEG4AudioConfig m4ac; ALSSpecificConfig *sconf = &ctx->sconf; AVCodecContext *avctx = ctx->avctx; @@ -229,29 +229,6 @@ static av_cold int read_specific_config( ctx->cur_frame_length = sconf->frame_length; - // allocate quantized parcor coefficient buffer - num_lpc_buffers = sconf->mc_coding ? avctx->channels : 1; - i = num_lpc_buffers * sconf->max_order; - - ctx->quant_cof = av_malloc(sizeof(*ctx->quant_cof) * avctx->channels); - ctx->lpc_cof = av_malloc(sizeof(*ctx->lpc_cof) * avctx->channels); - ctx->quant_cof_buffer = av_malloc(sizeof(*ctx->quant_cof_buffer) * - num_lpc_buffers * sconf->max_order); - ctx->lpc_cof_buffer = av_malloc(sizeof(*ctx->lpc_cof_buffer) * - num_lpc_buffers * sconf->max_order); - - if (!ctx->quant_cof || !ctx->lpc_cof || - !ctx->quant_cof_buffer || !ctx->lpc_cof_buffer) { - av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); - return AVERROR(ENOMEM); - } - - // assign quantized parcor coefficient buffers - for (i = 0; i < num_lpc_buffers; i++) { - ctx->quant_cof[i] = ctx->quant_cof_buffer + i * sconf->max_order; - ctx->lpc_cof[i] = ctx->lpc_cof_buffer + i * sconf->max_order; - } - // calculate total number of frames to decode if possible if (samples != 0xFFFFFFFF) { ctx->num_frames = (samples - 1) / sconf->frame_length + 1; @@ -1273,6 +1250,7 @@ static av_cold int decode_init(AVCodecCo { unsigned int c; unsigned int channel_size; + int num_lpc_buffers; ALSDecContext *ctx = avctx->priv_data; ALSSpecificConfig *sconf = &ctx->sconf; ctx->avctx = avctx; @@ -1310,6 +1288,28 @@ static av_cold int decode_init(AVCodecCo else ctx->ltp_lag_length = 8; + // allocate quantized parcor coefficient buffer + num_lpc_buffers = sconf->mc_coding ? avctx->channels : 1; + + ctx->quant_cof = av_malloc(sizeof(*ctx->quant_cof) * avctx->channels); + ctx->lpc_cof = av_malloc(sizeof(*ctx->lpc_cof) * avctx->channels); + ctx->quant_cof_buffer = av_malloc(sizeof(*ctx->quant_cof_buffer) * + num_lpc_buffers * sconf->max_order); + ctx->lpc_cof_buffer = av_malloc(sizeof(*ctx->lpc_cof_buffer) * + num_lpc_buffers * sconf->max_order); + + if (!ctx->quant_cof || !ctx->lpc_cof || + !ctx->quant_cof_buffer || !ctx->lpc_cof_buffer) { + av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); + return AVERROR(ENOMEM); + } + + // assign quantized parcor coefficient buffers + for (c = 0; c < num_lpc_buffers; c++) { + ctx->quant_cof[c] = ctx->quant_cof_buffer + c * sconf->max_order; + ctx->lpc_cof[c] = ctx->lpc_cof_buffer + c * sconf->max_order; + } + // allocate and assign lag and gain data buffer for ltp mode ctx->use_ltp = av_mallocz(sizeof(*ctx->use_ltp) * avctx->channels); ctx->ltp_lag = av_malloc (sizeof(*ctx->ltp_lag) * avctx->channels);

2 1

[soc]: r5441 - als/alsdec.c
by thilo.borgmann 11 Nov '09

11 Nov '09

Author: thilo.borgmann Date: Wed Nov 11 17:48:19 2009 New Revision: 5441 Log: Renames variable used for buffer allocation. Modified: als/alsdec.c Modified: als/alsdec.c ============================================================================== --- als/alsdec.c Wed Nov 11 17:46:45 2009 (r5440) +++ als/alsdec.c Wed Nov 11 17:48:19 2009 (r5441) @@ -1250,7 +1250,7 @@ static av_cold int decode_init(AVCodecCo { unsigned int c; unsigned int channel_size; - int num_lpc_buffers; + int num_buffers; ALSDecContext *ctx = avctx->priv_data; ALSSpecificConfig *sconf = &ctx->sconf; ctx->avctx = avctx; @@ -1289,14 +1289,14 @@ static av_cold int decode_init(AVCodecCo ctx->ltp_lag_length = 8; // allocate quantized parcor coefficient buffer - num_lpc_buffers = sconf->mc_coding ? avctx->channels : 1; + num_buffers = sconf->mc_coding ? avctx->channels : 1; - ctx->quant_cof = av_malloc(sizeof(*ctx->quant_cof) * num_lpc_buffers); - ctx->lpc_cof = av_malloc(sizeof(*ctx->lpc_cof) * num_lpc_buffers); + ctx->quant_cof = av_malloc(sizeof(*ctx->quant_cof) * num_buffers); + ctx->lpc_cof = av_malloc(sizeof(*ctx->lpc_cof) * num_buffers); ctx->quant_cof_buffer = av_malloc(sizeof(*ctx->quant_cof_buffer) * - num_lpc_buffers * sconf->max_order); + num_buffers * sconf->max_order); ctx->lpc_cof_buffer = av_malloc(sizeof(*ctx->lpc_cof_buffer) * - num_lpc_buffers * sconf->max_order); + num_buffers * sconf->max_order); if (!ctx->quant_cof || !ctx->lpc_cof || !ctx->quant_cof_buffer || !ctx->lpc_cof_buffer) { @@ -1305,17 +1305,17 @@ static av_cold int decode_init(AVCodecCo } // assign quantized parcor coefficient buffers - for (c = 0; c < num_lpc_buffers; c++) { + for (c = 0; c < num_buffers; c++) { ctx->quant_cof[c] = ctx->quant_cof_buffer + c * sconf->max_order; ctx->lpc_cof[c] = ctx->lpc_cof_buffer + c * sconf->max_order; } // allocate and assign lag and gain data buffer for ltp mode - ctx->use_ltp = av_mallocz(sizeof(*ctx->use_ltp) * num_lpc_buffers); - ctx->ltp_lag = av_malloc (sizeof(*ctx->ltp_lag) * num_lpc_buffers); - ctx->ltp_gain = av_malloc (sizeof(*ctx->ltp_gain) * num_lpc_buffers); + ctx->use_ltp = av_mallocz(sizeof(*ctx->use_ltp) * num_buffers); + ctx->ltp_lag = av_malloc (sizeof(*ctx->ltp_lag) * num_buffers); + ctx->ltp_gain = av_malloc (sizeof(*ctx->ltp_gain) * num_buffers); ctx->ltp_gain_buffer = av_malloc (sizeof(*ctx->ltp_gain_buffer) * - num_lpc_buffers * 5); + num_buffers * 5); if (!ctx->use_ltp || !ctx->ltp_lag || !ctx->ltp_gain || !ctx->ltp_gain_buffer) { @@ -1324,15 +1324,15 @@ static av_cold int decode_init(AVCodecCo return AVERROR(ENOMEM); } - for (c = 0; c < num_lpc_buffers; c++) + for (c = 0; c < num_buffers; c++) ctx->ltp_gain[c] = ctx->ltp_gain_buffer + c * 5; // allocate and assign channel data buffer for mcc mode if (sconf->mc_coding) { ctx->chan_data_buffer = av_malloc(sizeof(*ctx->chan_data_buffer) * - num_lpc_buffers); + num_buffers); ctx->chan_data = av_malloc(sizeof(ALSChannelData) * - num_lpc_buffers); + num_buffers); if (!ctx->chan_data_buffer || !ctx->chan_data) { av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); @@ -1340,7 +1340,7 @@ static av_cold int decode_init(AVCodecCo return AVERROR(ENOMEM); } - for (c = 0; c < num_lpc_buffers; c++) + for (c = 0; c < num_buffers; c++) ctx->chan_data[c] = ctx->chan_data_buffer + c; } else { ctx->chan_data = NULL;

1 0

[soc]: r5440 - als/alsdec.c
by thilo.borgmann 11 Nov '09

11 Nov '09

Author: thilo.borgmann Date: Wed Nov 11 17:46:45 2009 New Revision: 5440 Log: Corrects amount of allocated buffers for non-mcc mode to one. Modified: als/alsdec.c Modified: als/alsdec.c ============================================================================== --- als/alsdec.c Wed Nov 11 17:38:00 2009 (r5439) +++ als/alsdec.c Wed Nov 11 17:46:45 2009 (r5440) @@ -1291,8 +1291,8 @@ static av_cold int decode_init(AVCodecCo // allocate quantized parcor coefficient buffer num_lpc_buffers = sconf->mc_coding ? avctx->channels : 1; - ctx->quant_cof = av_malloc(sizeof(*ctx->quant_cof) * avctx->channels); - ctx->lpc_cof = av_malloc(sizeof(*ctx->lpc_cof) * avctx->channels); + ctx->quant_cof = av_malloc(sizeof(*ctx->quant_cof) * num_lpc_buffers); + ctx->lpc_cof = av_malloc(sizeof(*ctx->lpc_cof) * num_lpc_buffers); ctx->quant_cof_buffer = av_malloc(sizeof(*ctx->quant_cof_buffer) * num_lpc_buffers * sconf->max_order); ctx->lpc_cof_buffer = av_malloc(sizeof(*ctx->lpc_cof_buffer) * @@ -1311,11 +1311,11 @@ static av_cold int decode_init(AVCodecCo } // allocate and assign lag and gain data buffer for ltp mode - ctx->use_ltp = av_mallocz(sizeof(*ctx->use_ltp) * avctx->channels); - ctx->ltp_lag = av_malloc (sizeof(*ctx->ltp_lag) * avctx->channels); - ctx->ltp_gain = av_malloc (sizeof(*ctx->ltp_gain) * avctx->channels); + ctx->use_ltp = av_mallocz(sizeof(*ctx->use_ltp) * num_lpc_buffers); + ctx->ltp_lag = av_malloc (sizeof(*ctx->ltp_lag) * num_lpc_buffers); + ctx->ltp_gain = av_malloc (sizeof(*ctx->ltp_gain) * num_lpc_buffers); ctx->ltp_gain_buffer = av_malloc (sizeof(*ctx->ltp_gain_buffer) * - avctx->channels * 5); + num_lpc_buffers * 5); if (!ctx->use_ltp || !ctx->ltp_lag || !ctx->ltp_gain || !ctx->ltp_gain_buffer) { @@ -1324,15 +1324,15 @@ static av_cold int decode_init(AVCodecCo return AVERROR(ENOMEM); } - for (c = 0; c < avctx->channels; c++) + for (c = 0; c < num_lpc_buffers; c++) ctx->ltp_gain[c] = ctx->ltp_gain_buffer + c * 5; // allocate and assign channel data buffer for mcc mode if (sconf->mc_coding) { ctx->chan_data_buffer = av_malloc(sizeof(*ctx->chan_data_buffer) * - avctx->channels); + num_lpc_buffers); ctx->chan_data = av_malloc(sizeof(ALSChannelData) * - avctx->channels); + num_lpc_buffers); if (!ctx->chan_data_buffer || !ctx->chan_data) { av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); @@ -1340,7 +1340,7 @@ static av_cold int decode_init(AVCodecCo return AVERROR(ENOMEM); } - for (c = 0; c < avctx->channels; c++) + for (c = 0; c < num_lpc_buffers; c++) ctx->chan_data[c] = ctx->chan_data_buffer + c; } else { ctx->chan_data = NULL;

1 0

[soc]: r5438 - als/alsdec.c
by thilo.borgmann 11 Nov '09

11 Nov '09

Author: thilo.borgmann Date: Wed Nov 11 17:25:38 2009 New Revision: 5438 Log: Corrects array assignment. Modified: als/alsdec.c Modified: als/alsdec.c ============================================================================== --- als/alsdec.c Tue Nov 10 06:13:45 2009 (r5437) +++ als/alsdec.c Wed Nov 11 17:25:38 2009 (r5438) @@ -1341,8 +1341,7 @@ static av_cold int decode_init(AVCodecCo } for (c = 0; c < avctx->channels; c++) - ctx->chan_data[c] = ctx->chan_data_buffer + - c * sizeof(ALSChannelData); + ctx->chan_data[c] = ctx->chan_data_buffer + c; } else { ctx->chan_data = NULL; ctx->chan_data_buffer = NULL;

1 0

[soc]: r5433 - amr/amrnbdec.c
by vitor 11 Nov '09

11 Nov '09

Author: vitor Date: Tue Nov 10 05:49:08 2009 New Revision: 5433 Log: Use the already committed function ff_set_min_dist_lsf(). Note that this changes slightly the output, since now the sum "prev + min_spacing" is done using single-precision floats while before it was done using doubles. Modified: amr/amrnbdec.c Modified: amr/amrnbdec.c ============================================================================== --- amr/amrnbdec.c Tue Nov 10 05:39:15 2009 (r5432) +++ amr/amrnbdec.c Tue Nov 10 05:49:08 2009 (r5433) @@ -209,23 +209,6 @@ static void interpolate_lsf(float lsf_q[ } /** - * Adjust the quantized LSFs so they are increasing and not too close. - * - * This step isn't mentioned in the spec but is in the reference C decoder. - * Omitting this step creates audible distortion on the sinusoidal sweep - * test vectors in 3GPP TS 26.074. - * - * @param[in,out] lsf LSFs in Hertz - */ -static void make_increasing(float *lsf) -{ - int i; - float prev = 0.0; - for (i = 0; i < LP_FILTER_ORDER; i++) - prev = lsf[i] = FFMAX(lsf[i], prev + MIN_LSF_SPACING); -} - -/** * Decode a set of 5 split-matrix quantized lsf indexes into an lsp vector. * * @param p the context @@ -261,7 +244,7 @@ static void lsf2lsp_for_mode12k2(AMRCont for (i = 0; i < LP_FILTER_ORDER; i++) lsf_q[i] = lsf_r[i] * LSF_R_FAC + lsf_no_r[i]; - make_increasing(lsf_q); + ff_set_min_dist_lsf(lsf_q, MIN_LSF_SPACING, LP_FILTER_ORDER); if (update) interpolate_lsf(p->lsf_q, lsf_q); @@ -324,7 +307,7 @@ static void lsf2lsp_3(AMRContext *p) for (i = 0; i < LP_FILTER_ORDER; i++) lsf_q[i] = (lsf_r[i] + p->prev_lsf_r[i] * pred_fac[i]) * LSF_R_FAC + lsf_3_mean[i]; - make_increasing(lsf_q); + ff_set_min_dist_lsf(lsf_q, MIN_LSF_SPACING, LP_FILTER_ORDER); // store data for computing the next frame's LSFs interpolate_lsf(p->lsf_q, lsf_q);

4 6

[soc]: r5437 - amr/amrnbdec.c
by vitor 10 Nov '09

10 Nov '09

Author: vitor Date: Tue Nov 10 06:13:45 2009 New Revision: 5437 Log: Use ff_acelp_interpolatef(). Output is unchanged. Modified: amr/amrnbdec.c Modified: amr/amrnbdec.c ============================================================================== --- amr/amrnbdec.c Tue Nov 10 06:11:11 2009 (r5436) +++ amr/amrnbdec.c Tue Nov 10 06:13:45 2009 (r5437) @@ -422,47 +422,6 @@ static void decode_pitch_lag(int *lag_in } } -/** - * Calculate the pitch vector by interpolating the past excitation at the pitch - * lag using a b60 hamming windowed sinc function. - * - * @param pitch_vector buffer that must hold for the previous state of the filter in - * pitch_vector[-PITCH_LAG_MAX-LP_FILTER_ORDER-1, -1] - * @param lag_int integer part of pitch lag - * @param lag_frac fractional part of pitch lag - * @param mode current frame mode - */ -static void interp_pitch_vector(float *pitch_vector, int lag_int, - int lag_frac, enum Mode mode) -{ - int n, i; - const float *b60_idx1, *b60_idx2; - float *exc_idx; - - lag_frac *= -1; - if (mode != MODE_12k2) { - lag_frac <<= 1; - } - - if (lag_frac < 0) { - lag_frac += 6; - lag_int++; - } - - b60_idx1 = &b60[ lag_frac]; - b60_idx2 = &b60[6 - lag_frac]; - exc_idx = &pitch_vector[-lag_int]; - - for (n = 0; n < AMR_SUBFRAME_SIZE; n++) { - pitch_vector[n] = 0.0; - for (i = 0; i < 10; i++) - pitch_vector[n] += b60_idx1[6 * i] * exc_idx[-i]; - exc_idx++; - for (i = 0; i < 10; i++) - pitch_vector[n] += b60_idx2[6 * i] * exc_idx[ i]; - } -} - static void decode_pitch_vector(AMRContext *p, const AMRNBSubframe *amr_subframe, const int subframe) @@ -472,10 +431,18 @@ static void decode_pitch_vector(AMRConte decode_pitch_lag(&pitch_lag_int, &pitch_lag_frac, amr_subframe->p_lag, p->pitch_lag_int, subframe, p->cur_frame_mode); - interp_pitch_vector(p->excitation, pitch_lag_int, pitch_lag_frac, - p->cur_frame_mode); - p->pitch_lag_int = pitch_lag_int; // store previous lag in a uint8_t + + pitch_lag_frac <<= (p->cur_frame_mode != MODE_12k2); + + pitch_lag_int += pitch_lag_frac > 0; + + /* Calculate the pitch vector by interpolating the past excitation at the + pitch lag using a b60 hamming windowed sinc function. */ + ff_acelp_interpolatef(p->excitation, p->excitation + 1 - pitch_lag_int, + b60, 6, pitch_lag_frac + 6 - 6*(pitch_lag_frac > 0), + 10, AMR_SUBFRAME_SIZE); + memcpy(p->pitch_vector, p->excitation, AMR_SUBFRAME_SIZE * sizeof(float)); }

1 0

[soc]: r5436 - amr/amrnbdec.c
by vitor 10 Nov '09

10 Nov '09

Author: vitor Date: Tue Nov 10 06:11:11 2009 New Revision: 5436 Log: Use ff_adaptative_gain_control(). Again, output changes slightly. Modified: amr/amrnbdec.c Modified: amr/amrnbdec.c ============================================================================== --- amr/amrnbdec.c Tue Nov 10 06:08:44 2009 (r5435) +++ amr/amrnbdec.c Tue Nov 10 06:11:11 2009 (r5436) @@ -1071,10 +1071,8 @@ static void postfilter(AMRContext *p, fl int i; float *samples = p->samples_in + LP_FILTER_ORDER; // Start of input - float gain_scale_factor = 1.0; float speech_gain = ff_dot_productf(samples, samples, AMR_SUBFRAME_SIZE); - float postfilter_gain; float pole_out[AMR_SUBFRAME_SIZE + LP_FILTER_ORDER]; // Output of pole filter const float *gamma_n, *gamma_d; // Formant filter factor table @@ -1106,16 +1104,8 @@ static void postfilter(AMRContext *p, fl ff_tilt_compensation(&p->tilt_mem, tilt_factor(lpc_n, lpc_d), buf_out, AMR_SUBFRAME_SIZE); - // Adaptive gain control - postfilter_gain = ff_dot_productf(buf_out, buf_out, AMR_SUBFRAME_SIZE); - if (postfilter_gain) - gain_scale_factor = sqrt(speech_gain / postfilter_gain); - - for (i = 0; i < AMR_SUBFRAME_SIZE; i++) { - p->postfilter_agc = AMR_AGC_ALPHA * p->postfilter_agc + - (1.0 - AMR_AGC_ALPHA) * gain_scale_factor; - buf_out[i] *= p->postfilter_agc; - } + ff_adaptative_gain_control(buf_out, speech_gain, AMR_SUBFRAME_SIZE, + AMR_AGC_ALPHA, &p->postfilter_agc); } /// @}

1 0

[soc]: r5435 - amr/amrnbdec.c
by vitor 10 Nov '09

10 Nov '09

Author: vitor Date: Tue Nov 10 06:08:44 2009 New Revision: 5435 Log: Use ff_tilt_compensation(), output is unchanged. Modified: amr/amrnbdec.c Modified: amr/amrnbdec.c ============================================================================== --- amr/amrnbdec.c Tue Nov 10 06:06:33 2009 (r5434) +++ amr/amrnbdec.c Tue Nov 10 06:08:44 2009 (r5435) @@ -1059,25 +1059,6 @@ static float tilt_factor(float *lpc_n, f } /** - * Apply tilt compensation filter, 1 - tilt * z^-1 - * - * @param mem Pointer to one float to keep the filter's state - * @param tilt Tilt factor - * @param samples AMR_SUBFRAME_SIZE array where the filter is applied - */ -static void tilt_compensation(float *mem, float tilt, float *samples) -{ - float new_tilt_mem = samples[AMR_SUBFRAME_SIZE - 1]; - int i; - - for (i = AMR_SUBFRAME_SIZE - 1; i > 0; i--) - samples[i] -= tilt * samples[i - 1]; - - samples[0] -= tilt * *mem; - *mem = new_tilt_mem; -} - -/** * Perform adaptive post-filtering to enhance the quality of the speech. * See section 6.2.1. * @@ -1122,7 +1103,8 @@ static void postfilter(AMRContext *p, fl pole_out + LP_FILTER_ORDER, AMR_SUBFRAME_SIZE, LP_FILTER_ORDER); - tilt_compensation(&p->tilt_mem, tilt_factor(lpc_n, lpc_d), buf_out); + ff_tilt_compensation(&p->tilt_mem, tilt_factor(lpc_n, lpc_d), buf_out, + AMR_SUBFRAME_SIZE); // Adaptive gain control postfilter_gain = ff_dot_productf(buf_out, buf_out, AMR_SUBFRAME_SIZE);

1 0

[soc]: r5434 - amr/amrnbdec.c
by vitor 10 Nov '09

10 Nov '09

Author: vitor Date: Tue Nov 10 06:06:33 2009 New Revision: 5434 Log: Use ff_amr_set_fixed_gain() shared function. Output changes slightly, probably rounding is different since it is impossible to the compiler to inline this code now. Modified: amr/amrnbdec.c Modified: amr/amrnbdec.c ============================================================================== --- amr/amrnbdec.c Tue Nov 10 05:49:08 2009 (r5433) +++ amr/amrnbdec.c Tue Nov 10 06:06:33 2009 (r5434) @@ -50,6 +50,7 @@ #include "celp_filters.h" #include "acelp_filters.h" #include "acelp_vectors.h" +#include "acelp_pitch_delay.h" #include "lsp.h" #include "amrnbdata.h" @@ -814,33 +815,6 @@ static void decode_gains(AMRContext *p, } } -/** - * Calculate fixed gain (part of section 6.1.3) - * - * @param p the context - * @param mode mode of the current frame - * @param fixed_gain_factor gain correction factor - * @param fixed_energy decoded algebraic codebook vector energy - */ -static void set_fixed_gain(AMRContext *p, const enum Mode mode, - float fixed_gain_factor, float fixed_energy) -{ - // Equations 66-69: - // ^g_c = ^gamma_gc * 10^0.05 (predicted dB + mean dB - dB of fixed vector) - // Note 10^(0.05 * -10log(average x^2)) = 1/sqrt((average x^2)). - p->fixed_gain[4] = - fixed_gain_factor * - exp2f(log2f(10.0) * 0.05 * - (ff_dot_productf(energy_pred_fac, p->prediction_error, 4) + - energy_mean[mode])) / - sqrtf(fixed_energy / AMR_SUBFRAME_SIZE); - - // update quantified prediction error energy history - memmove(&p->prediction_error[0], &p->prediction_error[1], - 3 * sizeof(p->prediction_error[0])); - p->prediction_error[3] = 20.0 * log10f(fixed_gain_factor); -} - /// @} @@ -1212,9 +1186,12 @@ static int amrnb_decode_frame(AVCodecCon set_fixed_vector(p->fixed_vector, &fixed_sparse, 1.0); - set_fixed_gain(p, p->cur_frame_mode, fixed_gain_factor, + p->fixed_gain[4] = + ff_amr_set_fixed_gain(fixed_gain_factor, ff_dot_productf(p->fixed_vector, p->fixed_vector, - AMR_SUBFRAME_SIZE)); + AMR_SUBFRAME_SIZE)/AMR_SUBFRAME_SIZE, + p->prediction_error, + energy_mean[p->cur_frame_mode], energy_pred_fac); // The excitation feedback is calculated without any processing such // as fixed gain smoothing. This isn't mentioned in the specification.

1 0

[soc]: r5432 - in amr: amr-ffmpeg.diff amrnbdec.c
by vitor 10 Nov '09

10 Nov '09

Author: vitor Date: Tue Nov 10 05:39:15 2009 New Revision: 5432 Log: Update to latest svn Modified: amr/amr-ffmpeg.diff amr/amrnbdec.c Modified: amr/amr-ffmpeg.diff ============================================================================== --- amr/amr-ffmpeg.diff Mon Nov 9 09:08:16 2009 (r5431) +++ amr/amr-ffmpeg.diff Tue Nov 10 05:39:15 2009 (r5432) @@ -1,32 +1,32 @@ Index: libavcodec/Makefile =================================================================== ---- libavcodec/Makefile (revision 19653) +--- libavcodec/Makefile (revision 20451) +++ libavcodec/Makefile (working copy) -@@ -42,6 +42,7 @@ +@@ -51,6 +51,7 @@ OBJS-$(CONFIG_AC3_ENCODER) += ac3enc.o ac3tab.o ac3.o OBJS-$(CONFIG_ALAC_DECODER) += alac.o - OBJS-$(CONFIG_ALAC_ENCODER) += alacenc.o lpc.o -+OBJS-$(CONFIG_AMRNB_DECODER) += amrnbdec.o celp_filters.o celp_math.o acelp_filters.o acelp_vectors.o lsp.o + OBJS-$(CONFIG_ALAC_ENCODER) += alacenc.o ++OBJS-$(CONFIG_AMRNB_DECODER) += amrnbdec.o celp_filters.o celp_math.o acelp_filters.o acelp_vectors.o lsp.o acelp_pitch_delay.o OBJS-$(CONFIG_AMV_DECODER) += sp5xdec.o mjpegdec.o mjpeg.o OBJS-$(CONFIG_APE_DECODER) += apedec.o OBJS-$(CONFIG_ASV1_DECODER) += asv1.o mpeg12data.o Index: libavcodec/allcodecs.c =================================================================== ---- libavcodec/allcodecs.c (revision 19653) +--- libavcodec/allcodecs.c (revision 20451) +++ libavcodec/allcodecs.c (working copy) -@@ -198,6 +198,7 @@ +@@ -199,6 +199,7 @@ REGISTER_ENCDEC (AAC, aac); REGISTER_ENCDEC (AC3, ac3); REGISTER_ENCDEC (ALAC, alac); + REGISTER_DECODER (AMRNB, amrnb); REGISTER_DECODER (APE, ape); + REGISTER_DECODER (ATRAC1, atrac1); REGISTER_DECODER (ATRAC3, atrac3); - REGISTER_DECODER (COOK, cook); Index: doc/general.texi =================================================================== ---- doc/general.texi (revision 19653) +--- doc/general.texi (revision 20451) +++ doc/general.texi (working copy) -@@ -523,8 +523,8 @@ +@@ -527,8 +527,8 @@ @item ADPCM Westwood Studios IMA @tab @tab X @tab Used in Westwood Studios games like Command and Conquer. @item ADPCM Yamaha @tab X @tab X @@ -39,125 +39,13 @@ Index: doc/general.texi @item Apple lossless audio @tab X @tab X Index: Changelog =================================================================== ---- Changelog (revision 19653) +--- Changelog (revision 20451) +++ Changelog (working copy) -@@ -32,6 +32,7 @@ - - RTMP support in libavformat - - noX handling for OPT_BOOL X options - - Wave64 demuxer +@@ -41,6 +41,7 @@ + - Atrac1 decoder + - MD STUDIO audio demuxer + - RF64 support in WAV demuxer +- AMR-NB decoder -Index: libavcodec/acelp_vectors.c -=================================================================== ---- libavcodec/acelp_vectors.c (revision 19653) -+++ libavcodec/acelp_vectors.c (working copy) -@@ -22,6 +22,7 @@ - - #include <inttypes.h> - #include "avcodec.h" -+#include "celp_math.h" - #include "acelp_vectors.h" - - const uint8_t ff_fc_2pulses_9bits_track1[16] = -@@ -155,3 +156,14 @@ - out[i] = weight_coeff_a * in_a[i] - + weight_coeff_b * in_b[i]; - } -+ -+void ff_scale_vector_to_given_sum_of_squares(float *out, const float *in, -+ float sum_of_squares, const int n) -+{ -+ int i; -+ float scalefactor = ff_dot_productf(in, in, n); -+ if (scalefactor) -+ scalefactor = sqrt(sum_of_squares / scalefactor); -+ for (i = 0; i < n; i++) -+ out[i] = in[i] * scalefactor; -+} -Index: libavcodec/acelp_vectors.h -=================================================================== ---- libavcodec/acelp_vectors.h (revision 19653) -+++ libavcodec/acelp_vectors.h (working copy) -@@ -164,4 +164,22 @@ - void ff_weighted_vector_sumf(float *out, const float *in_a, const float *in_b, - float weight_coeff_a, float weight_coeff_b, int length); - -+/** -+ * Set the sum of squares of a signal by scaling -+ * -+ * @param out output samples -+ * @param in input samples -+ * @param sum_of_squares new sum of squares -+ * @param n number of samples -+ * -+ * @note If the input is zero (or its energy underflows), the output is zero. -+ * This is the behavior of AGC in the AMR reference decoder. The QCELP -+ * reference decoder seems to have undefined behavior. -+ * -+ * TIA/EIA/IS-733 2.4.8.3-2/3/4/5, 2.4.8.6 -+ * 3GPP TS 26.090 6.1 (6) -+ */ -+void ff_scale_vector_to_given_sum_of_squares(float *out, const float *in, -+ float sum_of_squares, const int n); -+ - #endif /* AVCODEC_ACELP_VECTORS_H */ -Index: libavcodec/qcelpdec.c -=================================================================== ---- libavcodec/qcelpdec.c (revision 19653) -+++ libavcodec/qcelpdec.c (working copy) -@@ -406,31 +406,6 @@ - } - - /** -- * Compute the gain control -- * -- * @param v_in gain-controlled vector -- * @param v_ref vector to control gain of -- * -- * @return gain control -- * -- * FIXME: If v_ref is a zero vector, it energy is zero -- * and the behavior of the gain control is -- * undefined in the specs. -- * -- * TIA/EIA/IS-733 2.4.8.3-2/3/4/5, 2.4.8.6 -- */ --static float compute_gain_ctrl(const float *v_ref, const float *v_in, const int len) --{ -- float scalefactor = ff_dot_productf(v_in, v_in, len); -- -- if(scalefactor) -- scalefactor = sqrt(ff_dot_productf(v_ref, v_ref, len) / scalefactor); -- else -- av_log_missing_feature(NULL, "Zero energy for gain control", 1); -- return scalefactor; --} -- --/** - * Apply generic gain control. - * - * @param v_out output vector -@@ -442,15 +417,13 @@ - static void apply_gain_ctrl(float *v_out, const float *v_ref, - const float *v_in) - { -- int i, j, len; -- float scalefactor; -+ int i; - -- for(i=0, j=0; i<4; i++) -- { -- scalefactor = compute_gain_ctrl(v_ref + j, v_in + j, 40); -- for(len=j+40; j<len; j++) -- v_out[j] = scalefactor * v_in[j]; -- } -+ for (i = 0; i < 160; i += 40) -+ ff_scale_vector_to_given_sum_of_squares(v_out + i, v_in + i, -+ ff_dot_productf(v_ref + i, -+ v_ref + i, 40), -+ 40); - } - - /** Modified: amr/amrnbdec.c ============================================================================== --- amr/amrnbdec.c Mon Nov 9 09:08:16 2009 (r5431) +++ amr/amrnbdec.c Tue Nov 10 05:39:15 2009 (r5432) @@ -354,7 +354,7 @@ static void lsp2lpc(const float *lsp, fl for (i = 0; i < LP_FILTER_ORDER; i++) lsp_double[i] = lsp[i]; - ff_acelp_lspd2lpc(lsp_double, lpc_coeffs); + ff_acelp_lspd2lpc(lsp_double, lpc_coeffs, 5); } /// @}

1 0