summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs/aacenc/src
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2010-12-22 22:23:06 +0100
committerMartin Storsjo <martin@martin.st>2012-01-18 08:16:42 +0200
commit9fc4dfb69df0b5a13b7a1904272eb1dcf8113d0c (patch)
tree9e598654b728141f822b6fb1d2b9ec6303a435dc /media/libstagefright/codecs/aacenc/src
parentb676a05348e4c516fa8b57e33b10548e6142c3f8 (diff)
downloadframeworks_av-9fc4dfb69df0b5a13b7a1904272eb1dcf8113d0c.zip
frameworks_av-9fc4dfb69df0b5a13b7a1904272eb1dcf8113d0c.tar.gz
frameworks_av-9fc4dfb69df0b5a13b7a1904272eb1dcf8113d0c.tar.bz2
stagefright aacenc: Add const declarations to some pointers
This avoids some compilation warnings. Change-Id: Ia89ab94020a9f1ee4c1df48823fb89325cca7d36
Diffstat (limited to 'media/libstagefright/codecs/aacenc/src')
-rw-r--r--media/libstagefright/codecs/aacenc/src/dyn_bits.c2
-rw-r--r--media/libstagefright/codecs/aacenc/src/interface.c4
-rw-r--r--media/libstagefright/codecs/aacenc/src/psy_configuration.c4
-rw-r--r--media/libstagefright/codecs/aacenc/src/psy_main.c3
-rw-r--r--media/libstagefright/codecs/aacenc/src/quantize.c4
5 files changed, 9 insertions, 8 deletions
diff --git a/media/libstagefright/codecs/aacenc/src/dyn_bits.c b/media/libstagefright/codecs/aacenc/src/dyn_bits.c
index 3d2efdc..7769188 100644
--- a/media/libstagefright/codecs/aacenc/src/dyn_bits.c
+++ b/media/libstagefright/codecs/aacenc/src/dyn_bits.c
@@ -281,7 +281,7 @@ noiselessCounter(SECTION_DATA *sectionData,
const Word32 blockType)
{
Word32 grpNdx, i;
- Word16 *sideInfoTab = NULL;
+ const Word16 *sideInfoTab = NULL;
SECTION_INFO *sectionInfo;
/*
diff --git a/media/libstagefright/codecs/aacenc/src/interface.c b/media/libstagefright/codecs/aacenc/src/interface.c
index f2472d8..d0ad433 100644
--- a/media/libstagefright/codecs/aacenc/src/interface.c
+++ b/media/libstagefright/codecs/aacenc/src/interface.c
@@ -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++;
diff --git a/media/libstagefright/codecs/aacenc/src/psy_configuration.c b/media/libstagefright/codecs/aacenc/src/psy_configuration.c
index 02d92ab..dd40f9b 100644
--- a/media/libstagefright/codecs/aacenc/src/psy_configuration.c
+++ b/media/libstagefright/codecs/aacenc/src/psy_configuration.c
@@ -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)
diff --git a/media/libstagefright/codecs/aacenc/src/psy_main.c b/media/libstagefright/codecs/aacenc/src/psy_main.c
index 085acb8..4e9218c 100644
--- a/media/libstagefright/codecs/aacenc/src/psy_main.c
+++ b/media/libstagefright/codecs/aacenc/src/psy_main.c
@@ -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;
diff --git a/media/libstagefright/codecs/aacenc/src/quantize.c b/media/libstagefright/codecs/aacenc/src/quantize.c
index 54add2f..0d0f550 100644
--- a/media/libstagefright/codecs/aacenc/src/quantize.c
+++ b/media/libstagefright/codecs/aacenc/src/quantize.c
@@ -110,7 +110,7 @@ static void quantizeLines(const Word16 gain,
Word32 m = gain&3;
Word32 g = (gain >> 2) + 4;
Word32 mdctSpeL;
- Word16 *pquat;
+ const Word16 *pquat;
/* gain&3 */
pquat = quantBorders[m];
@@ -333,7 +333,7 @@ Word32 calcSfbDist(const Word32 *spec,
Word32 m = gain&3;
Word32 g = (gain >> 2) + 4;
Word32 g2 = (g << 1) + 1;
- Word16 *pquat, *repquat;
+ const Word16 *pquat, *repquat;
/* gain&3 */
pquat = quantBorders[m];