[FFmpeg-soc] [soc]: r4861 - amr/amrnbdec.c

[cmcq]

Author: cmcq
Date: Fri Jul 31 14:50:49 2009
New Revision: 4861

Log:
Cosmetics: use consistent naming, use K&R, better spelling, use AMR_BLOCK_SIZE

Modified:
   amr/amrnbdec.c

Modified: amr/amrnbdec.c
==============================================================================
--- amr/amrnbdec.c	Fri Jul 31 14:47:55 2009	(r4860)
+++ amr/amrnbdec.c	Fri Jul 31 14:50:49 2009	(r4861)
@@ -216,7 +216,8 @@ static void interpolate_lsf(float lsf_q[
  * Omitting this step creates audible distortion on the sinusoidal sweep
  * test vectors in 3GPP TS 26.074.
  */
-static void adjust_lsfs(float *m) {
+static void adjust_lsf(float *m)
+{
     int i;
     float tmp=0.0;
     for (i = 0; i < LP_FILTER_ORDER; i++)
@@ -258,7 +259,7 @@ static void lsf2lsp_for_mode122(AMRConte
     for (i = 0; i < LP_FILTER_ORDER; i++)
         lsf[i] += prev_lsf[i];
 
-    adjust_lsfs(lsf);
+    adjust_lsf(lsf);
 
     // store LSF vector for fixed gain smoothing
     if (update_prev_lsf_r)
@@ -322,7 +323,7 @@ static void lsf2lsp_3(AMRContext *p)
     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];
 
-    adjust_lsfs(lsf_q);
+    adjust_lsf(lsf_q);
 
     // store LSF vector for fixed gain smoothing
     interpolate_lsf(p->lsf_q, lsf_q);
@@ -1114,7 +1115,7 @@ static int amrnb_decode_frame(AVCodecCon
     float fixed_gain_factor;
     float exc_feedback[AMR_SUBFRAME_SIZE];
     float fixed_vector[AMR_SUBFRAME_SIZE];   // algebraic code book (fixed) vector
-    float spare_vector[AMR_SUBFRAME_SIZE];   // extra stack space to hold result from anti-spareness processing
+    float spare_vector[AMR_SUBFRAME_SIZE];   // extra stack space to hold result from anti-sparseness processing
     float synth_fixed_gain;                  // the fixed gain that synthesis should use
     float *synth_fixed_vector;               // pointer to the fixed vector that synthesis should use
 
@@ -1187,7 +1188,7 @@ static int amrnb_decode_frame(AVCodecCon
         update_state(p);
     }
 
-    ff_acelp_high_pass_filterf(buf_out, p->high_pass_mem, 160);
+    ff_acelp_high_pass_filterf(buf_out, p->high_pass_mem, AMR_BLOCK_SIZE);
 
     for (i = 0; i < AMR_BLOCK_SIZE; i++)
         // Post-processing up-scales by 2. It's convenient to