Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'f881fa517978adc7ea610a1982e0d071f1fd3425':
  stagefright amr: Avoid C++/C99 for loops with variable declaration
This commit is contained in:
Jean-Baptiste Queru
2012-02-27 16:57:06 -08:00
committed by Android Git Automerger
parent 015a248e63 f881fa5179
commit f016dc1bd7
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
media/libstagefright/codecs/amrnb/enc/src/ton_stab.cpp
View File

@@ -791,7 +791,8 @@ void update_gp_clipping(tonStabState *st, /* i/o : State struct */
) )
{ {
OSCL_UNUSED_ARG(pOverflow); 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]; st->gp[i] = st->gp[i+1];
} }

3
media/libstagefright/codecs/amrwb/src/get_amr_wb_bits.cpp
View File

@@ -119,8 +119,9 @@ int16 Serial_parm( /* Return the parameter */
) )
{ {
int16 value = 0; 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; value <<= 2;

4
media/libstagefright/codecs/amrwb/src/oversamp_12k8_to_16k.cpp
View File

@@ -240,11 +240,11 @@ void AmrWbUp_samp(
{ {
int32 i; int32 i;
int16 frac; int16 frac, j;
int16 * pt_sig_u = sig_u; int16 * pt_sig_u = sig_u;
frac = 1; 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 */ i = ((int32)j * INV_FAC5) >> 13; /* integer part = pos * 1/5 */