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

[cmcq]

Author: cmcq
Date: Mon Aug  3 21:04:09 2009
New Revision: 4921

Log:
Brackets around #defines

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

Modified: amr/amrnbdata.h
==============================================================================
--- amr/amrnbdata.h	Mon Aug  3 20:50:47 2009	(r4920)
+++ amr/amrnbdata.h	Mon Aug  3 21:04:09 2009	(r4921)
@@ -2025,8 +2025,8 @@ static const float pred_fac[LP_FILTER_OR
 };
 
 #define PRED_FAC_MODE_122 0.65
-#define FREQ_LSP_FAC      2.0*M_PI/8000.0
-#define FREQ_LSF          1/8000.0
+#define FREQ_LSP_FAC      (2.0*M_PI/8000.0)
+#define FREQ_LSF          (1/8000.0)
 #define MIN_LSF_SPACING   50.0488
 
 
@@ -2068,7 +2068,7 @@ static const uint8_t gray_decode[8] = { 
 
 // gain tables
 
-#define MIN_ENERGY -14.0
+#define MIN_ENERGY (-14.0)
 
 // scalar quantized pitch gain table for 7.95 and 12.2 kbps modes
 static const float qua_gain_pit[16] = {

Modified: amr/amrnbdec.c
==============================================================================
--- amr/amrnbdec.c	Mon Aug  3 20:50:47 2009	(r4920)
+++ amr/amrnbdec.c	Mon Aug  3 21:04:09 2009	(r4921)
@@ -202,7 +202,7 @@ static void interpolate_lsf(float lsf_q[
 
     for (i = 0; i < 4; i++)
         ff_weighted_vector_sumf(lsf_q[i], lsf_q[3], lsf_new,
-                                0.25 * (3 - i), 0.25 * (i + 1) / FREQ_LSF,
+                                0.25 * (3 - i), 0.25 * (i + 1) * FREQ_LSF,
                                 LP_FILTER_ORDER);
 }