[soc]: r4841 - in als: als_data.h alsdec.c
Author: thilo.borgmann Date: Thu Jul 30 01:07:08 2009 New Revision: 4841 Log: Removed unnecessary parantheses. Added an #endif comment. Changed to include stdint.h instead of inttypes.h. Fixed broken comment. Modified: als/als_data.h als/alsdec.c Modified: als/als_data.h ============================================================================== --- als/als_data.h Thu Jul 30 00:22:36 2009 (r4840) +++ als/als_data.h Thu Jul 30 01:07:08 2009 (r4841) @@ -30,11 +30,11 @@ #define AVCODEC_ALS_DATA_H -#include <inttypes.h> +#include <stdint.h> /** Rice parameters and corresponding index offsets for decoding the * indices of scaled PARCOR values. The table choosen is set globally - * by the encoder and. + * by the encoder and stored in ALSSpecificConfig. */ int8_t parcor_rice_table[3][20][2] = { { @@ -144,4 +144,4 @@ int32_t parcor_scaled_values[] = {-10485 935456, 967456, 999712, 1032224}; -#endif +#endif AVCODEC_ALS_DATA_H Modified: als/alsdec.c ============================================================================== --- als/alsdec.c Thu Jul 30 00:22:36 2009 (r4840) +++ als/alsdec.c Thu Jul 30 01:07:08 2009 (r4841) @@ -350,9 +350,8 @@ static void all_parcor_to_lpc(unsigned i { int k; - for (k = 0; k < num; k++) { + for (k = 0; k < num; k++) parcor_to_lpc(k, par, cof); - } } @@ -560,9 +559,8 @@ static int read_block_data(ALSDecContext for (smp = 0; smp < progressive; smp++) { y = 1 << 19; - for (sb = 0; sb < smp; sb++) { + for (sb = 0; sb < smp; sb++) y += lpc_cof[sb] * raw_samples[smp - (sb + 1)]; - } raw_samples[smp] = res[smp] - (y >> 20); parcor_to_lpc(smp, quant_cof, lpc_cof); @@ -571,9 +569,8 @@ static int read_block_data(ALSDecContext for (; smp < block_length; smp++) { y = 1 << 19; - for (sb = 0; sb < progressive; sb++) { + for (sb = 0; sb < progressive; sb++) y += lpc_cof[sb] * raw_samples[smp - (sb + 1)]; - } raw_samples[smp] = res[smp] - (y >> 20); }
On Thu, Jul 30, 2009 at 01:07:08AM +0200, thilo.borgmann wrote:
--- als/als_data.h Thu Jul 30 00:22:36 2009 (r4840) +++ als/als_data.h Thu Jul 30 01:07:08 2009 (r4841) @@ -144,4 +144,4 @@ int32_t parcor_scaled_values[] = {-10485
-#endif +#endif AVCODEC_ALS_DATA_H
This probably compiles, but you should still surround the comment by /* */ for consistency with the rest of FFmpeg. Diego
On Thu, Jul 30, 2009 at 01:07:08AM +0200, thilo.borgmann wrote:
--- als/als_data.h Thu Jul 30 00:22:36 2009 (r4840) +++ als/als_data.h Thu Jul 30 01:07:08 2009 (r4841) @@ -144,4 +144,4 @@ int32_t parcor_scaled_values[] = {-10485
-#endif +#endif AVCODEC_ALS_DATA_H
This probably compiles, but you should still surround the comment by /* */ for consistency with the rest of FFmpeg.
Done. Thilo
participants (3)
-
Diego Biurrun -
Thilo Borgmann -
thilo.borgmann