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

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

19 Feb '09

Author: kmalaussene Date: Thu Feb 19 04:37:41 2009 New Revision: 4089 Log: Add FIXME for order_MODE_DTX: currently, it is not mapped to anything in AMRNBFrame. Modified: amr/amrnbfloatdata.h Modified: amr/amrnbfloatdata.h ============================================================================== --- amr/amrnbfloatdata.h Thu Feb 19 04:18:36 2009 (r4088) +++ amr/amrnbfloatdata.h Thu Feb 19 04:37:41 2009 (r4089) @@ -485,6 +485,7 @@ AMR_PULSES(3, 9, 0), AMR_PULSES(3, 9, 1) AMR_PLAG(1, 0), AMR_PLAG(3, 0) }; +//FIXME: This order needs to be map into AMRNBFrame. static const AMROrder order_MODE_DTX[35] = { { 0, 2}, { 0, 1}, { 0, 0}, { 1, 7}, { 1, 6}, { 1, 5}, { 1, 4}, { 1, 3}, { 1, 2}, { 1, 1}, { 1, 0}, { 2, 8}, { 2, 7}, { 2, 6}, { 2, 5}, { 2, 4},

3 2

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

19 Feb '09

Author: kmalaussene Date: Thu Feb 19 05:01:44 2009 New Revision: 4091 Log: Clarify FIXME recommended by Robert Swain. Modified: amr/amrnbfloatdata.h Modified: amr/amrnbfloatdata.h ============================================================================== --- amr/amrnbfloatdata.h Thu Feb 19 05:00:02 2009 (r4090) +++ amr/amrnbfloatdata.h Thu Feb 19 05:01:44 2009 (r4091) @@ -485,7 +485,7 @@ AMR_PULSES(3, 9, 0), AMR_PULSES(3, 9, 1) AMR_PLAG(1, 0), AMR_PLAG(3, 0) }; -//FIXME: This order needs to be map into AMRNBFrame. +//FIXME: This order array needs to be mapped to AMRNBFrame. static const AMROrder order_MODE_DTX[35] = { { 0, 2}, { 0, 1}, { 0, 0}, { 1, 7}, { 1, 6}, { 1, 5}, { 1, 4}, { 1, 3}, { 1, 2}, { 1, 1}, { 1, 0}, { 2, 8}, { 2, 7}, { 2, 6}, { 2, 5}, { 2, 4},

1 0

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

19 Feb '09

Author: kmalaussene Date: Thu Feb 19 05:00:02 2009 New Revision: 4090 Log: Extract into its own function the code to compute the phase dispersion. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Thu Feb 19 04:37:41 2009 (r4089) +++ amr/amrnbfloatdec.c Thu Feb 19 05:00:02 2009 (r4090) @@ -771,6 +771,50 @@ static void convolve_circ(float *fixed_v /// @} +/** + * adaptive phase dispersion; forming of total excitation + * + * @param p the context + */ +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; + } + + // 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; + }else { + if(p->cur_frame_mode != MODE_795) { + p->ir_filter = ir_filter_strong; + }else { + 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); + } +} /// @defgroup amr_synthesis synthesis functions /// @{ @@ -1013,42 +1057,7 @@ static int amrnb_decode_frame(AVCodecCon } } - // 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; - } - - 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 { - 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); - } + do_phase_dispersion(p); /*** end of pre-processing ***/

1 0

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

19 Feb '09

Author: kmalaussene Date: Thu Feb 19 04:18:36 2009 New Revision: 4088 Log: cosmetics after last commit Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Thu Feb 19 04:17:10 2009 (r4087) +++ amr/amrnbfloatdec.c Thu Feb 19 04:18:36 2009 (r4088) @@ -201,12 +201,12 @@ enum Mode decode_bitstream(AMRContext *p data[order[i].array_element] += get_bits1(&p->gb) * (1<< order[i].bit_mask); } - if(mode == MODE_DTX) { - p->cur_frame_type = RX_SID_FIRST; // get SID type bit - skip_bits(&p->gb, 4); // skip to the next byte - if(get_bits1(&p->gb)) // use the update if there is one - p->cur_frame_type = RX_SID_UPDATE; - *speech_mode = get_bits(&p->gb, 3); // speech mode indicator + if(mode == MODE_DTX) { + p->cur_frame_type = RX_SID_FIRST; // get SID type bit + skip_bits(&p->gb, 4); // skip to the next byte + if(get_bits1(&p->gb)) // use the update if there is one + p->cur_frame_type = RX_SID_UPDATE; + *speech_mode = get_bits(&p->gb, 3); // speech mode indicator }else p->cur_frame_type = RX_SPEECH_GOOD; }else if(mode == NO_DATA) {

1 0

[soc]: r4087 - in amr: amrnbfloatdata.h amrnbfloatdec.c
by kmalaussene 19 Feb '09

19 Feb '09

Author: kmalaussene Date: Thu Feb 19 04:17:10 2009 New Revision: 4087 Log: Simplify decode_bitstream. Modified: amr/amrnbfloatdata.h amr/amrnbfloatdec.c Modified: amr/amrnbfloatdata.h ============================================================================== --- amr/amrnbfloatdata.h Thu Feb 19 03:30:52 2009 (r4086) +++ amr/amrnbfloatdata.h Thu Feb 19 04:17:10 2009 (r4087) @@ -493,6 +493,22 @@ static const AMROrder order_MODE_DTX[35] { 4, 2}, { 4, 1}, { 4, 0} }; +/** + * position of the bitmapping data for each packet type in + * the AMRNBFrame + */ +static const AMROrder * const amr_unpacking_bitmaps_per_mode[9] = { + order_MODE_475, + order_MODE_515, + order_MODE_59, + order_MODE_67, + order_MODE_74, + order_MODE_795, + order_MODE_102, + order_MODE_122, + order_MODE_DTX, +}; + // number of bits for each mode static const uint8_t mode_bits[N_MODES] = { FF_ARRAY_ELEMS(order_MODE_475), Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Thu Feb 19 03:30:52 2009 (r4086) +++ amr/amrnbfloatdec.c Thu Feb 19 04:17:10 2009 (r4087) @@ -181,8 +181,6 @@ enum Mode decode_bitstream(AMRContext *p enum Mode *speech_mode) { enum Mode mode; - int i; - const AMROrder *order; // initialize get_bits init_get_bits(&p->gb, buf, buf_size*8); @@ -193,66 +191,28 @@ enum Mode decode_bitstream(AMRContext *p p->bad_frame_indicator = !get_bits1(&p->gb); skip_bits(&p->gb, 2); - switch(mode) { - case MODE_DTX: - order = order_MODE_DTX; - p->cur_frame_type = RX_SID_FIRST; // get SID type bit - break; - case NO_DATA: - p->cur_frame_type = RX_NO_DATA; - break; - case MODE_475: - order = order_MODE_475; - p->cur_frame_type = RX_SPEECH_GOOD; - break; - case MODE_515: - order = order_MODE_515; - p->cur_frame_type = RX_SPEECH_GOOD; - break; - case MODE_59: - order = order_MODE_59; - p->cur_frame_type = RX_SPEECH_GOOD; - break; - case MODE_67: - order = order_MODE_67; - p->cur_frame_type = RX_SPEECH_GOOD; - break; - case MODE_74: - order = order_MODE_74; - p->cur_frame_type = RX_SPEECH_GOOD; - break; - case MODE_795: - order = order_MODE_795; - p->cur_frame_type = RX_SPEECH_GOOD; - break; - case MODE_102: - order = order_MODE_102; - p->cur_frame_type = RX_SPEECH_GOOD; - break; - case MODE_122: - order = order_MODE_122; - p->cur_frame_type = RX_SPEECH_GOOD; - break; - default: - p->cur_frame_type = RX_SPEECH_BAD; - break; - } - - // reorder the bitstream to match the bit allocation in the specification - if((p->cur_frame_type != RX_NO_DATA) && (p->cur_frame_type != RX_SPEECH_BAD)) { + if(MODE_475 <= mode && mode <= MODE_DTX) { uint16_t *data = (uint16_t *)&p->frame; + const AMROrder *order = amr_unpacking_bitmaps_per_mode[mode]; + int i; memset(&p->frame, 0, sizeof(AMRNBFrame)); for(i=0; i<mode_bits[mode]; i++) { data[order[i].array_element] += get_bits1(&p->gb) * (1<< order[i].bit_mask); } - } if(mode == MODE_DTX) { + p->cur_frame_type = RX_SID_FIRST; // get SID type bit skip_bits(&p->gb, 4); // skip to the next byte if(get_bits1(&p->gb)) // use the update if there is one p->cur_frame_type = RX_SID_UPDATE; *speech_mode = get_bits(&p->gb, 3); // speech mode indicator + }else + p->cur_frame_type = RX_SPEECH_GOOD; + }else if(mode == NO_DATA) { + p->cur_frame_type = RX_NO_DATA; + }else { + p->cur_frame_type = RX_SPEECH_BAD; } return mode;

1 0

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

19 Feb '09

Author: kmalaussene Date: Thu Feb 19 03:29:20 2009 New Revision: 4085 Log: Promote and document weighted_vector_sumf so that it could be reused by the QCELP decoder and other celp codecs. with other Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Thu Feb 19 03:25:35 2009 (r4084) +++ amr/amrnbfloatdec.c Thu Feb 19 03:29:20 2009 (r4085) @@ -84,7 +84,21 @@ typedef struct AMRContext { } AMRContext; -static void weighted_vector_sumf(float *out, const float *in_a, +/** + * @note this function should be moved to acelp_vectors.[ch] + * and used in qcelpdec.c + * + * weighted sum of two vectors with rounding. + * @param out [out] result of addition + * @param in_a first vector + * @param in_b second vector + * @param weight_coeff_a first vector weight coefficient + * @param weight_coeff_a second vector weight coefficient + * @param length vectors length + * + * @note It is safe to pass the same buffer for out and in_a or in_b. + */ + 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) { @@ -327,8 +341,8 @@ static void lsf2lsp_5(AMRContext *p) lsf2lsp_for_mode122(p, p->lsp[3], prev_lsf, lsf_quantizer, 2, lsf_param[2] & 1, 1); // interpolate LSP vectors at subframes 1 and 3 - weighted_vector_sumf(p->lsp[0], p->prev_lsp_sub4, p->lsp[1], 0.5, 0.5, LP_FILTER_ORDER); - weighted_vector_sumf(p->lsp[2], p->lsp[1] , p->lsp[3], 0.5, 0.5, LP_FILTER_ORDER); + ff_weighted_vector_sumf(p->lsp[0], p->prev_lsp_sub4, p->lsp[1], 0.5, 0.5, LP_FILTER_ORDER); + ff_weighted_vector_sumf(p->lsp[2], p->lsp[1] , p->lsp[3], 0.5, 0.5, LP_FILTER_ORDER); } /** @@ -366,7 +380,7 @@ static void lsf2lsp_3(AMRContext *p) // interpolate LSP vectors at subframes 1, 2 and 3 for(i=0; i<3; i++) - weighted_vector_sumf(p->lsp[i], p->prev_lsp_sub4, p->lsp[3], 0.25*(3-i), 0.25*(i+1), LP_FILTER_ORDER); + ff_weighted_vector_sumf(p->lsp[i], p->prev_lsp_sub4, p->lsp[3], 0.25*(3-i), 0.25*(i+1), LP_FILTER_ORDER); } @@ -939,7 +953,7 @@ static int amrnb_decode_frame(AVCodecCon } // update averaged lsp vector (used for fixed gain smoothing) - weighted_vector_sumf(p->lsp_avg, p->lsp_avg, p->prev_lsp_sub4, 0.84, 0.16, LP_FILTER_ORDER); + ff_weighted_vector_sumf(p->lsp_avg, p->lsp_avg, p->prev_lsp_sub4, 0.84, 0.16, LP_FILTER_ORDER); /*** end of LPC coefficient decoding ***/

3 4

[soc] [propchange]: r4085 - svn:log
by kmalaussene 19 Feb '09

19 Feb '09

Author: kmalaussene Revision: 4085 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1,3 +1,2 @@ Promote and document weighted_vector_sumf so that it could be reused by the QCELP decoder and other celp codecs. -with other

1 0

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

19 Feb '09

Author: kmalaussene Date: Thu Feb 19 03:30:52 2009 New Revision: 4086 Log: cosmetics after previous commit Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Thu Feb 19 03:29:20 2009 (r4085) +++ amr/amrnbfloatdec.c Thu Feb 19 03:30:52 2009 (r4086) @@ -98,9 +98,8 @@ typedef struct AMRContext { * * @note It is safe to pass the same buffer for out and in_a or in_b. */ - 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) + 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) { int i;

1 0

[soc]: r4083 - in amr: amrnbfloatdata.h amrnbfloatdec.c
by kmalaussene 18 Feb '09

18 Feb '09

Author: kmalaussene Date: Wed Feb 18 01:28:12 2009 New Revision: 4083 Log: Create pulses_nb_per_mode table and use it in decode_fixed_vector to replace pulse_nb. Modified: amr/amrnbfloatdata.h amr/amrnbfloatdec.c Modified: amr/amrnbfloatdata.h ============================================================================== --- amr/amrnbfloatdata.h Wed Feb 18 01:17:52 2009 (r4082) +++ amr/amrnbfloatdata.h Wed Feb 18 01:28:12 2009 (r4083) @@ -2039,6 +2039,11 @@ static const float b60[61] = { #define TRACKS 5 #define TRACKS_MODE_102 4 +/** + * number of pulses per mode + */ +static const uint8_t pulses_nb_per_mode[] = {2, 2, 2, 3, 4, 4, 8, 10}; + // track start positions for algebraic code book routines static const uint8_t track_position[16] = { 0, 2, 0, 3, 0, 2, 0, 3, 1, 3, 2, 4, 1, 4, 1, 4 }; Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Wed Feb 18 01:17:52 2009 (r4082) +++ amr/amrnbfloatdec.c Wed Feb 18 01:28:12 2009 (r4083) @@ -620,36 +620,32 @@ static void decode_fixed_vector(float *f }else if(mode == MODE_102) { decode_8_pulses_31bits(pulses, fixed_vector); }else { - int pulse_position[4], pulse_subset, pulse_nb; + int pulse_position[4], pulse_subset; const int fixed_index = pulses[0]; if(mode <= MODE_515) { - pulse_nb = 2; pulse_subset = ((fixed_index >> 3) & 8) + (subframe << 1); pulse_position[0] = ( fixed_index & 7)*5 + track_position[pulse_subset]; pulse_position[1] = ((fixed_index >> 3) & 7)*5 + track_position[pulse_subset + 1]; }else if(mode == MODE_59) { - pulse_nb = 2; pulse_subset = ((fixed_index & 1) << 1) + 1; pulse_position[0] = ((fixed_index >> 1) & 7)*5 + pulse_subset; pulse_subset = (fixed_index >> 4) & 3; pulse_position[1] = ((fixed_index >> 6) & 7)*5 + pulse_subset + (pulse_subset == 3 ? 1 : 0); }else if(mode == MODE_67) { - pulse_nb = 3; pulse_position[0] = ( fixed_index & 7)*5; pulse_subset = (fixed_index >> 2) & 2; pulse_position[1] = ((fixed_index >> 4) & 7)*5 + pulse_subset + 1; pulse_subset = (fixed_index >> 6) & 2; pulse_position[2] = ((fixed_index >> 8) & 7)*5 + pulse_subset + 2; }else { // mode <= MODE_795 - pulse_nb = 4; pulse_position[0] = gray_decode[ fixed_index & 7]*5; pulse_position[1] = gray_decode[(fixed_index >> 3) & 7]*5 + 1; pulse_position[2] = gray_decode[(fixed_index >> 6) & 7]*5 + 2; pulse_subset = (fixed_index >> 9) & 1; pulse_position[3] = gray_decode[(fixed_index >> 10) & 7]*5 + pulse_subset + 3; } - reconstruct_fixed_vector(pulse_position, pulses[1], pulse_nb, fixed_vector); + reconstruct_fixed_vector(pulse_position, pulses[1], pulses_nb_per_mode[mode], fixed_vector); } }

1 0

[soc]: r4082 - in amr: amr-ffmpeg.diff amrnbfloatdec.c
by kmalaussene 18 Feb '09

18 Feb '09

Author: kmalaussene Date: Wed Feb 18 01:17:52 2009 New Revision: 4082 Log: Reuse ff_dot_productf in fixed_gain_prediction: avoid code duplication. Modified: amr/amr-ffmpeg.diff amr/amrnbfloatdec.c Modified: amr/amr-ffmpeg.diff ============================================================================== --- amr/amr-ffmpeg.diff Wed Feb 18 00:44:16 2009 (r4081) +++ amr/amr-ffmpeg.diff Wed Feb 18 01:17:52 2009 (r4082) @@ -6,7 +6,7 @@ Index: libavcodec/Makefile 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) += amrnbfloatdec.o qcelp_lsp.o ++OBJS-$(CONFIG_AMRNB_DECODER) += amrnbfloatdec.o qcelp_lsp.o celp_math.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 Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Wed Feb 18 00:44:16 2009 (r4081) +++ amr/amrnbfloatdec.c Wed Feb 18 01:17:52 2009 (r4082) @@ -35,6 +35,7 @@ #include "bitstream.h" #include "libavutil/common.h" #include "internal.h" +#include "celp_math.h" #include "amrnbfloatdata.h" void ff_celp_lspf2lpc(const double *lspf, float *lpc); @@ -671,7 +672,7 @@ static float fixed_gain_prediction(float enum Mode mode) { int i; - float energy_pred = 0.0, energy_fixed_mean = 0.0; + float energy_pred = 0.0, energy_fixed_mean; // Calculate the predicted energy for(i=0; i<4; i++) { @@ -679,9 +680,7 @@ static float fixed_gain_prediction(float } // Calculate the mean fixed vector energy - for(i=0; i<AMR_SUBFRAME_SIZE; i++) { - energy_fixed_mean += fixed_vector[i]*fixed_vector[i]; - } + energy_fixed_mean = ff_dot_productf(fixed_vector, fixed_vector, AMR_SUBFRAME_SIZE); energy_fixed_mean = 10.0*log10f(energy_fixed_mean/(float)AMR_SUBFRAME_SIZE); // predicted fixed gain =

1 0