diff options
| author | Martin Storsjo <martin@martin.st> | 2011-06-23 18:21:23 +0300 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2012-02-27 21:35:48 +0200 |
| commit | f27422a71112e77af77de0da2e60d4deb94a9375 (patch) | |
| tree | 635e39ea2ef5cc62ddf044dac0445ddbd2f40a9e /media/libstagefright/codecs/amrwb | |
| parent | fbaf72b701316c8050d73690ff387e62f724f216 (diff) | |
| download | frameworks_av-f27422a71112e77af77de0da2e60d4deb94a9375.zip frameworks_av-f27422a71112e77af77de0da2e60d4deb94a9375.tar.gz frameworks_av-f27422a71112e77af77de0da2e60d4deb94a9375.tar.bz2 | |
stagefright amr: Avoid C++/C99 for loops with variable declaration
This makes the code compileable in C89 mode, too.
Change-Id: I9b76f8bfca148d1aec6081b8db139f351d64cfed
Diffstat (limited to 'media/libstagefright/codecs/amrwb')
| -rw-r--r-- | media/libstagefright/codecs/amrwb/src/get_amr_wb_bits.cpp | 3 | ||||
| -rw-r--r-- | media/libstagefright/codecs/amrwb/src/oversamp_12k8_to_16k.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/media/libstagefright/codecs/amrwb/src/get_amr_wb_bits.cpp b/media/libstagefright/codecs/amrwb/src/get_amr_wb_bits.cpp index d7287f3..b325e8f 100644 --- 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 index 143c26e..ea5769a 100644 --- 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 */ |