Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"

Jean-Baptiste Queru · android code review · commit f881fa517978 · 2012-02-27T16:23:19.000-08:00
diff --git a/media/libstagefright/codecs/amrnb/enc/src/ton_stab.cpp b/media/libstagefright/codecs/amrnb/enc/src/ton_stab.cpp
@@ -791,7 +791,8 @@ void update_gp_clipping(tonStabState *st, /* i/o : State struct            */
                        )
 {
     OSCL_UNUSED_ARG(pOverflow);
-    for (int i = 0; i < N_FRAME - 1; i++)
+    int i;
+    for (i = 0; i < N_FRAME - 1; i++)
     {
         st->gp[i] = st->gp[i+1];
     }
diff --git a/media/libstagefright/codecs/amrwb/src/get_amr_wb_bits.cpp b/media/libstagefright/codecs/amrwb/src/get_amr_wb_bits.cpp
@@ -119,8 +119,9 @@ int16 Serial_parm(                        /* Return the parameter    */
 )
 {
     int16 value = 0;
+    int16 i;
 
-    for (int16 i = no_of_bits >> 1; i != 0; i--)
+    for (i = no_of_bits >> 1; i != 0; i--)
     {
         value <<= 2;
 
diff --git a/media/libstagefright/codecs/amrwb/src/oversamp_12k8_to_16k.cpp b/media/libstagefright/codecs/amrwb/src/oversamp_12k8_to_16k.cpp
@@ -240,11 +240,11 @@ void AmrWbUp_samp(
 {
 
     int32 i;
-    int16 frac;
+    int16 frac, j;
     int16 * pt_sig_u = sig_u;
 
     frac = 1;
-    for (int16 j = 0; j < L_frame; j++)
+    for (j = 0; j < L_frame; j++)
     {
         i = ((int32)j * INV_FAC5) >> 13;       /* integer part = pos * 1/5 */
 

Original file line number	Diff line number	Diff line change
`@@ -791,7 +791,8 @@ void update_gp_clipping(tonStabState st, / i/o : State struct */`
`791`	`791`	`)`
`792`	`792`	`{`
`793`	`793`	`OSCL_UNUSED_ARG(pOverflow);`
`794`		`- for (int i = 0; i < N_FRAME - 1; i++)`
	`794`	`+ int i;`
	`795`	`+ for (i = 0; i < N_FRAME - 1; i++)`
`795`	`796`	`{`
`796`	`797`	`st->gp[i] = st->gp[i+1];`
`797`	`798`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,8 +119,9 @@ int16 Serial_parm( /* Return the parameter */`
`119`	`119`	`)`
`120`	`120`	`{`
`121`	`121`	`int16 value = 0;`
	`122`	`+ int16 i;`
`122`	`123`
`123`		`- for (int16 i = no_of_bits >> 1; i != 0; i--)`
	`124`	`+ for (i = no_of_bits >> 1; i != 0; i--)`
`124`	`125`	`{`
`125`	`126`	`value <<= 2;`
`126`	`127`
Original file line number	Diff line number	Diff line change
`@@ -240,11 +240,11 @@ void AmrWbUp_samp(`
`240`	`240`	`{`
`241`	`241`
`242`	`242`	`int32 i;`
`243`		`- int16 frac;`
	`243`	`+ int16 frac, j;`
`244`	`244`	`int16 * pt_sig_u = sig_u;`
`245`	`245`
`246`	`246`	`frac = 1;`
`247`		`- for (int16 j = 0; j < L_frame; j++)`
	`247`	`+ for (j = 0; j < L_frame; j++)`
`248`	`248`	`{`
`249`	`249`	`i = ((int32)j * INV_FAC5) >> 13; /* integer part = pos * 1/5 */`
`250`	`250`