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

[soc]: r4165 - amr/amrnbfloatdec.c
by kmalaussene 04 Mar '09

04 Mar '09

Author: kmalaussene Date: Wed Mar 4 22:38:51 2009 New Revision: 4165 Log: Move variable declaration and add const. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Wed Mar 4 22:35:32 2009 (r4164) +++ amr/amrnbfloatdec.c Wed Mar 4 22:38:51 2009 (r4165) @@ -696,7 +696,6 @@ static float fixed_gain_prediction(float static float fixed_gain_smooth(AMRContext *p , const float *lsp, const float *lsp_avg) { float diff = 0.0; - float smoothing_factor = 0.0; int i; for(i=0; i<LP_FILTER_ORDER; i++) { @@ -712,11 +711,10 @@ static float fixed_gain_smooth(AMRContex } if(p->diff_count < 40) { - float fixed_gain_mean; // calculate the fixed gain smoothing factor (k_m) - smoothing_factor = FFMIN(0.25, FFMAX(0.0, diff - 0.4))/0.25; + const float smoothing_factor = FFMIN(0.25, FFMAX(0.0, diff - 0.4))/0.25; // calculate the mean fixed gain for the current subframe - fixed_gain_mean = (p->fixed_gain[0] + p->fixed_gain[1] + p->fixed_gain[2] + p->fixed_gain[3] + p->fixed_gain[4])/5.0; + const float fixed_gain_mean = (p->fixed_gain[0] + p->fixed_gain[1] + p->fixed_gain[2] + p->fixed_gain[3] + p->fixed_gain[4])/5.0; // calculate the smoothed fixed gain p->fixed_gain[4] = smoothing_factor*p->fixed_gain[4] + (1.0 - smoothing_factor)*fixed_gain_mean; }

1 0

[soc]: r4164 - amr/amrnbfloatdec.c
by kmalaussene 04 Mar '09

04 Mar '09

Author: kmalaussene Date: Wed Mar 4 22:35:32 2009 New Revision: 4164 Log: Move smoothing of fixed gain into its own function fixed_gain_smooth. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Wed Mar 4 21:25:29 2009 (r4163) +++ amr/amrnbfloatdec.c Wed Mar 4 22:35:32 2009 (r4164) @@ -685,6 +685,44 @@ static float fixed_gain_prediction(float } /** + * fixed gain smoothing + * + * @param p the context + * @param lsp lsp coefficients for the current subframe + * @param lsp_avg averaged lsp coefficients + * + * @return fixed gain smoothed + */ + +static float fixed_gain_smooth(AMRContext *p , const float *lsp, const float *lsp_avg) { + float diff = 0.0; + float smoothing_factor = 0.0; + int i; + + for(i=0; i<LP_FILTER_ORDER; i++) { + // calculate diff + diff += fabs(lsp_avg[i]-lsp[i])/lsp_avg[i]; + } + + // if diff has been >0.65 for 10 frames (40 subframes) no smoothing is applied + if(diff > 0.65) { + p->diff_count++; + }else { + p->diff_count = 0; + } + + if(p->diff_count < 40) { + float fixed_gain_mean; + // calculate the fixed gain smoothing factor (k_m) + smoothing_factor = FFMIN(0.25, FFMAX(0.0, diff - 0.4))/0.25; + // calculate the mean fixed gain for the current subframe + fixed_gain_mean = (p->fixed_gain[0] + p->fixed_gain[1] + p->fixed_gain[2] + p->fixed_gain[3] + p->fixed_gain[4])/5.0; + // calculate the smoothed fixed gain + p->fixed_gain[4] = smoothing_factor*p->fixed_gain[4] + (1.0 - smoothing_factor)*fixed_gain_mean; + } + return p->fixed_gain[4]; +} +/** * Decode fixed and pitch gains. * * @param p the context @@ -941,32 +979,8 @@ static int amrnb_decode_frame(AVCodecCon } // smooth fixed gain - if(p->cur_frame_mode < MODE_74 || p->cur_frame_mode == MODE_102) { - float diff = 0.0; - float smoothing_factor = 0.0; - - for(i=0; i<LP_FILTER_ORDER; i++) { - // calculate diff - diff += fabs(p->lsp_avg[i]-p->lsp[subframe][i])/p->lsp_avg[i]; - } - - // if diff has been >0.65 for 10 frames (40 subframes) no smoothing is applied - if(diff > 0.65) { - p->diff_count++; - }else { - p->diff_count = 0; - } - - if(p->diff_count < 40) { - float fixed_gain_mean; - // calculate the fixed gain smoothing factor (k_m) - smoothing_factor = FFMIN(0.25, FFMAX(0.0, diff - 0.4))/0.25; - // calculate the mean fixed gain for the current subframe - fixed_gain_mean = (p->fixed_gain[0] + p->fixed_gain[1] + p->fixed_gain[2] + p->fixed_gain[3] + p->fixed_gain[4])/5.0; - // calculate the smoothed fixed gain - p->fixed_gain[4] = smoothing_factor*p->fixed_gain[4] + (1.0 - smoothing_factor)*fixed_gain_mean; - } - } + if(p->cur_frame_mode < MODE_74 || p->cur_frame_mode == MODE_102) + p->fixed_gain[4] = fixed_gain_smooth(p, p->lsp[subframe], p->lsp_avg); apply_ir_filter(p, p->fixed_vector);

1 0

[soc]: r4163 - amr/amrnbfloatdec.c
by kmalaussene 04 Mar '09

04 Mar '09

Author: kmalaussene Date: Wed Mar 4 21:25:29 2009 New Revision: 4163 Log: Simplify further gain decoding. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Wed Mar 4 21:13:10 2009 (r4162) +++ amr/amrnbfloatdec.c Wed Mar 4 21:25:29 2009 (r4163) @@ -701,17 +701,14 @@ static void decode_gains(AMRContext *p, if(mode == MODE_122 || mode == MODE_795) { p->pitch_gain[4] = qua_gain_pit [amr_subframe->p_gain]; fixed_gain_factor = qua_gain_code[amr_subframe->fixed_gain]; - }else if(mode >= MODE_67) { - p->pitch_gain[4] = gains_high[amr_subframe->p_gain][0]; - fixed_gain_factor = gains_high[amr_subframe->p_gain][1]; - }else if(mode >= MODE_515) { - p->pitch_gain[4] = gains_low[amr_subframe->p_gain][0]; - fixed_gain_factor = gains_low[amr_subframe->p_gain][1]; }else { - // gain index is only coded in subframes 0,2 - const int index = (p->frame.subframe[subframe&2].p_gain << 1) + (subframe&1); - p->pitch_gain[4] = gains_MODE_475[index][0]; - fixed_gain_factor = gains_MODE_475[index][1]; + // gain index is only coded in subframes 0,2 for MODE_475 + const float *gains = mode >= MODE_67 ? gains_high[amr_subframe->p_gain] : + mode >= MODE_515 ? gains_low [amr_subframe->p_gain] : + gains_MODE_475[(p->frame.subframe[subframe&2].p_gain << 1) + (subframe&1)]; + + p->pitch_gain[4] = gains[0]; + fixed_gain_factor = gains[1]; } // ^g_c = g_c' * ^gamma_gc

1 0

[soc]: r4162 - amr/amrnbfloatdec.c
by kmalaussene 04 Mar '09

04 Mar '09

Author: kmalaussene Date: Wed Mar 4 21:13:10 2009 New Revision: 4162 Log: Cosmetics: replace unmappable char γ by gamma. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Wed Mar 4 20:52:49 2009 (r4161) +++ amr/amrnbfloatdec.c Wed Mar 4 21:13:10 2009 (r4162) @@ -66,7 +66,7 @@ typedef struct AMRContext { float pitch_vector[AMR_SUBFRAME_SIZE]; ///< adaptive code book (pitch) vector float fixed_vector[AMR_SUBFRAME_SIZE]; ///< algebraic code book (fixed) vector - float prediction_error[4]; ///< quantified prediction errors {20log10(^γ_gc)} for previous four subframes + float prediction_error[4]; ///< quantified prediction errors {20log10(^gamma_gc)} for previous four subframes float pitch_gain[5]; ///< quantified pitch gains for the current and previous four subframes float fixed_gain[5]; ///< quantified fixed gains for the current and previous four subframes @@ -695,7 +695,7 @@ static float fixed_gain_prediction(float static void decode_gains(AMRContext *p, const AMRNBSubframe *amr_subframe, const enum Mode mode, const int subframe) { - float fixed_gain_factor; // fixed gain correction factor {^γ_gc} for the current frame + float fixed_gain_factor; // fixed gain correction factor {^gamma_gc} for the current frame // decode pitch gain and fixed gain correction factor if(mode == MODE_122 || mode == MODE_795) {

1 0

[soc]: r4160 - amr/amrnbfloatdec.c
by kmalaussene 04 Mar '09

04 Mar '09

Author: kmalaussene Date: Wed Mar 4 20:02:04 2009 New Revision: 4160 Log: Merge 2 assignements. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Wed Mar 4 20:00:17 2009 (r4159) +++ amr/amrnbfloatdec.c Wed Mar 4 20:02:04 2009 (r4160) @@ -1,4 +1,4 @@ -/* +/* * AMR narrowband decoder (floating point) * Copyright (c) 2006-2007 Robert Swain * @@ -714,11 +714,9 @@ static void decode_gains(AMRContext *p, fixed_gain_factor = gains_MODE_475[index][1]; } - // calculate the predicted fixed gain g_c' - p->fixed_gain[4] = fixed_gain_prediction(p->fixed_vector, p->prediction_error, mode); - // ^g_c = g_c' * ^gamma_gc - p->fixed_gain[4] *= fixed_gain_factor; + p->fixed_gain[4] = fixed_gain_factor + * fixed_gain_prediction(p->fixed_vector, p->prediction_error, mode); // update quantified prediction error energy history p->prediction_error[0] = p->prediction_error[1];

1 0

[soc]: r4159 - amr/amrnbfloatdec.c
by kmalaussene 04 Mar '09

04 Mar '09

Author: kmalaussene Date: Wed Mar 4 20:00:17 2009 New Revision: 4159 Log: Remove fixed_gain_factor from the AMRContext since it can be a local variable. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Wed Mar 4 19:53:10 2009 (r4158) +++ amr/amrnbfloatdec.c Wed Mar 4 20:00:17 2009 (r4159) @@ -68,7 +68,6 @@ typedef struct AMRContext { float prediction_error[4]; ///< quantified prediction errors {20log10(^γ_gc)} for previous four subframes float pitch_gain[5]; ///< quantified pitch gains for the current and previous four subframes - float fixed_gain_factor; ///< fixed gain correction factor {^γ_gc} for the current frame float fixed_gain[5]; ///< quantified fixed gains for the current and previous four subframes float beta; ///< beta = pitch_gain, bounded by [0.0,1.0] for 12.2 kbps or [0.0,0.8] for other modes @@ -696,34 +695,36 @@ static float fixed_gain_prediction(float static void decode_gains(AMRContext *p, const AMRNBSubframe *amr_subframe, const enum Mode mode, const int subframe) { + float fixed_gain_factor; // fixed gain correction factor {^γ_gc} for the current frame + // decode pitch gain and fixed gain correction factor if(mode == MODE_122 || mode == MODE_795) { p->pitch_gain[4] = qua_gain_pit [amr_subframe->p_gain]; - p->fixed_gain_factor = qua_gain_code[amr_subframe->fixed_gain]; + fixed_gain_factor = qua_gain_code[amr_subframe->fixed_gain]; }else if(mode >= MODE_67) { p->pitch_gain[4] = gains_high[amr_subframe->p_gain][0]; - p->fixed_gain_factor = gains_high[amr_subframe->p_gain][1]; + fixed_gain_factor = gains_high[amr_subframe->p_gain][1]; }else if(mode >= MODE_515) { p->pitch_gain[4] = gains_low[amr_subframe->p_gain][0]; - p->fixed_gain_factor = gains_low[amr_subframe->p_gain][1]; + fixed_gain_factor = gains_low[amr_subframe->p_gain][1]; }else { // gain index is only coded in subframes 0,2 const int index = (p->frame.subframe[subframe&2].p_gain << 1) + (subframe&1); p->pitch_gain[4] = gains_MODE_475[index][0]; - p->fixed_gain_factor = gains_MODE_475[index][1]; + fixed_gain_factor = gains_MODE_475[index][1]; } // calculate the predicted fixed gain g_c' p->fixed_gain[4] = fixed_gain_prediction(p->fixed_vector, p->prediction_error, mode); // ^g_c = g_c' * ^gamma_gc - p->fixed_gain[4] *= p->fixed_gain_factor; + p->fixed_gain[4] *= fixed_gain_factor; // update quantified prediction error energy history p->prediction_error[0] = p->prediction_error[1]; p->prediction_error[1] = p->prediction_error[2]; p->prediction_error[2] = p->prediction_error[3]; - p->prediction_error[3] = 20.0*log10f(p->fixed_gain_factor); + p->prediction_error[3] = 20.0*log10f(fixed_gain_factor); } /// @}

1 0

[soc]: r4158 - amr/amrnbfloatdec.c
by kmalaussene 04 Mar '09

04 Mar '09

Author: kmalaussene Date: Wed Mar 4 19:53:10 2009 New Revision: 4158 Log: Remove ugly static variable gains_index_MODE_475 in decode_gains. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Wed Mar 4 19:44:41 2009 (r4157) +++ amr/amrnbfloatdec.c Wed Mar 4 19:53:10 2009 (r4158) @@ -696,8 +696,6 @@ static float fixed_gain_prediction(float static void decode_gains(AMRContext *p, const AMRNBSubframe *amr_subframe, const enum Mode mode, const int subframe) { - static int gains_index_MODE_475; - // decode pitch gain and fixed gain correction factor if(mode == MODE_122 || mode == MODE_795) { p->pitch_gain[4] = qua_gain_pit [amr_subframe->p_gain]; @@ -710,9 +708,9 @@ static void decode_gains(AMRContext *p, p->fixed_gain_factor = gains_low[amr_subframe->p_gain][1]; }else { // gain index is only coded in subframes 0,2 - gains_index_MODE_475 = subframe&1 ? gains_index_MODE_475+1 : amr_subframe->p_gain<<1; - p->pitch_gain[4] = gains_MODE_475[gains_index_MODE_475][0]; - p->fixed_gain_factor = gains_MODE_475[gains_index_MODE_475][1]; + const int index = (p->frame.subframe[subframe&2].p_gain << 1) + (subframe&1); + p->pitch_gain[4] = gains_MODE_475[index][0]; + p->fixed_gain_factor = gains_MODE_475[index][1]; } // calculate the predicted fixed gain g_c'

1 0

[soc]: r4157 - amr/amrnbfloatdec.c
by kmalaussene 04 Mar '09

04 Mar '09

Author: kmalaussene Date: Wed Mar 4 19:44:41 2009 New Revision: 4157 Log: Simplify decoding gains for MODE_475. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Wed Mar 4 19:34:41 2009 (r4156) +++ amr/amrnbfloatdec.c Wed Mar 4 19:44:41 2009 (r4157) @@ -1,4 +1,4 @@ -/* +/* * AMR narrowband decoder (floating point) * Copyright (c) 2006-2007 Robert Swain * @@ -710,11 +710,9 @@ static void decode_gains(AMRContext *p, p->fixed_gain_factor = gains_low[amr_subframe->p_gain][1]; }else { // gain index is only coded in subframes 0,2 - if(!(subframe&1)) { - gains_index_MODE_475 = amr_subframe->p_gain<<1; - } - p->pitch_gain[4] = gains_MODE_475[gains_index_MODE_475 + (subframe&1)][0]; - p->fixed_gain_factor = gains_MODE_475[gains_index_MODE_475 + (subframe&1)][1]; + gains_index_MODE_475 = subframe&1 ? gains_index_MODE_475+1 : amr_subframe->p_gain<<1; + p->pitch_gain[4] = gains_MODE_475[gains_index_MODE_475][0]; + p->fixed_gain_factor = gains_MODE_475[gains_index_MODE_475][1]; } // calculate the predicted fixed gain g_c'

1 0

[soc]: r4156 - amr/amrnbfloatdec.c
by kmalaussene 04 Mar '09

04 Mar '09

Author: kmalaussene Date: Wed Mar 4 19:34:41 2009 New Revision: 4156 Log: Factor out gains decoding into decode_gains function, to make the main loop more readable and allow further simplifications. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Wed Mar 4 01:06:52 2009 (r4155) +++ amr/amrnbfloatdec.c Wed Mar 4 19:34:41 2009 (r4156) @@ -685,6 +685,51 @@ static float fixed_gain_prediction(float return powf(10.0, 0.05*(energy_pred + energy_mean[mode] - energy_fixed_mean)); } +/** + * Decode fixed and pitch gains. + * + * @param p the context + * @param amr_subframe unpacked amr subframe + * @param mode mode of the current frame + * @param subframe current subframe number + */ + +static void decode_gains(AMRContext *p, const AMRNBSubframe *amr_subframe, const enum Mode mode, const int subframe) +{ + static int gains_index_MODE_475; + + // decode pitch gain and fixed gain correction factor + if(mode == MODE_122 || mode == MODE_795) { + p->pitch_gain[4] = qua_gain_pit [amr_subframe->p_gain]; + p->fixed_gain_factor = qua_gain_code[amr_subframe->fixed_gain]; + }else if(mode >= MODE_67) { + p->pitch_gain[4] = gains_high[amr_subframe->p_gain][0]; + p->fixed_gain_factor = gains_high[amr_subframe->p_gain][1]; + }else if(mode >= MODE_515) { + p->pitch_gain[4] = gains_low[amr_subframe->p_gain][0]; + p->fixed_gain_factor = gains_low[amr_subframe->p_gain][1]; + }else { + // gain index is only coded in subframes 0,2 + if(!(subframe&1)) { + gains_index_MODE_475 = amr_subframe->p_gain<<1; + } + p->pitch_gain[4] = gains_MODE_475[gains_index_MODE_475 + (subframe&1)][0]; + p->fixed_gain_factor = gains_MODE_475[gains_index_MODE_475 + (subframe&1)][1]; + } + + // calculate the predicted fixed gain g_c' + p->fixed_gain[4] = fixed_gain_prediction(p->fixed_vector, p->prediction_error, mode); + + // ^g_c = g_c' * ^gamma_gc + p->fixed_gain[4] *= p->fixed_gain_factor; + + // update quantified prediction error energy history + p->prediction_error[0] = p->prediction_error[1]; + p->prediction_error[1] = p->prediction_error[2]; + p->prediction_error[2] = p->prediction_error[3]; + p->prediction_error[3] = 20.0*log10f(p->fixed_gain_factor); +} + /// @} @@ -835,12 +880,6 @@ static void update_state(AMRContext *p) memmove(&p->excitation_buf[0], &p->excitation_buf[AMR_SUBFRAME_SIZE], (PITCH_LAG_MAX + LP_FILTER_ORDER + 1)*sizeof(float)); - // update quantified prediction error energy history - p->prediction_error[0] = p->prediction_error[1]; - p->prediction_error[1] = p->prediction_error[2]; - p->prediction_error[2] = p->prediction_error[3]; - p->prediction_error[3] = 20.0*log10f(p->fixed_gain_factor); - // update gain history memmove(&p->pitch_gain[0], &p->pitch_gain[1], 4*sizeof(float)); memmove(&p->fixed_gain[0], &p->fixed_gain[1], 4*sizeof(float)); @@ -861,7 +900,6 @@ static int amrnb_decode_frame(AVCodecCon AMRContext *p = avctx->priv_data; // pointer to private data float *buf_out = data; // pointer to the output data buffer int i, subframe; // counters - int gains_index_MODE_475 = 0; // MODE_475 gains index coded every other subframe enum Mode speech_mode = MODE_475; // ??? // decode the bitstream to AMR parameters @@ -899,34 +937,7 @@ static int amrnb_decode_frame(AVCodecCon decode_fixed_vector(p->fixed_vector, amr_subframe->pulses, p->cur_frame_mode, subframe); -/*** gain decoding ***/ - - // calculate the predicted fixed gain g_c' - p->fixed_gain[4] = fixed_gain_prediction(p->fixed_vector, p->prediction_error, p->cur_frame_mode); - - // decode pitch gain and fixed gain correction factor - if(p->cur_frame_mode == MODE_122 || p->cur_frame_mode == MODE_795) { - p->pitch_gain[4] = qua_gain_pit [amr_subframe->p_gain]; - p->fixed_gain_factor = qua_gain_code[amr_subframe->fixed_gain]; - }else if(p->cur_frame_mode >= MODE_67) { - p->pitch_gain[4] = gains_high[amr_subframe->p_gain][0]; - p->fixed_gain_factor = gains_high[amr_subframe->p_gain][1]; - }else if(p->cur_frame_mode >= MODE_515) { - p->pitch_gain[4] = gains_low[amr_subframe->p_gain][0]; - p->fixed_gain_factor = gains_low[amr_subframe->p_gain][1]; - }else { - // gain index is only coded in subframes 0,2 - if(!(subframe&1)) { - gains_index_MODE_475 = amr_subframe->p_gain<<1; - } - p->pitch_gain[4] = gains_MODE_475[gains_index_MODE_475 + (subframe&1)][0]; - p->fixed_gain_factor = gains_MODE_475[gains_index_MODE_475 + (subframe&1)][1]; - } - - // ^g_c = g_c' * ^gamma_gc - p->fixed_gain[4] *= p->fixed_gain_factor; - -/*** end of gain decoding ***/ + decode_gains(p, amr_subframe, p->cur_frame_mode, subframe); /*** pre-processing ***/

1 0

[soc]: r4155 - libavfilter/vf_scale.c
by stefano 04 Mar '09

04 Mar '09

Author: stefano Date: Wed Mar 4 01:06:52 2009 New Revision: 4155 Log: Use av_gcd() rather than av_reduce() when computing outpic->pixel_aspect, simplify. Modified: libavfilter/vf_scale.c Modified: libavfilter/vf_scale.c ============================================================================== --- libavfilter/vf_scale.c Wed Mar 4 01:03:07 2009 (r4154) +++ libavfilter/vf_scale.c Wed Mar 4 01:06:52 2009 (r4155) @@ -128,15 +128,17 @@ static void start_frame(AVFilterLink *li { ScaleContext *scale = link->dst->priv; AVFilterLink *out = link->dst->outputs[0]; + int64_t gcd; out->outpic = avfilter_get_video_buffer(out, AV_PERM_WRITE); out->outpic->pts = picref->pts; out->outpic->pixel_aspect.num = picref->pixel_aspect.num * out->h * link->w; out->outpic->pixel_aspect.den = picref->pixel_aspect.den * out->w * link->h; - av_reduce(&out->outpic->pixel_aspect.num, &out->outpic->pixel_aspect.den, - out->outpic->pixel_aspect.num, out->outpic->pixel_aspect.den, - FFMAX(out->outpic->pixel_aspect.num, out->outpic->pixel_aspect.den)); + + gcd = av_gcd(out->outpic->pixel_aspect.num, out->outpic->pixel_aspect.den); + out->outpic->pixel_aspect.num /= gcd; + out->outpic->pixel_aspect.den /= gcd; avfilter_start_frame(out, avfilter_ref_pic(out->outpic, ~0));

1 0