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

[soc]: r4081 - amr/amrnbfloatdec.c
by kmalaussene 17 Feb '09

17 Feb '09

Author: kmalaussene Date: Wed Feb 18 00:44:16 2009 New Revision: 4081 Log: Fix previous commit r4080: code was updating a const variable. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Wed Feb 18 00:39:26 2009 (r4080) +++ amr/amrnbfloatdec.c Wed Feb 18 00:44:16 2009 (r4081) @@ -589,9 +589,8 @@ static void decode_10_pulses_35bits(cons const int pos1 = gray_decode[fixed_index[i ] & 7]*TRACKS + i; const int pos2 = gray_decode[fixed_index[i+5] & 7]*TRACKS + i; const float sign = (fixed_index[i] & 8) ? -1.0 : 1.0; - fixed_vector[pos1] = sign; - if(pos2 < pos1) sign = -sign; - fixed_vector[pos2] += sign; + fixed_vector[pos1] = sign; + fixed_vector[pos2] += pos2 < pos1 ? -sign : sign; } }

1 0

[soc]: r4080 - amr/amrnbfloatdec.c
by kmalaussene 17 Feb '09

17 Feb '09

Author: kmalaussene Date: Wed Feb 18 00:39:26 2009 New Revision: 4080 Log: Cleanup : move variables declaration within the loop and make them const. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Wed Feb 18 00:29:59 2009 (r4079) +++ amr/amrnbfloatdec.c Wed Feb 18 00:39:26 2009 (r4080) @@ -529,8 +529,7 @@ static void reconstruct_fixed_vector(int static void decode_8_pulses_31bits(const int16_t *fixed_index, float *fixed_vector) { int pulse_position[8]; - int i, pos1, pos2, temp; - float sign; + int i, temp; // decode pulse positions // coded using 7+3 bits with the 3 LSBs being, individually, the LSB of 1 of @@ -562,9 +561,9 @@ static void decode_8_pulses_31bits(const // reconstruct the fixed code for(i=0; i<TRACKS_MODE_102; i++) { - pos1 = (pulse_position[i] << 2) + i; - pos2 = (pulse_position[i+4] << 2) + i; - sign = fixed_index[i] ? -1.0 : 1.0; + const int pos1 = (pulse_position[i] << 2) + i; + const int pos2 = (pulse_position[i+4] << 2) + i; + const float sign = fixed_index[i] ? -1.0 : 1.0; fixed_vector[pos1] = sign; fixed_vector[pos2] += pos2 < pos1 ? -sign : sign; } @@ -582,15 +581,14 @@ static void decode_8_pulses_31bits(const static void decode_10_pulses_35bits(const int16_t *fixed_index, float *fixed_vector) { - int i, pos1, pos2; - float sign; + int i; memset(fixed_vector, 0, AMR_SUBFRAME_SIZE*sizeof(float)); for(i=0; i<TRACKS; i++) { - pos1 = gray_decode[fixed_index[i ] & 7]*TRACKS + i; - sign = (fixed_index[i] & 8) ? -1.0 : 1.0; - pos2 = gray_decode[fixed_index[i+5] & 7]*TRACKS + i; + const int pos1 = gray_decode[fixed_index[i ] & 7]*TRACKS + i; + const int pos2 = gray_decode[fixed_index[i+5] & 7]*TRACKS + i; + const float sign = (fixed_index[i] & 8) ? -1.0 : 1.0; fixed_vector[pos1] = sign; if(pos2 < pos1) sign = -sign; fixed_vector[pos2] += sign;

1 0

[soc]: r4079 - amr/amrnbfloatdec.c
by kmalaussene 17 Feb '09

17 Feb '09

Author: kmalaussene Date: Wed Feb 18 00:29:59 2009 New Revision: 4079 Log: Remove pointless cast, noticed by Dark_Shikari on IRC. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Tue Feb 17 21:16:09 2009 (r4078) +++ amr/amrnbfloatdec.c Wed Feb 18 00:29:59 2009 (r4079) @@ -529,7 +529,8 @@ static void reconstruct_fixed_vector(int static void decode_8_pulses_31bits(const int16_t *fixed_index, float *fixed_vector) { int pulse_position[8]; - int i, pos1, pos2, sign, temp; + int i, pos1, pos2, temp; + float sign; // decode pulse positions // coded using 7+3 bits with the 3 LSBs being, individually, the LSB of 1 of @@ -581,7 +582,8 @@ static void decode_8_pulses_31bits(const static void decode_10_pulses_35bits(const int16_t *fixed_index, float *fixed_vector) { - int i, pos1, pos2, sign; + int i, pos1, pos2; + float sign; memset(fixed_vector, 0, AMR_SUBFRAME_SIZE*sizeof(float));

1 0

[soc]: r4072 - amr/amrnbfloatdec.c
by kmalaussene 17 Feb '09

17 Feb '09

Author: kmalaussene Date: Tue Feb 17 19:49:03 2009 New Revision: 4072 Log: Cosmetics: remove interlaced and redundant comments. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Tue Feb 17 19:45:52 2009 (r4071) +++ amr/amrnbfloatdec.c Tue Feb 17 19:49:03 2009 (r4072) @@ -634,50 +634,30 @@ static void decode_fixed_vector(float *f if(mode <= MODE_515) { pulse_nb = 2; - // pulse subset is the msb (bit 7) of the 7-bits used to code the 2 pulses pulse_subset = (fixed_index & 0x40)>>6; - // first pulse position is coded in bits 1-3 pulse_position[0] = ( fixed_index & 7)*5 + track_position[ (pulse_subset<<3) + (subframe<<1) ]; - // second pulse position is coded in bits 4-6 pulse_position[1] = ((fixed_index >> 3) & 7)*5 + track_position[ (pulse_subset<<3) + (subframe<<1) + 1 ]; }else if(mode == MODE_59) { pulse_nb = 2; - // pulse subset for the first pulse is the lsb (bit 1) of the 9-bits used - // to code the 2 pulses pulse_subset = fixed_index & 1; - // first pulse position is coded in bits 2-4 pulse_position[0] = ((fixed_index >> 1) & 7)*5 + (pulse_subset<<1) + 1; - // pulse subset for the second pulse is coded in bits 5-6 pulse_subset = (fixed_index >> 4) & 3; - // second pulse position is coded in bits 7-9 pulse_position[1] = ((fixed_index >> 6) & 7)*5 + pulse_subset + (pulse_subset == 3 ? 1 : 0); }else if(mode == MODE_67) { pulse_nb = 3; - // first pulse position is coded in bits 1-3 pulse_position[0] = ( fixed_index & 7)*5; - // pulse subset for the second pulse is coded in bit 4 pulse_subset = (fixed_index >> 3) & 1; - // second pulse position is coded in bits 5-7 pulse_position[1] = ((fixed_index >> 4) & 7)*5 + (pulse_subset<<1) + 1; - // pulse subset for the second pulse is coded in bit 8 pulse_subset = (fixed_index >> 7) & 1; - // third pulse position is coded in bits 9-11 pulse_position[2] = ((fixed_index >> 8) & 7)*5 + (pulse_subset<<1) + 2; }else { // mode <= MODE_795 pulse_nb = 4; - // first pulse position is Gray coded in bits 1-3 pulse_position[0] = gray_decode[ fixed_index & 7]*5; - // second pulse position is Gray coded in bits 4-6 pulse_position[1] = gray_decode[(fixed_index >> 3) & 7]*5 + 1; - // third pulse position is Gray coded in bits 7-9 pulse_position[2] = gray_decode[(fixed_index >> 6) & 7]*5 + 2; - // pulse subset for the fourth pulse is coded in bit 10 pulse_subset = (fixed_index >> 9) & 1; - // third pulse position is Gray coded in bits 11-13 pulse_position[3] = gray_decode[(fixed_index >> 10) & 7]*5 + pulse_subset + 3; } - - // reconstruct the fixed code reconstruct_fixed_vector(pulse_position, sign, pulse_nb, fixed_vector); } }

3 2

[soc] [propchange]: r4072 - svn:log
by kmalaussene 17 Feb '09

17 Feb '09

Author: kmalaussene Revision: 4072 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -Cosmetics: remove interlaced and redundant comments. +Cosmetics: remove interleaved and redundant comments.

1 0

[soc] [propchange]: r4077 - svn:log
by diego 17 Feb '09

17 Feb '09

Author: diego Revision: 4077 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -Cosmetics: replace if by (?:), and remove redudant comments. +Cosmetics: replace if by (?:), and remove redundant comments.

1 0

[soc]: r4078 - amr/amrnbfloatdec.c
by kmalaussene 17 Feb '09

17 Feb '09

Author: kmalaussene Date: Tue Feb 17 21:16:09 2009 New Revision: 4078 Log: Cleanup comment in decode_10_pulses_35bits. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Tue Feb 17 21:12:27 2009 (r4077) +++ amr/amrnbfloatdec.c Tue Feb 17 21:16:09 2009 (r4078) @@ -573,6 +573,8 @@ static void decode_8_pulses_31bits(const * Decode the algebraic codebook index to pulse positions and signs and * construct the algebraic codebook vector for MODE_122. * + * @note: The positions and signs are explicitly coded in MODE_122. + * * @param fixed_index positions of the ten pulses * @param fixed_vector pointer to the algebraic codebook vector */ @@ -581,21 +583,14 @@ static void decode_10_pulses_35bits(cons { int i, pos1, pos2, sign; - // reset the code memset(fixed_vector, 0, AMR_SUBFRAME_SIZE*sizeof(float)); - // the positions and signs are explicitly coded in MODE_122 - - // reconstruct the fixed code for(i=0; i<TRACKS; i++) { - pos1 = gray_decode[fixed_index[i ] & 7]*TRACKS + i; // ith pulse position - sign = (fixed_index[i] & 8) ? -1.0 : 1.0; // sign of ith pulse - pos2 = gray_decode[fixed_index[i+5] & 7]*TRACKS + i; // i+5th pulse position - // assign the ith pulse (+/-1) to its appropriate position + pos1 = gray_decode[fixed_index[i ] & 7]*TRACKS + i; + sign = (fixed_index[i] & 8) ? -1.0 : 1.0; + pos2 = gray_decode[fixed_index[i+5] & 7]*TRACKS + i; fixed_vector[pos1] = sign; - // sign of i+5th pulse is relative to sign of ith pulse if(pos2 < pos1) sign = -sign; - // assign the i+5th pulse (+/-1) to its appropriate position fixed_vector[pos2] += sign; } }

1 0

[soc]: r4077 - amr/amrnbfloatdec.c
by kmalaussene 17 Feb '09

17 Feb '09

Author: kmalaussene Date: Tue Feb 17 21:12:27 2009 New Revision: 4077 Log: Cosmetics: replace if by (?:), and remove redudant comments. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Tue Feb 17 20:40:24 2009 (r4076) +++ amr/amrnbfloatdec.c Tue Feb 17 21:12:27 2009 (r4077) @@ -561,15 +561,11 @@ static void decode_8_pulses_31bits(const // reconstruct the fixed code for(i=0; i<TRACKS_MODE_102; i++) { - pos1 = (pulse_position[i] << 2) + i; // ith pulse position - pos2 = (pulse_position[i+4] << 2) + i; // i+4th pulse position - sign = fixed_index[i] ? -1.0 : 1.0; // sign of ith pulse - // assign the ith pulse (+/-1) to its appropriate position - fixed_vector[pos1] = sign; - // sign of i+4th pulse is relative to sign of ith pulse - if(pos2 < pos1) sign = -sign; - // assign the i+4th pulse (+/-1) to its appropriate position - fixed_vector[pos2] += sign; + pos1 = (pulse_position[i] << 2) + i; + pos2 = (pulse_position[i+4] << 2) + i; + sign = fixed_index[i] ? -1.0 : 1.0; + fixed_vector[pos1] = sign; + fixed_vector[pos2] += pos2 < pos1 ? -sign : sign; } }

1 0

[soc]: r4069 - amr/amrnbfloatdec.c
by kmalaussene 17 Feb '09

17 Feb '09

Author: kmalaussene Date: Tue Feb 17 19:38:26 2009 New Revision: 4069 Log: Include libavcodec/internal.h to remove compiler warning: implicit declaration of function 'ff_log_missing_feature'. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Tue Feb 17 19:36:03 2009 (r4068) +++ amr/amrnbfloatdec.c Tue Feb 17 19:38:26 2009 (r4069) @@ -34,6 +34,7 @@ #include "avcodec.h" #include "bitstream.h" #include "libavutil/common.h" +#include "libavcodec/internal.h" #include "amrnbfloatdata.h" void ff_celp_lspf2lpc(const double *lspf, float *lpc);

3 2

[soc]: r4076 - amr/amrnbfloatdec.c
by kmalaussene 17 Feb '09

17 Feb '09

Author: kmalaussene Date: Tue Feb 17 20:40:24 2009 New Revision: 4076 Log: No need for libavcodec/ prefix on include as both files are in the same directory. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Tue Feb 17 20:30:24 2009 (r4075) +++ amr/amrnbfloatdec.c Tue Feb 17 20:40:24 2009 (r4076) @@ -34,7 +34,7 @@ #include "avcodec.h" #include "bitstream.h" #include "libavutil/common.h" -#include "libavcodec/internal.h" +#include "internal.h" #include "amrnbfloatdata.h" void ff_celp_lspf2lpc(const double *lspf, float *lpc);

1 0