[FFmpeg-soc] [soc]: r5562 - in amr: amrnbdata.h amrnbdec.c

[vitor]

Author: vitor
Date: Sun Jan  3 19:12:49 2010
New Revision: 5562

Log:
Misc cosmetics

Modified:
   amr/amrnbdata.h
   amr/amrnbdec.c

Modified: amr/amrnbdata.h
==============================================================================
--- amr/amrnbdata.h	Sun Jan  3 19:06:33 2010	(r5561)
+++ amr/amrnbdata.h	Sun Jan  3 19:12:49 2010	(r5562)
@@ -47,7 +47,7 @@
  * Fundamentally, this scale is determined by energy_mean through
  * the fixed vector contribution to the excitation vector.
  */
-#define AMR_SAMPLE_SCALE  (2.0/32768.0)
+#define AMR_SAMPLE_SCALE  (2.0 / 32768.0)
 
 
 /** Frame type (Table 1a in 3GPP TS 26.101) */
@@ -1527,9 +1527,9 @@ static const float pred_fac[LP_FILTER_OR
 /** Prediction factor for 12.2kbit/s mode */
 #define PRED_FAC_MODE_12k2             0.65
 
-#define LSF_R_FAC          (8000.0/32768.0) ///< LSF residual tables to Hertz
-#define MIN_LSF_SPACING             50.0488 ///< Ensures stability of LPC filter
-#define PITCH_LAG_MIN_MODE_12k2          18 ///< Lower bound on decoded lag search in 12.2kbit/s mode
+#define LSF_R_FAC          (8000.0 / 32768.0) ///< LSF residual tables to Hertz
+#define MIN_LSF_SPACING             50.0488   ///< Ensures stability of LPC filter
+#define PITCH_LAG_MIN_MODE_12k2          18   ///< Lower bound on decoded lag search in 12.2kbit/s mode
 
 
 // fixed tables

Modified: amr/amrnbdec.c
==============================================================================
--- amr/amrnbdec.c	Sun Jan  3 19:06:33 2010	(r5561)
+++ amr/amrnbdec.c	Sun Jan  3 19:12:49 2010	(r5562)
@@ -99,13 +99,13 @@ typedef struct AMRContext {
 } AMRContext;
 
 /** Double version of ff_weighted_vector_sumf() */
-static void weighted_vector_sumd(double *out, const double *in_a, const double *in_b,
-                          double weight_coeff_a, double weight_coeff_b,
-                          int length)
+static void weighted_vector_sumd(double *out, const double *in_a,
+                                 const double *in_b, double weight_coeff_a,
+                                 double weight_coeff_b, int length)
 {
     int i;
 
-    for(i=0; i<length; i++)
+    for(i = 0; i < length; i++)
         out[i] = weight_coeff_a * in_a[i]
                + weight_coeff_b * in_b[i];
 }
@@ -1005,7 +1005,7 @@ static int amrnb_decode_frame(AVCodecCon
 
     for (i = 0; i < AMR_BLOCK_SIZE; i++)
         buf_out[i] = av_clipf(buf_out[i] * AMR_SAMPLE_SCALE,
-                              -1.0, 32767.0/32768.0);
+                              -1.0, 32767.0 / 32768.0);
 
     /* Update averaged lsf vector (used for fixed gain smoothing).
      *