Skip to content

Commit 4054856

Browse files
committed
stagefright aacenc: Add const declarations to some pointers
This avoids some compilation warnings. Change-Id: Ia89ab94020a9f1ee4c1df48823fb89325cca7d36
1 parent b4cee0f commit 4054856

File tree

6 files changed

+11
-10
lines changed

6 files changed

+11
-10
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ typedef struct{
3131

3232
Word16 sfbCnt;
3333
Word16 sfbActive; /* number of sf bands containing energy after lowpass */
34-
Word16 *sfbOffset;
34+
const Word16 *sfbOffset;
3535

3636
Word32 sfbThresholdQuiet[MAX_SFB_LONG];
3737

@@ -61,7 +61,7 @@ typedef struct{
6161

6262
Word16 sfbCnt;
6363
Word16 sfbActive; /* number of sf bands containing energy after lowpass */
64-
Word16 *sfbOffset;
64+
const Word16 *sfbOffset;
6565

6666
Word32 sfbThresholdQuiet[MAX_SFB_SHORT];
6767

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ noiselessCounter(SECTION_DATA *sectionData,
281281
const Word32 blockType)
282282
{
283283
Word32 grpNdx, i;
284-
Word16 *sideInfoTab = NULL;
284+
const Word16 *sideInfoTab = NULL;
285285
SECTION_INFO *sectionInfo;
286286

287287
/*

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ void BuildInterface(Word32 *groupedMdctSpectrum,
9999
Word32 i;
100100
Word32 accuSumMS=0;
101101
Word32 accuSumLR=0;
102-
Word32 *pSumMS = sfbEnergySumMS.sfbShort;
103-
Word32 *pSumLR = sfbEnergySumLR.sfbShort;
102+
const Word32 *pSumMS = sfbEnergySumMS.sfbShort;
103+
const Word32 *pSumLR = sfbEnergySumLR.sfbShort;
104104

105105
for (i=TRANS_FAC; i; i--) {
106106
accuSumLR = L_add(accuSumLR, *pSumLR); pSumLR++;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ static Word16 BarcLineValue(Word16 noOfLines, Word16 fftLine, Word32 samplingFre
139139
*
140140
*****************************************************************************/
141141
static void initThrQuiet(Word16 numPb,
142-
Word16 *pbOffset,
142+
const Word16 *pbOffset,
143143
Word16 *pbBarcVal,
144144
Word32 *pbThresholdQuiet) {
145145
Word16 i;
@@ -250,7 +250,7 @@ static void initSpreading(Word16 numPb,
250250
*
251251
*****************************************************************************/
252252
static void initBarcValues(Word16 numPb,
253-
Word16 *pbOffset,
253+
const Word16 *pbOffset,
254254
Word16 numLines,
255255
Word32 samplingFrequency,
256256
Word16 *pbBval)

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,8 @@ static Word16 advancePsychShort(PSY_DATA* psyData,
658658
Word32 normEnergyShift = (psyData->mdctScale + 1) << 1; /* in reference code, mdct spectrum must be multipied with 2, so +1 */
659659
Word32 clipEnergy = hPsyConfShort->clipEnergy >> normEnergyShift;
660660
Word32 wOffset = 0;
661-
Word32 *data0, *data1;
661+
Word32 *data0;
662+
const Word32 *data1;
662663

663664
for(w = 0; w < TRANS_FAC; w++) {
664665
Word32 i, tdata;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ static void quantizeLines(const Word16 gain,
110110
Word32 m = gain&3;
111111
Word32 g = (gain >> 2) + 4;
112112
Word32 mdctSpeL;
113-
Word16 *pquat;
113+
const Word16 *pquat;
114114
/* gain&3 */
115115

116116
pquat = quantBorders[m];
@@ -333,7 +333,7 @@ Word32 calcSfbDist(const Word32 *spec,
333333
Word32 m = gain&3;
334334
Word32 g = (gain >> 2) + 4;
335335
Word32 g2 = (g << 1) + 1;
336-
Word16 *pquat, *repquat;
336+
const Word16 *pquat, *repquat;
337337
/* gain&3 */
338338

339339
pquat = quantBorders[m];

0 commit comments

Comments
 (0)