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

[soc]: r4110 - amr/amrnbfloatdec.c
by kmalaussene 22 Feb '09

22 Feb '09

Author: kmalaussene Date: Sun Feb 22 02:04:07 2009 New Revision: 4110 Log: Change decode_pitch_lag parameters list ot the needed variables, instead of passing the AMRContext. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Sun Feb 22 01:35:09 2009 (r4109) +++ amr/amrnbfloatdec.c Sun Feb 22 02:04:07 2009 (r4110) @@ -370,12 +370,13 @@ static void lsp2lpc(float *lsp, float *l * of the pitch lag for one subframe at 1/6 resolution for MODE_122, * 1/3 for other modes. * - * @param p pointer to the AMRContext + * @param lag_int pointer to the AMRContext * @param pitch_index parsed adaptive codebook (pitch) index * @param subframe current subframe */ -static void decode_pitch_lag(AMRContext *p, int pitch_index, int subframe) +static void decode_pitch_lag(int *lag_int, int *lag_frac, int pitch_index, const int prev_lag_int, + const int subframe, const enum Mode mode) { // find the search range int search_range_min = FFMAX(p->prev_pitch_lag_int - 5, p->cur_frame_mode == MODE_122 ? PITCH_LAG_MIN_MODE_122 : PITCH_LAG_MIN); @@ -387,54 +388,54 @@ static void decode_pitch_lag(AMRContext // subframe 1 or 3 if(!(subframe & 1)) { - if(p->cur_frame_mode == MODE_122) { + if(mode == MODE_122) { if(pitch_index < 463){ - p->pitch_lag_int = (pitch_index + 5)/6 + 17; - p->pitch_lag_frac = pitch_index - p->pitch_lag_int*6 + 105; + *lag_int = (pitch_index + 5)/6 + 17; + *lag_frac = pitch_index - *lag_int*6 + 105; }else { - p->pitch_lag_int = pitch_index - 368; - p->pitch_lag_frac = 0; + *lag_int = pitch_index - 368; + *lag_frac = 0; } }else if(pitch_index < 197) { // 10923>>15 is approximately 1/3 - p->pitch_lag_int = ( ((pitch_index + 2)*10923)>>15 ) + 19; - p->pitch_lag_frac = pitch_index - p->pitch_lag_int*3 + 58; + *lag_int = ( ((pitch_index + 2)*10923)>>15 ) + 19; + *lag_frac = pitch_index - *lag_int*3 + 58; }else { - p->pitch_lag_int = pitch_index - 112; - p->pitch_lag_frac = 0; + *lag_int = pitch_index - 112; + *lag_frac = 0; } // subframe 2 or 4 }else { - if(p->cur_frame_mode == MODE_122) { + if(mode == MODE_122) { int temp; // calculate the pitch lag temp = (pitch_index + 5)/6 - 1; - p->pitch_lag_int = temp + search_range_min; - p->pitch_lag_frac = pitch_index - temp*6 - 3; - }else if(p->cur_frame_mode <= MODE_67) { + *lag_int = temp + search_range_min; + *lag_frac = pitch_index - temp*6 - 3; + }else if(mode <= MODE_67) { // decoding with 4-bit resolution - int t1_temp = FFMAX(FFMIN(p->prev_pitch_lag_int, search_range_max-4), search_range_min+5); + int t1_temp = FFMAX(FFMIN(prev_lag_int, search_range_max-4), search_range_min+5); if(pitch_index < 4) { // integer only precision for [t1_temp-5, t1_temp-2] - p->pitch_lag_int = pitch_index + (t1_temp - 5); - p->pitch_lag_frac = 0; + *lag_int = pitch_index + (t1_temp - 5); + *lag_frac = 0; }else if(pitch_index < 12) { // 1/3 fractional precision for [t1_temp-1 2/3, t1_temp+2/3] - p->pitch_lag_int = ( ((pitch_index - 5)*10923)>>15 ) - 1; - p->pitch_lag_frac = pitch_index - p->pitch_lag_int*3 - 9; - p->pitch_lag_int += t1_temp; + *lag_int = ( ((pitch_index - 5)*10923)>>15 ) - 1; + *lag_frac = pitch_index - *lag_int*3 - 9; + *lag_int += t1_temp; }else { // integer only precision for [t1_temp+1, t1_temp+4] - p->pitch_lag_int = pitch_index + t1_temp - 11; - p->pitch_lag_frac = 0; + *lag_int = pitch_index + t1_temp - 11; + *lag_frac = 0; } }else { // decoding with 5 or 6 bit resolution, 1/3 fractional precision // 10923>>15 is approximately 1/3 int temp = ( ((pitch_index + 2)*10923)>>15 ) - 1; - p->pitch_lag_int = temp + search_range_min; - p->pitch_lag_frac = pitch_index - temp*3 - 2; + *lag_int = temp + search_range_min; + *lag_frac = pitch_index - temp*3 - 2; } } } @@ -487,7 +488,8 @@ static void decode_pitch_vector(AMRConte { // decode integer and fractional parts of pitch lag from parsed pitch // index - decode_pitch_lag(p, amr_subframe->p_lag, subframe); + decode_pitch_lag(&p->pitch_lag_int, &p->pitch_lag_frac, amr_subframe->p_lag, + p->prev_pitch_lag_int, subframe, p->cur_frame_mode); // interpolate the past excitation at the pitch lag to obtain the pitch // vector

1 0

[soc]: r4109 - amr/amrnbfloatdec.c
by kmalaussene 22 Feb '09

22 Feb '09

Author: kmalaussene Date: Sun Feb 22 01:35:09 2009 New Revision: 4109 Log: Replace multiple == || by 1 <=. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Sun Feb 22 01:30:41 2009 (r4108) +++ amr/amrnbfloatdec.c Sun Feb 22 01:35:09 2009 (r4109) @@ -411,8 +411,7 @@ static void decode_pitch_lag(AMRContext temp = (pitch_index + 5)/6 - 1; p->pitch_lag_int = temp + search_range_min; p->pitch_lag_frac = pitch_index - temp*6 - 3; - }else if( (p->cur_frame_mode == MODE_475) || (p->cur_frame_mode == MODE_515) || - (p->cur_frame_mode == MODE_59) || (p->cur_frame_mode == MODE_67) ) { + }else if(p->cur_frame_mode <= MODE_67) { // decoding with 4-bit resolution int t1_temp = FFMAX(FFMIN(p->prev_pitch_lag_int, search_range_max-4), search_range_min+5);

1 0

[soc]: r4108 - amr/amrnbfloatdec.c
by kmalaussene 22 Feb '09

22 Feb '09

Author: kmalaussene Date: Sun Feb 22 01:30:41 2009 New Revision: 4108 Log: Move search_range_* into decode_pitch_lag since it is the only place they are used. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Sun Feb 22 01:27:44 2009 (r4107) +++ amr/amrnbfloatdec.c Sun Feb 22 01:30:41 2009 (r4108) @@ -373,13 +373,18 @@ static void lsp2lpc(float *lsp, float *l * @param p pointer to the AMRContext * @param pitch_index parsed adaptive codebook (pitch) index * @param subframe current subframe - * @param search_range_min minimum pitch lag search range - * @param search_range_max maximum pitch lag search range */ -static void decode_pitch_lag(AMRContext *p, int pitch_index, int subframe, - const int search_range_min, const int search_range_max) +static void decode_pitch_lag(AMRContext *p, int pitch_index, int subframe) { + // find the search range + int search_range_min = FFMAX(p->prev_pitch_lag_int - 5, p->cur_frame_mode == MODE_122 ? PITCH_LAG_MIN_MODE_122 : PITCH_LAG_MIN); + int search_range_max = search_range_min + 9; + if(search_range_max > PITCH_LAG_MAX) { + search_range_max = PITCH_LAG_MAX; + search_range_min = search_range_max - 9; + } + // subframe 1 or 3 if(!(subframe & 1)) { if(p->cur_frame_mode == MODE_122) { @@ -481,17 +486,9 @@ static void interp_pitch_vector(float *p static void decode_pitch_vector(AMRContext *p, const AMRNBSubframe *amr_subframe, const int subframe) { - // find the search range - int search_range_min = FFMAX(p->prev_pitch_lag_int - 5, p->cur_frame_mode == MODE_122 ? PITCH_LAG_MIN_MODE_122 : PITCH_LAG_MIN); - int search_range_max = search_range_min + 9; - if(search_range_max > PITCH_LAG_MAX) { - search_range_max = PITCH_LAG_MAX; - search_range_min = search_range_max - 9; - } - // decode integer and fractional parts of pitch lag from parsed pitch // index - decode_pitch_lag(p, amr_subframe->p_lag, subframe, search_range_min, search_range_max); + decode_pitch_lag(p, amr_subframe->p_lag, subframe); // interpolate the past excitation at the pitch lag to obtain the pitch // vector

1 0

[soc]: r4107 - amr/amrnbfloatdec.c
by kmalaussene 22 Feb '09

22 Feb '09

Author: kmalaussene Date: Sun Feb 22 01:27:44 2009 New Revision: 4107 Log: Merge decode_pitch_lag_* into decode_pitch_lag. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Sun Feb 22 01:18:14 2009 (r4106) +++ amr/amrnbfloatdec.c Sun Feb 22 01:27:44 2009 (r4107) @@ -367,7 +367,8 @@ static void lsp2lpc(float *lsp, float *l /** * Decode the adaptive codebook index to the integer and fractional parts - * of the pitch lag for one subframe at 1/3 resolution. + * of the pitch lag for one subframe at 1/6 resolution for MODE_122, + * 1/3 for other modes. * * @param p pointer to the AMRContext * @param pitch_index parsed adaptive codebook (pitch) index @@ -376,12 +377,20 @@ static void lsp2lpc(float *lsp, float *l * @param search_range_max maximum pitch lag search range */ -static void decode_pitch_lag_3(AMRContext *p, int pitch_index, int subframe, +static void decode_pitch_lag(AMRContext *p, int pitch_index, int subframe, const int search_range_min, const int search_range_max) { // subframe 1 or 3 if(!(subframe & 1)) { - if(pitch_index < 197) { + if(p->cur_frame_mode == MODE_122) { + if(pitch_index < 463){ + p->pitch_lag_int = (pitch_index + 5)/6 + 17; + p->pitch_lag_frac = pitch_index - p->pitch_lag_int*6 + 105; + }else { + p->pitch_lag_int = pitch_index - 368; + p->pitch_lag_frac = 0; + } + }else if(pitch_index < 197) { // 10923>>15 is approximately 1/3 p->pitch_lag_int = ( ((pitch_index + 2)*10923)>>15 ) + 19; p->pitch_lag_frac = pitch_index - p->pitch_lag_int*3 + 58; @@ -391,7 +400,13 @@ static void decode_pitch_lag_3(AMRContex } // subframe 2 or 4 }else { - if( (p->cur_frame_mode == MODE_475) || (p->cur_frame_mode == MODE_515) || + if(p->cur_frame_mode == MODE_122) { + int temp; + // calculate the pitch lag + temp = (pitch_index + 5)/6 - 1; + p->pitch_lag_int = temp + search_range_min; + p->pitch_lag_frac = pitch_index - temp*6 - 3; + }else if( (p->cur_frame_mode == MODE_475) || (p->cur_frame_mode == MODE_515) || (p->cur_frame_mode == MODE_59) || (p->cur_frame_mode == MODE_67) ) { // decoding with 4-bit resolution int t1_temp = FFMAX(FFMIN(p->prev_pitch_lag_int, search_range_max-4), search_range_min+5); @@ -421,38 +436,6 @@ static void decode_pitch_lag_3(AMRContex } /** - * Decode the adaptive codebook index to the integer and fractional parts - * of the pitch lag for one subframe at 1/6 resolution. - * - * @param p pointer to the AMRContext - * @param pitch_index parsed adaptive codebook (pitch) index - * @param subframe current subframe - * @param search_range_min minimum pitch lag search range - */ - -static void decode_pitch_lag_6(AMRContext *p, int pitch_index, int subframe, - const int search_range_min) -{ - // subframe 1 or 3 - if(!(subframe & 1)) { - if(pitch_index < 463){ - p->pitch_lag_int = (pitch_index + 5)/6 + 17; - p->pitch_lag_frac = pitch_index - p->pitch_lag_int*6 + 105; - }else { - p->pitch_lag_int = pitch_index - 368; - p->pitch_lag_frac = 0; - } - // subframe 2 or 4 - }else { - int temp; - // calculate the pitch lag - temp = (pitch_index + 5)/6 - 1; - p->pitch_lag_int = temp + search_range_min; - p->pitch_lag_frac = pitch_index - temp*6 - 3; - } -} - -/** * Calculate the pitch vector by interpolating the past excitation at the pitch * pitch lag using a b60 hamming windowed sinc function. * @@ -508,11 +491,7 @@ static void decode_pitch_vector(AMRConte // decode integer and fractional parts of pitch lag from parsed pitch // index - if(p->cur_frame_mode == MODE_122) { - decode_pitch_lag_6(p, amr_subframe->p_lag, subframe, search_range_min); - }else { - decode_pitch_lag_3(p, amr_subframe->p_lag, subframe, search_range_min, search_range_max); - } + decode_pitch_lag(p, amr_subframe->p_lag, subframe, search_range_min, search_range_max); // interpolate the past excitation at the pitch lag to obtain the pitch // vector

1 0

[soc]: r4106 - amr/amrnbfloatdec.c
by kmalaussene 22 Feb '09

22 Feb '09

Author: kmalaussene Date: Sun Feb 22 01:18:14 2009 New Revision: 4106 Log: Move search_range_min and search_range_max out of the context into local variables. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Sun Feb 22 01:12:36 2009 (r4105) +++ amr/amrnbfloatdec.c Sun Feb 22 01:18:14 2009 (r4106) @@ -57,8 +57,6 @@ typedef struct AMRContext { float lpc[4][LP_FILTER_ORDER]; ///< lpc coefficient vectors for 4 subframes - int search_range_min; ///< minimum pitch lag search range - int search_range_max; ///< maximum pitch lag search range int pitch_lag_int; ///< integer part of pitch lag from current subframe int pitch_lag_frac; ///< fractional part of pitch lag from current subframe int prev_pitch_lag_int; ///< integer part of pitch lag from previous subframe @@ -374,9 +372,12 @@ static void lsp2lpc(float *lsp, float *l * @param p pointer to the AMRContext * @param pitch_index parsed adaptive codebook (pitch) index * @param subframe current subframe + * @param search_range_min minimum pitch lag search range + * @param search_range_max maximum pitch lag search range */ -static void decode_pitch_lag_3(AMRContext *p, int pitch_index, int subframe) +static void decode_pitch_lag_3(AMRContext *p, int pitch_index, int subframe, + const int search_range_min, const int search_range_max) { // subframe 1 or 3 if(!(subframe & 1)) { @@ -393,7 +394,7 @@ static void decode_pitch_lag_3(AMRContex if( (p->cur_frame_mode == MODE_475) || (p->cur_frame_mode == MODE_515) || (p->cur_frame_mode == MODE_59) || (p->cur_frame_mode == MODE_67) ) { // decoding with 4-bit resolution - int t1_temp = FFMAX(FFMIN(p->prev_pitch_lag_int, p->search_range_max-4), p->search_range_min+5); + int t1_temp = FFMAX(FFMIN(p->prev_pitch_lag_int, search_range_max-4), search_range_min+5); if(pitch_index < 4) { // integer only precision for [t1_temp-5, t1_temp-2] @@ -413,7 +414,7 @@ static void decode_pitch_lag_3(AMRContex // decoding with 5 or 6 bit resolution, 1/3 fractional precision // 10923>>15 is approximately 1/3 int temp = ( ((pitch_index + 2)*10923)>>15 ) - 1; - p->pitch_lag_int = temp + p->search_range_min; + p->pitch_lag_int = temp + search_range_min; p->pitch_lag_frac = pitch_index - temp*3 - 2; } } @@ -426,9 +427,11 @@ static void decode_pitch_lag_3(AMRContex * @param p pointer to the AMRContext * @param pitch_index parsed adaptive codebook (pitch) index * @param subframe current subframe + * @param search_range_min minimum pitch lag search range */ -static void decode_pitch_lag_6(AMRContext *p, int pitch_index, int subframe) +static void decode_pitch_lag_6(AMRContext *p, int pitch_index, int subframe, + const int search_range_min) { // subframe 1 or 3 if(!(subframe & 1)) { @@ -444,7 +447,7 @@ static void decode_pitch_lag_6(AMRContex int temp; // calculate the pitch lag temp = (pitch_index + 5)/6 - 1; - p->pitch_lag_int = temp + p->search_range_min; + p->pitch_lag_int = temp + search_range_min; p->pitch_lag_frac = pitch_index - temp*6 - 3; } } @@ -496,19 +499,19 @@ static void interp_pitch_vector(float *p static void decode_pitch_vector(AMRContext *p, const AMRNBSubframe *amr_subframe, const int subframe) { // find the search range - p->search_range_min = FFMAX(p->prev_pitch_lag_int - 5, p->cur_frame_mode == MODE_122 ? PITCH_LAG_MIN_MODE_122 : PITCH_LAG_MIN); - p->search_range_max = p->search_range_min + 9; - if(p->search_range_max > PITCH_LAG_MAX) { - p->search_range_max = PITCH_LAG_MAX; - p->search_range_min = p->search_range_max - 9; + int search_range_min = FFMAX(p->prev_pitch_lag_int - 5, p->cur_frame_mode == MODE_122 ? PITCH_LAG_MIN_MODE_122 : PITCH_LAG_MIN); + int search_range_max = search_range_min + 9; + if(search_range_max > PITCH_LAG_MAX) { + search_range_max = PITCH_LAG_MAX; + search_range_min = search_range_max - 9; } // decode integer and fractional parts of pitch lag from parsed pitch // index if(p->cur_frame_mode == MODE_122) { - decode_pitch_lag_6(p, amr_subframe->p_lag, subframe); + decode_pitch_lag_6(p, amr_subframe->p_lag, subframe, search_range_min); }else { - decode_pitch_lag_3(p, amr_subframe->p_lag, subframe); + decode_pitch_lag_3(p, amr_subframe->p_lag, subframe, search_range_min, search_range_max); } // interpolate the past excitation at the pitch lag to obtain the pitch

1 0

[soc]: r4105 - amr/amrnbfloatdec.c
by kmalaussene 22 Feb '09

22 Feb '09

Author: kmalaussene Date: Sun Feb 22 01:12:36 2009 New Revision: 4105 Log: Reindent after previous commit. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Sun Feb 22 01:11:14 2009 (r4104) +++ amr/amrnbfloatdec.c Sun Feb 22 01:12:36 2009 (r4105) @@ -495,25 +495,25 @@ static void interp_pitch_vector(float *p static void decode_pitch_vector(AMRContext *p, const AMRNBSubframe *amr_subframe, const int subframe) { - // find the search range - p->search_range_min = FFMAX(p->prev_pitch_lag_int - 5, p->cur_frame_mode == MODE_122 ? PITCH_LAG_MIN_MODE_122 : PITCH_LAG_MIN); - p->search_range_max = p->search_range_min + 9; - if(p->search_range_max > PITCH_LAG_MAX) { - p->search_range_max = PITCH_LAG_MAX; - p->search_range_min = p->search_range_max - 9; - } + // find the search range + p->search_range_min = FFMAX(p->prev_pitch_lag_int - 5, p->cur_frame_mode == MODE_122 ? PITCH_LAG_MIN_MODE_122 : PITCH_LAG_MIN); + p->search_range_max = p->search_range_min + 9; + if(p->search_range_max > PITCH_LAG_MAX) { + p->search_range_max = PITCH_LAG_MAX; + p->search_range_min = p->search_range_max - 9; + } - // decode integer and fractional parts of pitch lag from parsed pitch - // index - if(p->cur_frame_mode == MODE_122) { - decode_pitch_lag_6(p, amr_subframe->p_lag, subframe); - }else { - decode_pitch_lag_3(p, amr_subframe->p_lag, subframe); - } + // decode integer and fractional parts of pitch lag from parsed pitch + // index + if(p->cur_frame_mode == MODE_122) { + decode_pitch_lag_6(p, amr_subframe->p_lag, subframe); + }else { + decode_pitch_lag_3(p, amr_subframe->p_lag, subframe); + } - // interpolate the past excitation at the pitch lag to obtain the pitch - // vector - interp_pitch_vector(p->excitation, p->pitch_lag_int, p->pitch_lag_frac, p->cur_frame_mode); + // interpolate the past excitation at the pitch lag to obtain the pitch + // vector + interp_pitch_vector(p->excitation, p->pitch_lag_int, p->pitch_lag_frac, p->cur_frame_mode); } /// @}

1 0

[soc]: r4104 - amr/amrnbfloatdec.c
by kmalaussene 22 Feb '09

22 Feb '09

Author: kmalaussene Date: Sun Feb 22 01:11:14 2009 New Revision: 4104 Log: Move code decoding pitch_vector into its own function. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Sun Feb 22 00:46:08 2009 (r4103) +++ amr/amrnbfloatdec.c Sun Feb 22 01:11:14 2009 (r4104) @@ -493,6 +493,28 @@ static void interp_pitch_vector(float *p } } +static void decode_pitch_vector(AMRContext *p, const AMRNBSubframe *amr_subframe, const int subframe) +{ + // find the search range + p->search_range_min = FFMAX(p->prev_pitch_lag_int - 5, p->cur_frame_mode == MODE_122 ? PITCH_LAG_MIN_MODE_122 : PITCH_LAG_MIN); + p->search_range_max = p->search_range_min + 9; + if(p->search_range_max > PITCH_LAG_MAX) { + p->search_range_max = PITCH_LAG_MAX; + p->search_range_min = p->search_range_max - 9; + } + + // decode integer and fractional parts of pitch lag from parsed pitch + // index + if(p->cur_frame_mode == MODE_122) { + decode_pitch_lag_6(p, amr_subframe->p_lag, subframe); + }else { + decode_pitch_lag_3(p, amr_subframe->p_lag, subframe); + } + + // interpolate the past excitation at the pitch lag to obtain the pitch + // vector + interp_pitch_vector(p->excitation, p->pitch_lag_int, p->pitch_lag_frac, p->cur_frame_mode); +} /// @} @@ -929,26 +951,7 @@ static int amrnb_decode_frame(AVCodecCon for(subframe = 0; subframe < 4; subframe++) { const AMRNBSubframe *amr_subframe = &p->frame.subframe[subframe]; /*** adaptive code book (pitch) vector decoding ***/ - - // find the search range - p->search_range_min = FFMAX(p->prev_pitch_lag_int - 5, p->cur_frame_mode == MODE_122 ? PITCH_LAG_MIN_MODE_122 : PITCH_LAG_MIN); - p->search_range_max = p->search_range_min + 9; - if(p->search_range_max > PITCH_LAG_MAX) { - p->search_range_max = PITCH_LAG_MAX; - p->search_range_min = p->search_range_max - 9; - } - - // decode integer and fractional parts of pitch lag from parsed pitch - // index - if(p->cur_frame_mode == MODE_122) { - decode_pitch_lag_6(p, amr_subframe->p_lag, subframe); - }else { - decode_pitch_lag_3(p, amr_subframe->p_lag, subframe); - } - - // interpolate the past excitation at the pitch lag to obtain the pitch - // vector - interp_pitch_vector(p->excitation, p->pitch_lag_int, p->pitch_lag_frac, p->cur_frame_mode); + decode_pitch_vector(p, amr_subframe, subframe); /*** end of adaptive code book (pitch) vector decoding ***/

1 0

[soc]: r4103 - amr/amrnbfloatdec.c
by kmalaussene 21 Feb '09

21 Feb '09

Author: kmalaussene Date: Sun Feb 22 00:46:08 2009 New Revision: 4103 Log: Fix interp_pitch_vector according to reference code by . using one buffer that holds the previous and current state of the filter. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Fri Feb 20 03:51:19 2009 (r4102) +++ amr/amrnbfloatdec.c Sun Feb 22 00:46:08 2009 (r4103) @@ -453,16 +453,15 @@ static void decode_pitch_lag_6(AMRContex * Calculate the pitch vector by interpolating the past excitation at the pitch * pitch lag using a b60 hamming windowed sinc function. * - * @param prev_excitation pointer to the element after the previous excitations + * @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 - * @param pitch_vector pointer to the pitch vector */ -static void interp_pitch_vector(float *prev_excitation, int lag_int, - int lag_frac, enum Mode mode, - float *pitch_vector) +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; @@ -480,7 +479,7 @@ static void interp_pitch_vector(float *p b60_idx1 = &b60[ lag_frac]; b60_idx2 = &b60[6 - lag_frac]; - exc_idx = &prev_excitation[-lag_int]; + exc_idx = &pitch_vector[-lag_int]; for(n=0; n<AMR_SUBFRAME_SIZE; n++) { pitch_vector[n] = 0.0; @@ -949,7 +948,7 @@ static int amrnb_decode_frame(AVCodecCon // interpolate the past excitation at the pitch lag to obtain the pitch // vector - interp_pitch_vector(p->excitation, p->pitch_lag_int, p->pitch_lag_frac, p->cur_frame_mode, p->pitch_vector); + interp_pitch_vector(p->excitation, p->pitch_lag_int, p->pitch_lag_frac, p->cur_frame_mode); /*** end of adaptive code book (pitch) vector decoding ***/

1 0

[soc]: r4102 - amr/amrnbfloatdec.c
by kmalaussene 20 Feb '09

20 Feb '09

Author: kmalaussene Date: Fri Feb 20 03:51:19 2009 New Revision: 4102 Log: Replace sizeof(float) by more robust sizeof(*lsf_r). Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Fri Feb 20 02:26:31 2009 (r4101) +++ amr/amrnbfloatdec.c Fri Feb 20 03:51:19 2009 (r4102) @@ -319,20 +319,20 @@ static void lsf2lsp_3(AMRContext *p) int i; lsf_quantizer = (p->cur_frame_mode == MODE_795 ? lsf_3_1_MODE_795 : lsf_3_1)[lsf_param[0]]; - memcpy(lsf_r, lsf_quantizer, 3*sizeof(float)); + memcpy(lsf_r, lsf_quantizer, 3*sizeof(*lsf_r)); lsf_quantizer = lsf_3_2[lsf_param[1] << (p->cur_frame_mode <= MODE_515)]; - memcpy(lsf_r + 3, lsf_quantizer, 3*sizeof(float)); + memcpy(lsf_r + 3, lsf_quantizer, 3*sizeof(*lsf_r)); lsf_quantizer = (p->cur_frame_mode <= MODE_515 ? lsf_3_3_MODE_515 : lsf_3_3)[lsf_param[2]]; - memcpy(lsf_r + 6, lsf_quantizer, 4*sizeof(float)); + memcpy(lsf_r + 6, lsf_quantizer, 4*sizeof(*lsf_r)); // calculate mean-removed LSF vector and add mean for(i=0; i<LP_FILTER_ORDER; i++) { lsf_q[i] = lsf_r[i] + p->prev_lsf_r[i]*pred_fac[i] + lsf_3_mean[i]; } // update residual LSF vector from previous subframe - memcpy(p->prev_lsf_r, lsf_r, LP_FILTER_ORDER*sizeof(float)); + memcpy(p->prev_lsf_r, lsf_r, LP_FILTER_ORDER*sizeof(*lsf_r)); // convert LSF vector to LSP vector lsf2lsp(lsf_q, p->lsp[3]);

1 0

[soc]: r4101 - amr/amrnbfloatdata.h
by kmalaussene 20 Feb '09

20 Feb '09

Author: kmalaussene Date: Fri Feb 20 02:26:31 2009 New Revision: 4101 Log: Add includes to pass make checkheaders. Modified: amr/amrnbfloatdata.h Modified: amr/amrnbfloatdata.h ============================================================================== --- amr/amrnbfloatdata.h Thu Feb 19 22:50:48 2009 (r4100) +++ amr/amrnbfloatdata.h Fri Feb 20 02:26:31 2009 (r4101) @@ -29,8 +29,11 @@ #define AVCODEC_AMRNBFLOATDATA_H #include <stdint.h> +#include <stddef.h> #include <math.h> +#include "libavutil/common.h" + // general definitions #define AMR_BLOCK_SIZE 160 #define AMR_SUBFRAME_SIZE 40

1 0