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

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

am 47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers" 

* commit '47b56c5a46287ea226c05e3c0238a91f4702491a':
  stagefright aacenc: Add const declarations to some pointers
parents db7670ab aa1639ae

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

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ typedef struct{ 


  Word16 sfbCnt;

  Word16 sfbActive;   /* number of sf bands containing energy after lowpass */

  Word16 *sfbOffset;

  const Word16 *sfbOffset;



  Word32 sfbThresholdQuiet[MAX_SFB_LONG];
@@ -61,7 +61,7 @@ typedef struct{ 


  Word16 sfbCnt;

  Word16 sfbActive;   /* number of sf bands containing energy after lowpass */

  Word16 *sfbOffset;

  const Word16 *sfbOffset;



  Word32 sfbThresholdQuiet[MAX_SFB_SHORT];

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

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ noiselessCounter(SECTION_DATA *sectionData, 
                 const Word32 blockType)

{

  Word32 grpNdx, i;

  Word16 *sideInfoTab = NULL;

  const Word16 *sideInfoTab = NULL;

  SECTION_INFO *sectionInfo;



  /*

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

+2 −2
Original line number Diff line number Diff line
@@ -99,8 +99,8 @@ void BuildInterface(Word32 *groupedMdctSpectrum, 
    Word32 i;

    Word32 accuSumMS=0;

    Word32 accuSumLR=0;

	Word32 *pSumMS = sfbEnergySumMS.sfbShort;

	Word32 *pSumLR = sfbEnergySumLR.sfbShort;

    const Word32 *pSumMS = sfbEnergySumMS.sfbShort;

    const Word32 *pSumLR = sfbEnergySumLR.sfbShort;



    for (i=TRANS_FAC; i; i--) {

      accuSumLR = L_add(accuSumLR, *pSumLR); pSumLR++;

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

+2 −2
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static Word16 BarcLineValue(Word16 noOfLines, Word16 fftLine, Word32 samplingFre 
*

*****************************************************************************/

static void initThrQuiet(Word16  numPb,

                         Word16 *pbOffset,

                         const Word16 *pbOffset,

                         Word16 *pbBarcVal,

                         Word32 *pbThresholdQuiet) {

  Word16 i;
@@ -250,7 +250,7 @@ static void initSpreading(Word16 numPb, 
*

*****************************************************************************/

static void initBarcValues(Word16  numPb,

                           Word16 *pbOffset,

                           const Word16 *pbOffset,

                           Word16  numLines,

                           Word32  samplingFrequency,

                           Word16 *pbBval)

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

+2 −1
Original line number Diff line number Diff line
@@ -658,7 +658,8 @@ static Word16 advancePsychShort(PSY_DATA* psyData, 
  Word32 normEnergyShift = (psyData->mdctScale + 1) << 1; /* in reference code, mdct spectrum must be multipied with 2, so +1 */

  Word32 clipEnergy = hPsyConfShort->clipEnergy >> normEnergyShift;

  Word32 wOffset = 0;

  Word32 *data0, *data1;

  Word32 *data0;

  const Word32 *data1;



  for(w = 0; w < TRANS_FAC; w++) {

    Word32 i, tdata;