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

[soc]: r4084 - amr/amrnbfloatdec.c
by kmalaussene 19 Feb '09

19 Feb '09

Author: kmalaussene Date: Thu Feb 19 03:25:35 2009 New Revision: 4084 Log: Extract function ff_apply_gain_ctrl that could be reused by the QCELP decoder and other celp codecs. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Wed Feb 18 01:28:12 2009 (r4083) +++ amr/amrnbfloatdec.c Thu Feb 19 03:25:35 2009 (r4084) @@ -95,6 +95,35 @@ static void weighted_vector_sumf(float * + weight_coeff_b * in_b[i]; } +/** + * @note this function should be moved to acelp_vectors.[ch] + * and used in qcelpdec.c + * + * Apply adaptive gain control by gain scaling. + * + * @param v_out output vector + * @param v_in gain-controlled vector + * @param v_ref vector to control gain of + * @param length vectors length + * + * 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 + */ +void ff_apply_gain_ctrl(float *v_out, const float *v_ref, const float *v_in, const int length) +{ + int i; + float scalefactor = ff_dot_productf(v_in, v_in, length); + if(scalefactor) + scalefactor = sqrt(ff_dot_productf(v_ref, v_ref, length) / scalefactor); + else + ff_log_missing_feature(NULL, "Zero energy for gain control", 1); + for(i=0; i<length; i++) + v_out[i] = scalefactor * v_in[i]; +} + static void reset_state(AMRContext *p) { int i; @@ -806,21 +835,14 @@ static int synthesis(AMRContext *p, floa if(p->pitch_gain[4] > 0.5 && !overflow) { float excitation_temp[AMR_SUBFRAME_SIZE]; float pitch_factor = (p->cur_frame_mode == MODE_122 ? 0.25 : 0.5)*p->beta*p->pitch_gain[4]; - float eta, temp1 = 0.0, temp2 = 0.0; for(i=0; i<AMR_SUBFRAME_SIZE; i++) { // emphasize pitch vector contribution excitation_temp[i] = excitation[i] + pitch_factor*p->pitch_vector[i]; - // find gain scale - temp1 += excitation[i]*excitation[i]; - temp2 += excitation_temp[i]*excitation_temp[i]; } // adaptive gain control by gain scaling - eta = sqrt(temp1/temp2); - for(i=0; i<AMR_SUBFRAME_SIZE; i++) { - excitation[i] = eta*excitation_temp[i]; - } + ff_apply_gain_ctrl(excitation, excitation, excitation_temp, AMR_SUBFRAME_SIZE); } for(i=0; i<AMR_SUBFRAME_SIZE; i++) {

3 2

[soc]: r4100 - amr/amrnbfloatdata.h
by kmalaussene 19 Feb '09

19 Feb '09

Author: kmalaussene Date: Thu Feb 19 22:50:48 2009 New Revision: 4100 Log: Add lookup tables for previous commit. Modified: amr/amrnbfloatdata.h Modified: amr/amrnbfloatdata.h ============================================================================== --- amr/amrnbfloatdata.h Thu Feb 19 22:36:55 2009 (r4099) +++ amr/amrnbfloatdata.h Thu Feb 19 22:50:48 2009 (r4100) @@ -2320,7 +2320,8 @@ static const float ir_filter_medium[AMR_ -0.093384, 0.088409, -0.060364, 0.016998, 0.023804, -0.041779, 0.025696, 0.019989, }; - +static const float *ir_filters_lookup[2] = { ir_filter_strong, ir_filter_medium }; +static const float *ir_filters_lookup_MODE_795[2] = { ir_filter_strong_MODE_795, ir_filter_medium }; /**************************** end of tables *****************************/

1 0

[soc]: r4099 - amr/amrnbfloatdec.c
by kmalaussene 19 Feb '09

19 Feb '09

Author: kmalaussene Date: Thu Feb 19 22:36:55 2009 New Revision: 4099 Log: Simplify lookup of ir_filter by using lookup tables. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Thu Feb 19 21:39:00 2009 (r4098) +++ amr/amrnbfloatdec.c Thu Feb 19 22:36:55 2009 (r4099) @@ -776,20 +776,10 @@ void do_phase_dispersion(AMRContext *p) //FIXME: disable filtering for very low level of fixed_gain if(p->cur_frame_mode != MODE_74 && p->cur_frame_mode < MODE_102 && ir_filter_strength < 2) { - const float *ir_filter; - // assign the correct impulse response - if(ir_filter_strength == 1) { - ir_filter = ir_filter_medium; - }else { - if(p->cur_frame_mode != MODE_795) { - ir_filter = ir_filter_strong; - }else { - ir_filter = ir_filter_strong_MODE_795; - } - } - + const float **filters = p->cur_frame_mode == MODE_795 ? ir_filters_lookup_MODE_795 + : ir_filters_lookup; // circularly convolve the fixed vector with the impulse response - convolve_circ(p->fixed_vector, ir_filter); + convolve_circ(p->fixed_vector, filters[ir_filter_strength]); } // update ir filter strength history

1 0

[soc]: r4098 - amr/amrnbfloatdec.c
by kmalaussene 19 Feb '09

19 Feb '09

Author: kmalaussene Date: Thu Feb 19 21:39:00 2009 New Revision: 4098 Log: Fix type for ir_filter. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Thu Feb 19 21:21:01 2009 (r4097) +++ amr/amrnbfloatdec.c Thu Feb 19 21:39:00 2009 (r4098) @@ -737,7 +737,7 @@ static void convolve_circ(float *fixed_v */ void do_phase_dispersion(AMRContext *p) { - float ir_filter_strength; + int ir_filter_strength; // anti-sparseness processing if(p->pitch_gain[4] < 0.6) {

1 0

[soc]: r4097 - amr/amrnbfloatdec.c
by kmalaussene 19 Feb '09

19 Feb '09

Author: kmalaussene Date: Thu Feb 19 21:21:01 2009 New Revision: 4097 Log: Merge 2 conditions !=MODE_102 and !=MODE_122 into < MODE_102. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Thu Feb 19 20:52:02 2009 (r4096) +++ amr/amrnbfloatdec.c Thu Feb 19 21:21:01 2009 (r4097) @@ -775,8 +775,7 @@ void do_phase_dispersion(AMRContext *p) //FIXME: disable filtering for very low level of fixed_gain - if(p->cur_frame_mode != MODE_74 && p->cur_frame_mode != MODE_102 && - p->cur_frame_mode != MODE_122 && ir_filter_strength < 2) { + if(p->cur_frame_mode != MODE_74 && p->cur_frame_mode < MODE_102 && ir_filter_strength < 2) { const float *ir_filter; // assign the correct impulse response if(ir_filter_strength == 1) {

1 0

[soc]: r4096 - amr/amrnbfloatdec.c
by kmalaussene 19 Feb '09

19 Feb '09

Author: kmalaussene Date: Thu Feb 19 20:52:02 2009 New Revision: 4096 Log: Fix the choice of ir_filter for the phase dispersion, based on the reference code. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Thu Feb 19 05:47:00 2009 (r4095) +++ amr/amrnbfloatdec.c Thu Feb 19 20:52:02 2009 (r4096) @@ -78,6 +78,7 @@ typedef struct AMRContext { int diff_count; ///< the number of subframes for which diff has been above 0.65 uint8_t prev_ir_filter_strength; ///< previous impulse response filter strength; 0 - strong, 1 - medium, 2 - none + uint8_t ir_filter_onset; ///< flag for impulse response filter strength float samples_in[LP_FILTER_ORDER + AMR_SUBFRAME_SIZE]; ///< floating point samples @@ -692,47 +693,6 @@ static float fixed_gain_prediction(float /// @{ /** - * Comparison function for use with qsort. - * - * @param a first value for comparison - * @param b second value for comparison - * @return a-b : the result of the comparison - */ - -int qsort_compare(const void *a, const void *b) -{ - float diff = *(const float *)a - *(const float *)b; - if(diff > 0.0f) - return 1; - if(diff < 0.0f) - return -1; - return 0; -} - -/** - * Find the median of some float values. - * - * @param values pointer to the values of which to find the median - * @param n number of values - * @return the median value - */ - -static float medianf(float *values, int n) -{ - float temp[9]; // largest n used for median calculation is 9 - - memcpy(temp, values, n * sizeof(float)); - - qsort(temp, n, sizeof(float), qsort_compare); - - if(n&1) { - return temp[ n>>1 ]; - }else { - return (temp[ (n>>1)-1 ] + temp[ n>>1 ])/2.0; - } -} - -/** * Circularly convolve the fixed vector with a phase dispersion impulse response * filter. * @@ -793,12 +753,28 @@ void do_phase_dispersion(AMRContext *p) // detect 'onset' if(p->fixed_gain[4] > 2.0*p->fixed_gain[3]) { - ir_filter_strength = FFMIN(ir_filter_strength + 1, 2); - }else if(ir_filter_strength == 0 && medianf(p->pitch_gain, 5) >= 0.6 && - ir_filter_strength > p->prev_ir_filter_strength + 1) { - ir_filter_strength = p->prev_ir_filter_strength + 1; + p->ir_filter_onset = 2; + }else if(p->ir_filter_onset) { + p->ir_filter_onset--; } + if(!p->ir_filter_onset) { + int i, count = 0; + + for(i=0; i<5; i++) + if(p->pitch_gain[i] < 0.6) + count++; + if(count > 2) + ir_filter_strength = 0; + + if(ir_filter_strength > p->prev_ir_filter_strength + 1) + ir_filter_strength--; + } else if(ir_filter_strength < 2) { + ir_filter_strength++; + } + + //FIXME: disable filtering for very low level of fixed_gain + if(p->cur_frame_mode != MODE_74 && p->cur_frame_mode != MODE_102 && p->cur_frame_mode != MODE_122 && ir_filter_strength < 2) { const float *ir_filter;

1 0

[soc]: r4095 - amr/amrnbfloatdec.c
by kmalaussene 19 Feb '09

19 Feb '09

Author: kmalaussene Date: Thu Feb 19 05:47:00 2009 New Revision: 4095 Log: Remove ir_filter from AMRContext, because it does not need to be saved for the next subframe. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Thu Feb 19 05:18:55 2009 (r4094) +++ amr/amrnbfloatdec.c Thu Feb 19 05:47:00 2009 (r4095) @@ -78,7 +78,6 @@ typedef struct AMRContext { int diff_count; ///< the number of subframes for which diff has been above 0.65 uint8_t prev_ir_filter_strength; ///< previous impulse response filter strength; 0 - strong, 1 - medium, 2 - none - const float *ir_filter; ///< pointer to impulse response filter data float samples_in[LP_FILTER_ORDER + AMR_SUBFRAME_SIZE]; ///< floating point samples @@ -802,19 +801,20 @@ void do_phase_dispersion(AMRContext *p) if(p->cur_frame_mode != MODE_74 && p->cur_frame_mode != MODE_102 && p->cur_frame_mode != MODE_122 && ir_filter_strength < 2) { + const float *ir_filter; // assign the correct impulse response if(ir_filter_strength == 1) { - p->ir_filter = ir_filter_medium; + ir_filter = ir_filter_medium; }else { if(p->cur_frame_mode != MODE_795) { - p->ir_filter = ir_filter_strong; + ir_filter = ir_filter_strong; }else { - p->ir_filter = ir_filter_strong_MODE_795; + ir_filter = ir_filter_strong_MODE_795; } } // circularly convolve the fixed vector with the impulse response - convolve_circ(p->fixed_vector, p->ir_filter); + convolve_circ(p->fixed_vector, ir_filter); } // update ir filter strength history

1 0

[soc]: r4094 - amr/amrnbfloatdec.c
by kmalaussene 19 Feb '09

19 Feb '09

Author: kmalaussene Date: Thu Feb 19 05:18:55 2009 New Revision: 4094 Log: Split ir_filter_strength in AMRContext into a local variable in do_phase_dispersion and prev_ir_filter_strength in the context. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Thu Feb 19 05:15:03 2009 (r4093) +++ amr/amrnbfloatdec.c Thu Feb 19 05:18:55 2009 (r4094) @@ -77,7 +77,7 @@ typedef struct AMRContext { float beta; ///< beta = pitch_gain, bounded by [0.0,1.0] for 12.2 kbps or [0.0,0.8] for other modes int diff_count; ///< the number of subframes for which diff has been above 0.65 - uint8_t ir_filter_strength[2]; ///< impulse response filter strength; 0 - strong, 1 - medium, 2 - none + uint8_t prev_ir_filter_strength; ///< previous impulse response filter strength; 0 - strong, 1 - medium, 2 - none const float *ir_filter; ///< pointer to impulse response filter data float samples_in[LP_FILTER_ORDER + AMR_SUBFRAME_SIZE]; ///< floating point samples @@ -778,30 +778,32 @@ static void convolve_circ(float *fixed_v */ void do_phase_dispersion(AMRContext *p) { + float ir_filter_strength; + // anti-sparseness processing if(p->pitch_gain[4] < 0.6) { // strong filtering - p->ir_filter_strength[1] = 0; + ir_filter_strength = 0; }else if(p->pitch_gain[4] < 0.9) { // medium filtering - p->ir_filter_strength[1] = 1; + ir_filter_strength = 1; }else { // no filtering - p->ir_filter_strength[1] = 2; + ir_filter_strength = 2; } // detect 'onset' if(p->fixed_gain[4] > 2.0*p->fixed_gain[3]) { - p->ir_filter_strength[1] = FFMIN(p->ir_filter_strength[1] + 1, 2); - }else if(p->ir_filter_strength[1] == 0 && medianf(p->pitch_gain, 5) >= 0.6 && - p->ir_filter_strength[1] > p->ir_filter_strength[0] + 1) { - p->ir_filter_strength[1] = p->ir_filter_strength[0] + 1; + ir_filter_strength = FFMIN(ir_filter_strength + 1, 2); + }else if(ir_filter_strength == 0 && medianf(p->pitch_gain, 5) >= 0.6 && + ir_filter_strength > p->prev_ir_filter_strength + 1) { + ir_filter_strength = p->prev_ir_filter_strength + 1; } if(p->cur_frame_mode != MODE_74 && p->cur_frame_mode != MODE_102 && - p->cur_frame_mode != MODE_122 && p->ir_filter_strength[1] < 2) { + p->cur_frame_mode != MODE_122 && ir_filter_strength < 2) { // assign the correct impulse response - if(p->ir_filter_strength[1] == 1) { + if(ir_filter_strength == 1) { p->ir_filter = ir_filter_medium; }else { if(p->cur_frame_mode != MODE_795) {

1 0

[soc]: r4093 - amr/amrnbfloatdec.c
by kmalaussene 19 Feb '09

19 Feb '09

Author: kmalaussene Date: Thu Feb 19 05:15:03 2009 New Revision: 4093 Log: Move update of ir_filter_strength state into do_phase_dispersion, so that all the code handling phase dispersion is in one place. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Thu Feb 19 05:03:09 2009 (r4092) +++ amr/amrnbfloatdec.c Thu Feb 19 05:15:03 2009 (r4093) @@ -814,6 +814,9 @@ void do_phase_dispersion(AMRContext *p) // circularly convolve the fixed vector with the impulse response convolve_circ(p->fixed_vector, p->ir_filter); } + + // update ir filter strength history + p->prev_ir_filter_strength = ir_filter_strength; } /// @defgroup amr_synthesis synthesis functions @@ -912,9 +915,6 @@ static void update_state(AMRContext *p) memmove(&p->pitch_gain[0], &p->pitch_gain[1], 4*sizeof(float)); memmove(&p->fixed_gain[0], &p->fixed_gain[1], 4*sizeof(float)); - // update ir filter strength history - p->ir_filter_strength[0] = p->ir_filter_strength[1]; - // update speech sample history memmove(&p->samples_in[0], &p->samples_in[AMR_SUBFRAME_SIZE], LP_FILTER_ORDER*sizeof(float));

1 0

[soc]: r4092 - amr/amrnbfloatdec.c
by kmalaussene 19 Feb '09

19 Feb '09

Author: kmalaussene Date: Thu Feb 19 05:03:09 2009 New Revision: 4092 Log: Reindent after previous commit. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Thu Feb 19 05:01:44 2009 (r4091) +++ amr/amrnbfloatdec.c Thu Feb 19 05:03:09 2009 (r4092) @@ -778,42 +778,42 @@ static void convolve_circ(float *fixed_v */ void do_phase_dispersion(AMRContext *p) { - // anti-sparseness processing - if(p->pitch_gain[4] < 0.6) { - // strong filtering - p->ir_filter_strength[1] = 0; - }else if(p->pitch_gain[4] < 0.9) { - // medium filtering - p->ir_filter_strength[1] = 1; - }else { - // no filtering - p->ir_filter_strength[1] = 2; - } + // anti-sparseness processing + if(p->pitch_gain[4] < 0.6) { + // strong filtering + p->ir_filter_strength[1] = 0; + }else if(p->pitch_gain[4] < 0.9) { + // medium filtering + p->ir_filter_strength[1] = 1; + }else { + // no filtering + p->ir_filter_strength[1] = 2; + } - // detect 'onset' - if(p->fixed_gain[4] > 2.0*p->fixed_gain[3]) { - p->ir_filter_strength[1] = FFMIN(p->ir_filter_strength[1] + 1, 2); - }else if(p->ir_filter_strength[1] == 0 && medianf(p->pitch_gain, 5) >= 0.6 && - p->ir_filter_strength[1] > p->ir_filter_strength[0] + 1) { - p->ir_filter_strength[1] = p->ir_filter_strength[0] + 1; - } + // detect 'onset' + if(p->fixed_gain[4] > 2.0*p->fixed_gain[3]) { + p->ir_filter_strength[1] = FFMIN(p->ir_filter_strength[1] + 1, 2); + }else if(p->ir_filter_strength[1] == 0 && medianf(p->pitch_gain, 5) >= 0.6 && + p->ir_filter_strength[1] > p->ir_filter_strength[0] + 1) { + p->ir_filter_strength[1] = p->ir_filter_strength[0] + 1; + } - if(p->cur_frame_mode != MODE_74 && p->cur_frame_mode != MODE_102 && - p->cur_frame_mode != MODE_122 && p->ir_filter_strength[1] < 2) { - // assign the correct impulse response - if(p->ir_filter_strength[1] == 1) { - p->ir_filter = ir_filter_medium; + if(p->cur_frame_mode != MODE_74 && p->cur_frame_mode != MODE_102 && + p->cur_frame_mode != MODE_122 && p->ir_filter_strength[1] < 2) { + // assign the correct impulse response + if(p->ir_filter_strength[1] == 1) { + p->ir_filter = ir_filter_medium; + }else { + if(p->cur_frame_mode != MODE_795) { + p->ir_filter = ir_filter_strong; }else { - if(p->cur_frame_mode != MODE_795) { - p->ir_filter = ir_filter_strong; - }else { - p->ir_filter = ir_filter_strong_MODE_795; - } + p->ir_filter = ir_filter_strong_MODE_795; } - - // circularly convolve the fixed vector with the impulse response - convolve_circ(p->fixed_vector, p->ir_filter); } + + // circularly convolve the fixed vector with the impulse response + convolve_circ(p->fixed_vector, p->ir_filter); + } } /// @defgroup amr_synthesis synthesis functions

1 0