diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-09-10 11:30:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-10 11:30:18 -0700 |
| commit | e0f8517eac5dbd4e25aa61fff66c76a42d8fbefc (patch) | |
| tree | 1d6fa86960b1c51be823ec21768bf009d492ae4a /media/libstagefright/codecs | |
| parent | 61c0cc6af2c64d280bcfc1fcca3e3589172a5817 (diff) | |
| parent | f755a506335df3bfb32c062096deceaf045044ed (diff) | |
| download | frameworks_av-e0f8517eac5dbd4e25aa61fff66c76a42d8fbefc.zip frameworks_av-e0f8517eac5dbd4e25aa61fff66c76a42d8fbefc.tar.gz frameworks_av-e0f8517eac5dbd4e25aa61fff66c76a42d8fbefc.tar.bz2 | |
am f755a506: am d81be6d6: Merge "aacenc: Mark some global arrays const"
* commit 'f755a506335df3bfb32c062096deceaf045044ed':
aacenc: Mark some global arrays const
Diffstat (limited to 'media/libstagefright/codecs')
| -rw-r--r-- | media/libstagefright/codecs/aacenc/inc/aac_rom.h | 2 | ||||
| -rw-r--r-- | media/libstagefright/codecs/aacenc/src/aac_rom.c | 2 | ||||
| -rw-r--r-- | media/libstagefright/codecs/aacenc/src/block_switch.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/media/libstagefright/codecs/aacenc/inc/aac_rom.h b/media/libstagefright/codecs/aacenc/inc/aac_rom.h index 8e206b7..0b6f656 100644 --- a/media/libstagefright/codecs/aacenc/inc/aac_rom.h +++ b/media/libstagefright/codecs/aacenc/inc/aac_rom.h @@ -57,7 +57,7 @@ extern const Word32 mTab_4_3[512]; /*! $2^{-\frac{n}{16}}$ table */ extern const Word16 pow2tominusNover16[17] ; -extern Word32 specExpMantTableComb_enc[4][14]; +extern const Word32 specExpMantTableComb_enc[4][14]; extern const UWord8 specExpTableComb_enc[4][14]; extern const Word16 quantBorders[4][4]; diff --git a/media/libstagefright/codecs/aacenc/src/aac_rom.c b/media/libstagefright/codecs/aacenc/src/aac_rom.c index 127322d..f08f3a9 100644 --- a/media/libstagefright/codecs/aacenc/src/aac_rom.c +++ b/media/libstagefright/codecs/aacenc/src/aac_rom.c @@ -1367,7 +1367,7 @@ const Word16 sideInfoTabShort[MAX_SFB_SHORT + 1] = { 10, 10, 10, 10, 10, 13, 13 }; -Word32 specExpMantTableComb_enc[4][14] = +const Word32 specExpMantTableComb_enc[4][14] = { {0x40000000, 0x50a28be6, 0x6597fa95, 0x40000000, 0x50a28be6, 0x6597fa95, 0x40000000, 0x50a28be6, diff --git a/media/libstagefright/codecs/aacenc/src/block_switch.c b/media/libstagefright/codecs/aacenc/src/block_switch.c index 47fd15e..c80538f 100644 --- a/media/libstagefright/codecs/aacenc/src/block_switch.c +++ b/media/libstagefright/codecs/aacenc/src/block_switch.c @@ -51,7 +51,7 @@ CalcWindowEnergy(BLOCK_SWITCHING_CONTROL *blockSwitchingControl, /* IIR high pass coeffs */ -Word32 hiPassCoeff[BLOCK_SWITCHING_IIR_LEN] = { +const Word32 hiPassCoeff[BLOCK_SWITCHING_IIR_LEN] = { 0xbec8b439, 0x609d4952 /* -0.5095f, 0.7548f */ }; |