Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f755a506 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am d81be6d6: Merge "aacenc: Mark some global arrays const" 

* commit 'd81be6d6':
  aacenc: Mark some global arrays const
parents e7c992c6 d81be6d6

media/libstagefright/codecs/aacenc/inc/aac_rom.h

+1 −1
Original line number Diff line number Diff line
@@ -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];

media/libstagefright/codecs/aacenc/src/aac_rom.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

media/libstagefright/codecs/aacenc/src/block_switch.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

};