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

[soc]: r4044 - amr/amrnbfloatdec.c
by kmalaussene 11 Feb '09

11 Feb '09

Author: kmalaussene Date: Wed Feb 11 10:08:30 2009 New Revision: 4044 Log: More factoring out of lsf2lsp_5 by decoding one LSP vector at a time. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Wed Feb 11 08:45:09 2009 (r4043) +++ amr/amrnbfloatdec.c Wed Feb 11 10:08:30 2009 (r4044) @@ -226,13 +226,48 @@ static void lsf2lsp(float *lsf, float *l /** * Decode a set of 5 split-matrix quantized lsf indexes into an lsp vector. * + * @param p the context + * @param lsp output LSP vector + * @param prev_lsf previous LSF vector + * @param lsf_quantizer pointers to LSF dictionary tables + * @param quantizer_offset offset in tables + * @param sign for the 3 dictionary table + * @param update_prev_lsf_r update the prev_lsf_r in the context if true + */ +static void lsf2lsp_for_mode122(AMRContext *p, float lsp[LP_FILTER_ORDER], + const float prev_lsf[LP_FILTER_ORDER], + const float *lsf_quantizer[5], const int quantizer_offset, + const int sign, const int update_prev_lsf_r) +{ + float lsf[LP_FILTER_ORDER]; + int i; + + for(i=0; i<LP_FILTER_ORDER>>1; i++) + memcpy(&lsf[2*i], &lsf_quantizer[i][quantizer_offset], 2*sizeof(float)); + + if(sign) { + lsf[4] *= -1; + lsf[5] *= -1; + } + + if(update_prev_lsf_r) + memcpy(p->prev_lsf_r, lsf, LP_FILTER_ORDER*sizeof(float)); + + for(i=0; i<LP_FILTER_ORDER; i++) + lsf[i] += prev_lsf[i]; + + lsf2lsp(lsf, lsp); +} + +/** + * Decode a set of 5 split-matrix quantized lsf indexes into 2 lsp vectors. + * * @param p pointer to the AMRContext */ static void lsf2lsp_5(AMRContext *p) { - float lsf_r[2][LP_FILTER_ORDER]; // residual LSF vectors - float lsf_q[2][LP_FILTER_ORDER]; // quantified LSF vectors + float prev_lsf[LP_FILTER_ORDER]; // previous quantized LSF vectors const float *lsf_quantizer[5]; int i; @@ -242,31 +277,11 @@ static void lsf2lsp_5(AMRContext *p) lsf_quantizer[3] = lsf_5_4[p->amr_prms[3]]; lsf_quantizer[4] = lsf_5_5[p->amr_prms[4]]; - for(i=0; i<5; i++) { - memcpy(&lsf_r[0][2*i], &lsf_quantizer[i][0], 2*sizeof(float)); - memcpy(&lsf_r[1][2*i], &lsf_quantizer[i][2], 2*sizeof(float)); - } - - // the 1st bit of p->amr_prms[2] is the sign bit - if (p->amr_prms[2] & 1) { - lsf_r[0][4] *= -1; - lsf_r[0][5] *= -1; - lsf_r[1][4] *= -1; - lsf_r[1][5] *= -1; - } - - // calculate mean-removed LSF vectors and add mean - for(i=0; i<LP_FILTER_ORDER; i++) { - float temp = p->prev_lsf_r[i]*PRED_FAC_MODE_122 + lsf_5_mean[i]; - lsf_q[0][i] = lsf_r[0][i] + temp; - lsf_q[1][i] = lsf_r[1][i] + temp; - } - // update residual LSF vector from previous subframe - memcpy(p->prev_lsf_r, lsf_r[1], LP_FILTER_ORDER*sizeof(float)); + for(i=0; i<LP_FILTER_ORDER;i++) + prev_lsf[i] = p->prev_lsf_r[i]*PRED_FAC_MODE_122 + lsf_5_mean[i]; - // convert LSF vectors to LSP vectors - lsf2lsp(lsf_q[0], p->lsp[1]); - lsf2lsp(lsf_q[1], p->lsp[3]); + lsf2lsp_for_mode122(p, p->lsp[1], prev_lsf, lsf_quantizer, 0, p->amr_prms[2] & 1, 0); + lsf2lsp_for_mode122(p, p->lsp[3], prev_lsf, lsf_quantizer, 2, p->amr_prms[2] & 1, 1); } /**

1 0

[soc]: r4043 - amr/amrnbfloatdec.c
by kmalaussene 11 Feb '09

11 Feb '09

Author: kmalaussene Date: Wed Feb 11 08:45:09 2009 New Revision: 4043 Log: Factor out code in lsf2lsp_5. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Wed Feb 11 04:45:28 2009 (r4042) +++ amr/amrnbfloatdec.c Wed Feb 11 08:45:09 2009 (r4043) @@ -233,42 +233,27 @@ static void lsf2lsp_5(AMRContext *p) { float lsf_r[2][LP_FILTER_ORDER]; // residual LSF vectors float lsf_q[2][LP_FILTER_ORDER]; // quantified LSF vectors - float sign; - int i, idx; - - // decode split-matrix quantized residual LSF vectors - - idx = p->amr_prms[0]; - lsf_r[0][0] = lsf_5_1[ idx ][0]; - lsf_r[0][1] = lsf_5_1[ idx ][1]; - lsf_r[1][0] = lsf_5_1[ idx ][2]; - lsf_r[1][1] = lsf_5_1[ idx ][3]; - - idx = p->amr_prms[1]; - lsf_r[0][2] = lsf_5_2[ idx ][0]; - lsf_r[0][3] = lsf_5_2[ idx ][1]; - lsf_r[1][2] = lsf_5_2[ idx ][2]; - lsf_r[1][3] = lsf_5_2[ idx ][3]; + const float *lsf_quantizer[5]; + int i; - // lsb of p->amr_prms[2] is the sign bit - sign = (p->amr_prms[2] & 1) ? -1.0 : 1.0; - idx = p->amr_prms[2]>>1; - lsf_r[0][4] = lsf_5_3[ idx ][0]*sign; - lsf_r[0][5] = lsf_5_3[ idx ][1]*sign; - lsf_r[1][4] = lsf_5_3[ idx ][2]*sign; - lsf_r[1][5] = lsf_5_3[ idx ][3]*sign; + lsf_quantizer[0] = lsf_5_1[p->amr_prms[0]]; + lsf_quantizer[1] = lsf_5_2[p->amr_prms[1]]; + lsf_quantizer[2] = lsf_5_3[p->amr_prms[2] >> 1]; + lsf_quantizer[3] = lsf_5_4[p->amr_prms[3]]; + lsf_quantizer[4] = lsf_5_5[p->amr_prms[4]]; - idx = p->amr_prms[3]; - lsf_r[0][6] = lsf_5_4[ idx ][0]; - lsf_r[0][7] = lsf_5_4[ idx ][1]; - lsf_r[1][6] = lsf_5_4[ idx ][2]; - lsf_r[1][7] = lsf_5_4[ idx ][3]; + for(i=0; i<5; i++) { + memcpy(&lsf_r[0][2*i], &lsf_quantizer[i][0], 2*sizeof(float)); + memcpy(&lsf_r[1][2*i], &lsf_quantizer[i][2], 2*sizeof(float)); + } - idx = p->amr_prms[4]; - lsf_r[0][8] = lsf_5_5[ idx ][0]; - lsf_r[0][9] = lsf_5_5[ idx ][1]; - lsf_r[1][8] = lsf_5_5[ idx ][2]; - lsf_r[1][9] = lsf_5_5[ idx ][3]; + // the 1st bit of p->amr_prms[2] is the sign bit + if (p->amr_prms[2] & 1) { + lsf_r[0][4] *= -1; + lsf_r[0][5] *= -1; + lsf_r[1][4] *= -1; + lsf_r[1][5] *= -1; + } // calculate mean-removed LSF vectors and add mean for(i=0; i<LP_FILTER_ORDER; i++) {

1 0

[soc]: r4042 - amr/amrnbfloatdec.c
by kmalaussene 11 Feb '09

11 Feb '09

Author: kmalaussene Date: Wed Feb 11 04:45:28 2009 New Revision: 4042 Log: Fix decoding of lsp for mode other than MODE_122 to match reference implementation. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Wed Feb 11 04:43:23 2009 (r4041) +++ amr/amrnbfloatdec.c Wed Feb 11 04:45:28 2009 (r4042) @@ -326,6 +326,7 @@ static void lsf2lsp_3(AMRContext *p) lsf_r[4] = lsf_3_2[ idx ][1]; lsf_r[5] = lsf_3_2[ idx ][2]; + idx = p->amr_prms[2] << 2; lsf_r[6] = lsf_3_3_tmp[ idx ][0]; lsf_r[7] = lsf_3_3_tmp[ idx ][1]; lsf_r[8] = lsf_3_3_tmp[ idx ][2];

1 0

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

11 Feb '09

Author: kmalaussene Date: Wed Feb 11 04:43:23 2009 New Revision: 4041 Log: Fix typo: lsf_3_3_MODE_795 -> lsf_3_1_MODE_795 because it is paired with table lsf_3_1. Modified: amr/amrnbfloatdata.h amr/amrnbfloatdec.c Modified: amr/amrnbfloatdata.h ============================================================================== --- amr/amrnbfloatdata.h Wed Feb 11 00:53:33 2009 (r4040) +++ amr/amrnbfloatdata.h Wed Feb 11 04:43:23 2009 (r4041) @@ -1023,7 +1023,7 @@ static const float lsf_3_3_MODE_515[128] { 46.6309 , -4.15039 , -132.813 , -56.3965 }, {-375.977 , -132.813 , -219.971 , -216.309 }, }; -static const float lsf_3_3_MODE_795[512][3] = { +static const float lsf_3_1_MODE_795[512][3] = { {-217.285 , -378.418 , -620.361 }, {-199.951 , -236.816 , 42.7246 }, {-201.660 , -301.270 , -186.035 }, {-146.240 , -5.37109 , 154.785 }, {-197.998 , -240.967 , -220.215 }, { -78.8574 , 49.5605 , 6.34766 }, Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Wed Feb 11 00:53:33 2009 (r4040) +++ amr/amrnbfloatdec.c Wed Feb 11 04:43:23 2009 (r4041) @@ -302,7 +302,7 @@ static void lsf2lsp_3(AMRContext *p) lsf_3_1_tmp = lsf_3_1; lsf_3_3_tmp = lsf_3_3_MODE_515; }else if(p->cur_frame_mode == MODE_795) { - lsf_3_1_tmp = lsf_3_3_MODE_795; + lsf_3_1_tmp = lsf_3_1_MODE_795; lsf_3_3_tmp = lsf_3_3; }else { lsf_3_1_tmp = lsf_3_1;

1 0

[soc]: r4040 - amr/amrnbdec.c dirac/libavcodec/diracdec.c dirac/libavcodec/diracenc.c
by diego 10 Feb '09

10 Feb '09

Author: diego Date: Wed Feb 11 00:53:33 2009 New Revision: 4040 Log: Add av_cold attribute to _init and _end functions. Modified: amr/amrnbdec.c dirac/libavcodec/diracdec.c dirac/libavcodec/diracenc.c Modified: amr/amrnbdec.c ============================================================================== --- amr/amrnbdec.c Tue Feb 10 23:57:29 2009 (r4039) +++ amr/amrnbdec.c Wed Feb 11 00:53:33 2009 (r4040) @@ -76,7 +76,7 @@ typedef struct AMRContext { } AMRContext; -static int amrnb_decode_init(AVCodecContext *avctx) +static av_cold int amrnb_decode_init(AVCodecContext *avctx) { AMRContext *p = avctx->priv_data; Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c Tue Feb 10 23:57:29 2009 (r4039) +++ dirac/libavcodec/diracdec.c Wed Feb 11 00:53:33 2009 (r4040) @@ -90,7 +90,7 @@ static av_cold int decode_init(AVCodecCo return 0; } -static int decode_end(AVCodecContext *avctx) +static av_cold int decode_end(AVCodecContext *avctx) { DiracContext *s = avctx->priv_data; Modified: dirac/libavcodec/diracenc.c ============================================================================== --- dirac/libavcodec/diracenc.c Tue Feb 10 23:57:29 2009 (r4039) +++ dirac/libavcodec/diracenc.c Wed Feb 11 00:53:33 2009 (r4040) @@ -53,7 +53,7 @@ static av_cold int encode_init(AVCodecCo return 0; } -static int encode_end(AVCodecContext *avctx) +static av_cold int encode_end(AVCodecContext *avctx) { DiracContext *s = avctx->priv_data;

1 0

[soc]: r4039 - amr/amrnbfloatdata.h
by kmalaussene 10 Feb '09

10 Feb '09

Author: kmalaussene Date: Tue Feb 10 23:57:29 2009 New Revision: 4039 Log: Use FF_ARRAY_ELEMS instead of harcoding the number of elements in order_MODE_*. Modified: amr/amrnbfloatdata.h Modified: amr/amrnbfloatdata.h ============================================================================== --- amr/amrnbfloatdata.h Tue Feb 10 23:32:12 2009 (r4038) +++ amr/amrnbfloatdata.h Tue Feb 10 23:57:29 2009 (r4039) @@ -50,19 +50,6 @@ enum Mode { N_MODES // number of modes }; -// number of bits for each mode -static const uint8_t mode_bits[N_MODES] = { - 95, // MODE_475 - 103, // MODE_515 - 118, // MODE_59 - 134, // MODE_67 - 148, // MODE_74 - 159, // MODE_795 - 204, // MODE_102 - 244, // MODE_122 - 35 // MODE_DTX -}; - // declaration of received frame types enum RXFrameType { RX_SPEECH_GOOD = 0, @@ -287,6 +274,19 @@ static const AMROrder order_MODE_DTX[35] { 4, 2}, { 4, 1}, { 4, 0} }; +// number of bits for each mode +static const uint8_t mode_bits[N_MODES] = { + FF_ARRAY_ELEMS(order_MODE_475), + FF_ARRAY_ELEMS(order_MODE_515), + FF_ARRAY_ELEMS(order_MODE_59), + FF_ARRAY_ELEMS(order_MODE_67), + FF_ARRAY_ELEMS(order_MODE_74), + FF_ARRAY_ELEMS(order_MODE_795), + FF_ARRAY_ELEMS(order_MODE_102), + FF_ARRAY_ELEMS(order_MODE_122), + FF_ARRAY_ELEMS(order_MODE_DTX) +}; + /** * Initialize values for the lsp vector from the 4th subframe of the

1 0

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

10 Feb '09

Author: kmalaussene Date: Tue Feb 10 23:32:12 2009 New Revision: 4038 Log: Simplify reset_state function by using and packing the init values in tables. Modified: amr/amrnbfloatdata.h amr/amrnbfloatdec.c Modified: amr/amrnbfloatdata.h ============================================================================== --- amr/amrnbfloatdata.h Tue Feb 10 22:45:21 2009 (r4037) +++ amr/amrnbfloatdata.h Tue Feb 10 23:32:12 2009 (r4038) @@ -288,6 +288,23 @@ static const AMROrder order_MODE_DTX[35] }; +/** + * Initialize values for the lsp vector from the 4th subframe of the + * previous subframe values. + * + * @note: Taken from Decoder_amr_reset in Q15 using val/1000 + */ + static const int8_t lsp_sub4_init[LP_FILTER_ORDER] = { 30, 26, 21, 15, 8, 0, -8, -15, -21, -26 }; + +/** + * Initialize mean lsp values. + * + * @note: Taken from Decoder_amr_reset in Q15 + */ + static const int16_t lsp_avg_init[LP_FILTER_ORDER] = { + 1384, 2077, 3420, 5108, 6742, 8122, 9863, 11092, 12714, 13701 +}; + // LSF tables static const float lsf_3_1[256][3] = { Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Tue Feb 10 22:45:21 2009 (r4037) +++ amr/amrnbfloatdec.c Tue Feb 10 23:32:12 2009 (r4038) @@ -87,32 +87,10 @@ static void reset_state(AMRContext *p) { int i; - // Initialize values for the lsp vector from the 4th subframe of the - // previous subframe values. - // Taken from Decoder_amr_reset using val/(float)(1<<15). - p->prev_lsp_sub4[0] = 0.91552734375; - p->prev_lsp_sub4[1] = 0.79345703125; - p->prev_lsp_sub4[2] = 0.640869140625; - p->prev_lsp_sub4[3] = 0.457763671875; - p->prev_lsp_sub4[4] = 0.244140625; - p->prev_lsp_sub4[5] = 0.0; - p->prev_lsp_sub4[6] = -0.244140625; - p->prev_lsp_sub4[7] = -0.457763671875; - p->prev_lsp_sub4[8] = -0.640869140625; - p->prev_lsp_sub4[9] = -0.79345703125; - - // Initialize mean lsp values. - // Taken from Decoder_amr_reset using val/(float)(1<<15). - p->lsp_avg[0] = 0.042236328125; - p->lsp_avg[1] = 0.063385009765625; - p->lsp_avg[2] = 0.1043701171875; - p->lsp_avg[3] = 0.1558837890625; - p->lsp_avg[4] = 0.20574951171875; - p->lsp_avg[5] = 0.24786376953125; - p->lsp_avg[6] = 0.300994873046875; - p->lsp_avg[7] = 0.3385009765625; - p->lsp_avg[8] = 0.38800048828125; - p->lsp_avg[9] = 0.418121337890625; + for(i=0; i<LP_FILTER_ORDER; i++) { + p->prev_lsp_sub4[i] = lsp_sub4_init[i] * 1000 / (float)(1 << 15); + p->lsp_avg[i] = lsp_avg_init[i] / (float)(1 << 15); + } for(i=0; i<4; i++) { p->prediction_error[i] = MIN_ENERGY;

1 0

[soc]: r4037 - amr/amrnbfloatdec.c
by kmalaussene 10 Feb '09

10 Feb '09

Author: kmalaussene Date: Tue Feb 10 22:45:21 2009 New Revision: 4037 Log: Fix compiler warning in medianf: "passing argument 4 of ‘qsort’ from incompatible pointer type". Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Tue Feb 10 22:18:18 2009 (r4036) +++ amr/amrnbfloatdec.c Tue Feb 10 22:45:21 2009 (r4037) @@ -824,9 +824,9 @@ static float fixed_gain_prediction(float * @return a-b : the result of the comparison */ -int qsort_compare(const float *a, const float *b) +int qsort_compare(const void *a, const void *b) { - float diff = *a - *b; + float diff = *(const float *)a - *(const float *)b; if(diff > 0.0f) return 1; if(diff < 0.0f)

1 0

[soc]: r4036 - amr/amrnbfloatdec.c
by kmalaussene 10 Feb '09

10 Feb '09

Author: kmalaussene Date: Tue Feb 10 22:18:18 2009 New Revision: 4036 Log: Fix compiler warning on amrnb_decode_frame: "initialization from incompatible pointer type". Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Tue Feb 10 22:12:57 2009 (r4035) +++ amr/amrnbfloatdec.c Tue Feb 10 22:18:18 2009 (r4036) @@ -145,7 +145,7 @@ static av_cold int amrnb_decode_init(AVC * @return the frame mode */ -enum Mode decode_bitstream(AMRContext *p, uint8_t *buf, int buf_size, +enum Mode decode_bitstream(AMRContext *p, const uint8_t *buf, int buf_size, enum Mode *speech_mode) { enum Mode mode; @@ -1009,7 +1009,7 @@ static void update_state(AMRContext *p) static int amrnb_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - uint8_t *buf, int buf_size) + const uint8_t *buf, int buf_size) { AMRContext *p = avctx->priv_data; // pointer to private data

1 0

[soc]: r4035 - amr/amrnbfloatdec.c
by kmalaussene 10 Feb '09

10 Feb '09

Author: kmalaussene Date: Tue Feb 10 22:12:57 2009 New Revision: 4035 Log: Remove empty amrnb_decode_close function. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Tue Feb 10 21:59:18 2009 (r4034) +++ amr/amrnbfloatdec.c Tue Feb 10 22:12:57 2009 (r4035) @@ -1262,22 +1262,12 @@ static int amrnb_decode_frame(AVCodecCon } -static int amrnb_decode_close(AVCodecContext *avctx) -{ - AMRContext *p = avctx->priv_data; - - /* return 0 if everything is OK, -1 if not */ - return 0; -} - - AVCodec amrnb_decoder = { .name = "amrnb", .type = CODEC_TYPE_AUDIO, .id = CODEC_ID_AMR_NB, .priv_data_size = sizeof(AMRContext), .init = amrnb_decode_init, - .close = amrnb_decode_close, .decode = amrnb_decode_frame, .long_name = NULL_IF_CONFIG_SMALL("Adaptive Multi-Rate NarrowBand"), };

1 0