drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "stagefright aacenc: Add const declarations to some pointers"

Browse Source
This commit is contained in:
Jean-Baptiste Queru
2012-02-24 08:53:24 -08:00
committed by android code review
parent 1b7046108c 4054856dad
commit 47b56c5a46
6 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/libstagefright/codecs/aacenc/inc/psy_configuration.h
View File

@ -31,7 +31,7 @@ typedef struct{
Word16 sfbCnt; Word16 sfbCnt;
Word16 sfbActive; /* number of sf bands containing energy after lowpass */ Word16 sfbActive; /* number of sf bands containing energy after lowpass */
Word16 *sfbOffset; const Word16 *sfbOffset;
Word32 sfbThresholdQuiet[MAX_SFB_LONG]; Word32 sfbThresholdQuiet[MAX_SFB_LONG];
@ -61,7 +61,7 @@ typedef struct{
Word16 sfbCnt; Word16 sfbCnt;
Word16 sfbActive; /* number of sf bands containing energy after lowpass */ Word16 sfbActive; /* number of sf bands containing energy after lowpass */
Word16 *sfbOffset; const Word16 *sfbOffset;
Word32 sfbThresholdQuiet[MAX_SFB_SHORT]; Word32 sfbThresholdQuiet[MAX_SFB_SHORT];

2
media/libstagefright/codecs/aacenc/src/dyn_bits.c
View File

@ -281,7 +281,7 @@ noiselessCounter(SECTION_DATA *sectionData,
const Word32 blockType) const Word32 blockType)
{ {
Word32 grpNdx, i; Word32 grpNdx, i;
Word16 *sideInfoTab = NULL; const Word16 *sideInfoTab = NULL;
SECTION_INFO *sectionInfo; SECTION_INFO *sectionInfo;
/* /*

4
media/libstagefright/codecs/aacenc/src/interface.c
View File

@ -99,8 +99,8 @@ void BuildInterface(Word32 *groupedMdctSpectrum,
Word32 i; Word32 i;
Word32 accuSumMS=0; Word32 accuSumMS=0;
Word32 accuSumLR=0; Word32 accuSumLR=0;
Word32 *pSumMS = sfbEnergySumMS.sfbShort; const Word32 *pSumMS = sfbEnergySumMS.sfbShort;
Word32 *pSumLR = sfbEnergySumLR.sfbShort; const Word32 *pSumLR = sfbEnergySumLR.sfbShort;
for (i=TRANS_FAC; i; i--) { for (i=TRANS_FAC; i; i--) {
accuSumLR = L_add(accuSumLR, *pSumLR); pSumLR++; accuSumLR = L_add(accuSumLR, *pSumLR); pSumLR++;

4
media/libstagefright/codecs/aacenc/src/psy_configuration.c
View File

@ -139,7 +139,7 @@ static Word16 BarcLineValue(Word16 noOfLines, Word16 fftLine, Word32 samplingFre
* *
*****************************************************************************/ *****************************************************************************/
static void initThrQuiet(Word16 numPb, static void initThrQuiet(Word16 numPb,
Word16 *pbOffset, const Word16 *pbOffset,
Word16 *pbBarcVal, Word16 *pbBarcVal,
Word32 *pbThresholdQuiet) { Word32 *pbThresholdQuiet) {
Word16 i; Word16 i;
@ -250,7 +250,7 @@ static void initSpreading(Word16 numPb,
* *
*****************************************************************************/ *****************************************************************************/
static void initBarcValues(Word16 numPb, static void initBarcValues(Word16 numPb,
Word16 *pbOffset, const Word16 *pbOffset,
Word16 numLines, Word16 numLines,
Word32 samplingFrequency, Word32 samplingFrequency,
Word16 *pbBval) Word16 *pbBval)

3
media/libstagefright/codecs/aacenc/src/psy_main.c
View File

@ -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 normEnergyShift = (psyData->mdctScale + 1) << 1; /* in reference code, mdct spectrum must be multipied with 2, so +1 */
Word32 clipEnergy = hPsyConfShort->clipEnergy >> normEnergyShift; Word32 clipEnergy = hPsyConfShort->clipEnergy >> normEnergyShift;
Word32 wOffset = 0; Word32 wOffset = 0;
Word32 *data0, *data1; Word32 *data0;
const Word32 *data1;
for(w = 0; w < TRANS_FAC; w++) { for(w = 0; w < TRANS_FAC; w++) {
Word32 i, tdata; Word32 i, tdata;

4
media/libstagefright/codecs/aacenc/src/quantize.c
View File

@ -110,7 +110,7 @@ static void quantizeLines(const Word16 gain,
Word32 m = gain&3; Word32 m = gain&3;
Word32 g = (gain >> 2) + 4; Word32 g = (gain >> 2) + 4;
Word32 mdctSpeL; Word32 mdctSpeL;
Word16 *pquat; const Word16 *pquat;
/* gain&3 */ /* gain&3 */
pquat = quantBorders[m]; pquat = quantBorders[m];
@ -333,7 +333,7 @@ Word32 calcSfbDist(const Word32 *spec,
Word32 m = gain&3; Word32 m = gain&3;
Word32 g = (gain >> 2) + 4; Word32 g = (gain >> 2) + 4;
Word32 g2 = (g << 1) + 1; Word32 g2 = (g << 1) + 1;
Word16 *pquat, *repquat; const Word16 *pquat, *repquat;
/* gain&3 */ /* gain&3 */
pquat = quantBorders[m]; pquat = quantBorders[m];