diff options
Diffstat (limited to 'media/libstagefright/codecs/aacenc')
30 files changed, 55 insertions, 47 deletions
diff --git a/media/libstagefright/codecs/aacenc/AACEncoder.cpp b/media/libstagefright/codecs/aacenc/AACEncoder.cpp index 0bff52d..2b8633d 100644 --- a/media/libstagefright/codecs/aacenc/AACEncoder.cpp +++ b/media/libstagefright/codecs/aacenc/AACEncoder.cpp @@ -53,7 +53,7 @@ status_t AACEncoder::initCheck() { CHECK(mApiHandle); if (VO_ERR_NONE != voGetAACEncAPI(mApiHandle)) { - LOGE("Failed to get api handle"); + ALOGE("Failed to get api handle"); return UNKNOWN_ERROR; } @@ -70,11 +70,11 @@ status_t AACEncoder::initCheck() { userData.memflag = VO_IMF_USERMEMOPERATOR; userData.memData = (VO_PTR) mMemOperator; if (VO_ERR_NONE != mApiHandle->Init(&mEncoderHandle, VO_AUDIO_CodingAAC, &userData)) { - LOGE("Failed to init AAC encoder"); + ALOGE("Failed to init AAC encoder"); return UNKNOWN_ERROR; } if (OK != setAudioSpecificConfigData()) { - LOGE("Failed to configure AAC encoder"); + ALOGE("Failed to configure AAC encoder"); return UNKNOWN_ERROR; } @@ -86,7 +86,7 @@ status_t AACEncoder::initCheck() { params.nChannels = mChannels; params.adtsUsed = 0; // We add adts header in the file writer if needed. if (VO_ERR_NONE != mApiHandle->SetParam(mEncoderHandle, VO_PID_AAC_ENCPARAM, ¶ms)) { - LOGE("Failed to set AAC encoder parameters"); + ALOGE("Failed to set AAC encoder parameters"); return UNKNOWN_ERROR; } @@ -106,18 +106,18 @@ static status_t getSampleRateTableIndex(int32_t sampleRate, int32_t &index) { } } - LOGE("Sampling rate %d bps is not supported", sampleRate); + ALOGE("Sampling rate %d bps is not supported", sampleRate); return UNKNOWN_ERROR; } status_t AACEncoder::setAudioSpecificConfigData() { - LOGV("setAudioSpecificConfigData: %d hz, %d bps, and %d channels", + ALOGV("setAudioSpecificConfigData: %d hz, %d bps, and %d channels", mSampleRate, mBitRate, mChannels); int32_t index; CHECK_EQ(OK, getSampleRateTableIndex(mSampleRate, index)); if (mChannels > 2 || mChannels <= 0) { - LOGE("Unsupported number of channels(%d)", mChannels); + ALOGE("Unsupported number of channels(%d)", mChannels); return UNKNOWN_ERROR; } @@ -135,7 +135,7 @@ AACEncoder::~AACEncoder() { status_t AACEncoder::start(MetaData *params) { if (mStarted) { - LOGW("Call start() when encoder already started"); + ALOGW("Call start() when encoder already started"); return OK; } @@ -153,7 +153,7 @@ status_t AACEncoder::start(MetaData *params) { status_t err = mSource->start(params); if (err != OK) { - LOGE("AudioSource is not available"); + ALOGE("AudioSource is not available"); return err; } @@ -177,7 +177,7 @@ status_t AACEncoder::stop() { } if (!mStarted) { - LOGW("Call stop() when encoder has not started"); + ALOGW("Call stop() when encoder has not started"); return ERROR_END_OF_STREAM; } diff --git a/media/libstagefright/codecs/aacenc/basic_op/oper_32b.c b/media/libstagefright/codecs/aacenc/basic_op/oper_32b.c index e48af9d..982f4fd 100644 --- a/media/libstagefright/codecs/aacenc/basic_op/oper_32b.c +++ b/media/libstagefright/codecs/aacenc/basic_op/oper_32b.c @@ -358,4 +358,4 @@ Word32 pow2_xy(Word32 x, Word32 y) res = pow2Table[(POW2_TABLE_SIZE*fPart)/y] >> iPart; return(res); -}
\ No newline at end of file +} diff --git a/media/libstagefright/codecs/aacenc/basic_op/oper_32b.h b/media/libstagefright/codecs/aacenc/basic_op/oper_32b.h index 9ebd1c2..6e5844f 100644 --- a/media/libstagefright/codecs/aacenc/basic_op/oper_32b.h +++ b/media/libstagefright/codecs/aacenc/basic_op/oper_32b.h @@ -63,7 +63,7 @@ __inline Word32 L_mpy_wx(Word32 L_var2, Word16 var1) Word32 result; asm volatile( "SMULWB %[result], %[L_var2], %[var1] \n" - :[result]"+r"(result) + :[result]"=r"(result) :[L_var2]"r"(L_var2), [var1]"r"(var1) ); return result; diff --git a/media/libstagefright/codecs/aacenc/basic_op/typedefs.h b/media/libstagefright/codecs/aacenc/basic_op/typedefs.h index eb0d237..6059237 100644 --- a/media/libstagefright/codecs/aacenc/basic_op/typedefs.h +++ b/media/libstagefright/codecs/aacenc/basic_op/typedefs.h @@ -48,9 +48,7 @@ #define assert(_Expression) ((void)0) #endif -#ifdef LINUX -#define __inline static __inline__ -#endif +#define __inline static __inline #define INT_BITS 32 /* @@ -77,12 +75,12 @@ typedef unsigned short UWord16; /* ********* define 32 bit signed/unsigned types & constants */ -typedef long Word32; -typedef unsigned long UWord32; +typedef int Word32; +typedef unsigned int UWord32; -#ifdef LINUX +#ifndef _MSC_VER typedef long long Word64; typedef unsigned long long UWord64; #else diff --git a/media/libstagefright/codecs/aacenc/inc/aacenc_core.h b/media/libstagefright/codecs/aacenc/inc/aacenc_core.h index 1acdbbc..bb75b6d 100644 --- a/media/libstagefright/codecs/aacenc/inc/aacenc_core.h +++ b/media/libstagefright/codecs/aacenc/inc/aacenc_core.h @@ -102,7 +102,7 @@ Word16 AacEncEncode(AAC_ENCODER *hAacEnc, const UWord8 *ancBytes, /*!< pointer to ancillary data bytes */ Word16 *numAncBytes, /*!< number of ancillary Data Bytes, send as fill element */ UWord8 *outBytes, /*!< pointer to output buffer */ - Word32 *numOutBytes /*!< number of bytes in output buffer */ + VO_U32 *numOutBytes /*!< number of bytes in output buffer */ ); /*--------------------------------------------------------------------------- diff --git a/media/libstagefright/codecs/aacenc/inc/bitbuffer.h b/media/libstagefright/codecs/aacenc/inc/bitbuffer.h index e538064..7c79f07 100644 --- a/media/libstagefright/codecs/aacenc/inc/bitbuffer.h +++ b/media/libstagefright/codecs/aacenc/inc/bitbuffer.h @@ -76,7 +76,7 @@ Word16 GetBitsAvail(HANDLE_BIT_BUF hBitBuf); Word16 WriteBits(HANDLE_BIT_BUF hBitBuf, - Word32 writeValue, + UWord32 writeValue, Word16 noBitsToWrite); void ResetBitBuf(HANDLE_BIT_BUF hBitBuf, diff --git a/media/libstagefright/codecs/aacenc/inc/config.h b/media/libstagefright/codecs/aacenc/inc/config.h index 3b29cef..b0b4c26 100644 --- a/media/libstagefright/codecs/aacenc/inc/config.h +++ b/media/libstagefright/codecs/aacenc/inc/config.h @@ -33,4 +33,4 @@ #define MINBITS_COEF 744 -#endif
\ No newline at end of file +#endif diff --git a/media/libstagefright/codecs/aacenc/inc/psy_configuration.h b/media/libstagefright/codecs/aacenc/inc/psy_configuration.h index 9abfc99..f6981fa 100644 --- a/media/libstagefright/codecs/aacenc/inc/psy_configuration.h +++ b/media/libstagefright/codecs/aacenc/inc/psy_configuration.h @@ -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]; diff --git a/media/libstagefright/codecs/aacenc/inc/sf_estim.h b/media/libstagefright/codecs/aacenc/inc/sf_estim.h index 9039f25..997eba5 100644 --- a/media/libstagefright/codecs/aacenc/inc/sf_estim.h +++ b/media/libstagefright/codecs/aacenc/inc/sf_estim.h @@ -43,4 +43,4 @@ EstimateScaleFactors(PSY_OUT_CHANNEL psyOutChannel[MAX_CHANNELS], Word16 logSfbFormFactor[MAX_CHANNELS][MAX_GROUPED_SFB], Word16 sfbNRelevantLines[MAX_CHANNELS][MAX_GROUPED_SFB], const Word16 nChannels); -#endif
\ No newline at end of file +#endif diff --git a/media/libstagefright/codecs/aacenc/inc/transform.h b/media/libstagefright/codecs/aacenc/inc/transform.h index fbac7aa..311cef5 100644 --- a/media/libstagefright/codecs/aacenc/inc/transform.h +++ b/media/libstagefright/codecs/aacenc/inc/transform.h @@ -33,4 +33,4 @@ void Transform_Real(Word16 *mdctDelayBuffer, Word16 windowSequence ); -#endif
\ No newline at end of file +#endif diff --git a/media/libstagefright/codecs/aacenc/src/aac_rom.c b/media/libstagefright/codecs/aacenc/src/aac_rom.c index 08792e8..127322d 100644 --- a/media/libstagefright/codecs/aacenc/src/aac_rom.c +++ b/media/libstagefright/codecs/aacenc/src/aac_rom.c @@ -2360,4 +2360,4 @@ const unsigned char bitrevTab[17 + 129] = 0x4d, 0x59, 0x4f, 0x79, 0x53, 0x65, 0x57, 0x75, 0x5b, 0x6d, 0x5f, 0x7d, 0x67, 0x73, 0x6f, 0x7b, 0x00, 0x08, 0x14, 0x1c, 0x22, 0x2a, 0x36, 0x3e, 0x41, 0x49, 0x55, 0x5d, 0x63, 0x6b, 0x77, 0x7f, 0x00, -};
\ No newline at end of file +}; diff --git a/media/libstagefright/codecs/aacenc/src/aacenc.c b/media/libstagefright/codecs/aacenc/src/aacenc.c index b5e8a9c..ad2f29a 100644 --- a/media/libstagefright/codecs/aacenc/src/aacenc.c +++ b/media/libstagefright/codecs/aacenc/src/aacenc.c @@ -492,4 +492,4 @@ VO_S32 VO_API voGetAACEncAPI(VO_AUDIO_CODECAPI * pDecHandle) pDecHandle->Uninit = voAACEncUninit; return VO_ERR_NONE; -}
\ No newline at end of file +} diff --git a/media/libstagefright/codecs/aacenc/src/aacenc_core.c b/media/libstagefright/codecs/aacenc/src/aacenc_core.c index 2b3bd48..cecbc8f 100644 --- a/media/libstagefright/codecs/aacenc/src/aacenc_core.c +++ b/media/libstagefright/codecs/aacenc/src/aacenc_core.c @@ -146,7 +146,7 @@ Word16 AacEncEncode(AAC_ENCODER *aacEnc, /*!< an encoder handle */ const UWord8 *ancBytes, /*!< pointer to ancillary data bytes */ Word16 *numAncBytes, /*!< number of ancillary Data Bytes */ UWord8 *outBytes, /*!< pointer to output buffer (must be large MINBITS_COEF/8*MAX_CHANNELS bytes) */ - Word32 *numOutBytes /*!< number of bytes in output buffer after processing */ + VO_U32 *numOutBytes /*!< number of bytes in output buffer after processing */ ) { ELEMENT_INFO *elInfo = &aacEnc->elInfo; diff --git a/media/libstagefright/codecs/aacenc/src/adj_thr.c b/media/libstagefright/codecs/aacenc/src/adj_thr.c index c656f65..373b063 100644 --- a/media/libstagefright/codecs/aacenc/src/adj_thr.c +++ b/media/libstagefright/codecs/aacenc/src/adj_thr.c @@ -26,6 +26,7 @@ #include "adj_thr.h" #include "qc_data.h" #include "line_pe.h" +#include <string.h> #define minSnrLimit 0x6666 /* 1 dB */ @@ -1039,7 +1040,7 @@ void AdjThrInit(ADJ_THR_STATE *hAdjThr, /* minSnr adaptation */ /* maximum reduction of minSnr goes down to minSnr^maxRed */ - msaParam->maxRed = 0x20000000; /* *0.25f / + msaParam->maxRed = 0x20000000; /* *0.25f */ /* start adaptation of minSnr for avgEn/sfbEn > startRatio */ msaParam->startRatio = 0x0ccccccd; /* 10 */ /* maximum minSnr reduction to minSnr^maxRed is reached for @@ -1138,6 +1139,7 @@ void AdjustThresholds(ADJ_THR_STATE *adjThrState, Word16 maxBitresBits = elBits->maxBits; Word16 sideInfoBits = (qcOE->staticBitsUsed + qcOE->ancBitsUsed); Word16 ch; + memset(&peData, 0, sizeof(peData)); prepareSfbPe(&peData, psyOutChannel, logSfbEnergy, sfbNRelevantLines, nChannels, AdjThrStateElement->peOffset); diff --git a/media/libstagefright/codecs/aacenc/src/asm/ARMV5E/PrePostMDCT_v5.s b/media/libstagefright/codecs/aacenc/src/asm/ARMV5E/PrePostMDCT_v5.s index 103cc91..da21d5f 100644 --- a/media/libstagefright/codecs/aacenc/src/asm/ARMV5E/PrePostMDCT_v5.s +++ b/media/libstagefright/codecs/aacenc/src/asm/ARMV5E/PrePostMDCT_v5.s @@ -128,4 +128,4 @@ PostMDCT_LOOP: PostMDCT_END: ldmia sp!, {r4 - r11, pc} @ENDP @ |PostMDCT| - .end
\ No newline at end of file + .end diff --git a/media/libstagefright/codecs/aacenc/src/asm/ARMV5E/R4R8First_v5.s b/media/libstagefright/codecs/aacenc/src/asm/ARMV5E/R4R8First_v5.s index 72cb9a3..4ca4f31 100644 --- a/media/libstagefright/codecs/aacenc/src/asm/ARMV5E/R4R8First_v5.s +++ b/media/libstagefright/codecs/aacenc/src/asm/ARMV5E/R4R8First_v5.s @@ -249,4 +249,4 @@ DATATab: .word 0x5a82799a @ENDP @ |Radix8First| - .end
\ No newline at end of file + .end diff --git a/media/libstagefright/codecs/aacenc/src/asm/ARMV5E/Radix4FFT_v5.s b/media/libstagefright/codecs/aacenc/src/asm/ARMV5E/Radix4FFT_v5.s index e81c82e..b59b967 100644 --- a/media/libstagefright/codecs/aacenc/src/asm/ARMV5E/Radix4FFT_v5.s +++ b/media/libstagefright/codecs/aacenc/src/asm/ARMV5E/Radix4FFT_v5.s @@ -166,4 +166,4 @@ Radix4FFT_END: ldmia sp!, {r4 - r11, pc} @ENDP @ |Radix4FFT| - .end
\ No newline at end of file + .end diff --git a/media/libstagefright/codecs/aacenc/src/asm/ARMV7/PrePostMDCT_v7.s b/media/libstagefright/codecs/aacenc/src/asm/ARMV7/PrePostMDCT_v7.s index 64d767a..b2bc9d9 100644 --- a/media/libstagefright/codecs/aacenc/src/asm/ARMV7/PrePostMDCT_v7.s +++ b/media/libstagefright/codecs/aacenc/src/asm/ARMV7/PrePostMDCT_v7.s @@ -132,4 +132,4 @@ PostMDCT_END: ldmia sp!, {r4 - r11, pc} @ENDP @ |PostMDCT| - .end
\ No newline at end of file + .end diff --git a/media/libstagefright/codecs/aacenc/src/asm/ARMV7/R4R8First_v7.s b/media/libstagefright/codecs/aacenc/src/asm/ARMV7/R4R8First_v7.s index 7fc5520..3033156 100644 --- a/media/libstagefright/codecs/aacenc/src/asm/ARMV7/R4R8First_v7.s +++ b/media/libstagefright/codecs/aacenc/src/asm/ARMV7/R4R8First_v7.s @@ -143,4 +143,4 @@ Radix4First_END: ldmia sp!, {r4 - r11, pc} @ENDP @ |Radix4First| - .end
\ No newline at end of file + .end diff --git a/media/libstagefright/codecs/aacenc/src/asm/ARMV7/Radix4FFT_v7.s b/media/libstagefright/codecs/aacenc/src/asm/ARMV7/Radix4FFT_v7.s index b8655ae..f874825 100644 --- a/media/libstagefright/codecs/aacenc/src/asm/ARMV7/Radix4FFT_v7.s +++ b/media/libstagefright/codecs/aacenc/src/asm/ARMV7/Radix4FFT_v7.s @@ -140,4 +140,4 @@ Radix4FFT_END: ldmia sp!, {r4 - r11, pc} @ENDP @ |Radix4FFT| - .end
\ No newline at end of file + .end diff --git a/media/libstagefright/codecs/aacenc/src/band_nrg.c b/media/libstagefright/codecs/aacenc/src/band_nrg.c index 7501af1..e4034b8 100644 --- a/media/libstagefright/codecs/aacenc/src/band_nrg.c +++ b/media/libstagefright/codecs/aacenc/src/band_nrg.c @@ -99,4 +99,4 @@ void CalcBandEnergyMS(const Word32 *mdctSpectrumLeft, *bandEnergySideSum = accuSideSum; } -#endif
\ No newline at end of file +#endif diff --git a/media/libstagefright/codecs/aacenc/src/bitbuffer.c b/media/libstagefright/codecs/aacenc/src/bitbuffer.c index 5615ac3..0ce93d3 100644 --- a/media/libstagefright/codecs/aacenc/src/bitbuffer.c +++ b/media/libstagefright/codecs/aacenc/src/bitbuffer.c @@ -138,7 +138,7 @@ Word16 GetBitsAvail(HANDLE_BIT_BUF hBitBuf) * *****************************************************************************/ Word16 WriteBits(HANDLE_BIT_BUF hBitBuf, - Word32 writeValue, + UWord32 writeValue, Word16 noBitsToWrite) { Word16 wBitPos; @@ -152,6 +152,7 @@ Word16 WriteBits(HANDLE_BIT_BUF hBitBuf, wBitPos = hBitBuf->wBitPos; wBitPos += noBitsToWrite; + writeValue &= ~(0xffffffff << noBitsToWrite); // Mask out everything except the lowest noBitsToWrite bits writeValue <<= 32 - wBitPos; writeValue |= hBitBuf->cache; 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/qc_main.c b/media/libstagefright/codecs/aacenc/src/qc_main.c index df6d46e..48ff300 100644 --- a/media/libstagefright/codecs/aacenc/src/qc_main.c +++ b/media/libstagefright/codecs/aacenc/src/qc_main.c @@ -163,7 +163,7 @@ void QCOutDelete(QC_OUT* hQC, VO_MEM_OPERATOR *pMemOP) Word32 i; if(hQC) { - if(hQC->qcChannel[0].quantSpec); + if(hQC->qcChannel[0].quantSpec) mem_free(pMemOP, hQC->qcChannel[0].quantSpec, VO_INDEX_ENC_AAC); if(hQC->qcChannel[0].maxValueInSfb) 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]; diff --git a/media/libstagefright/codecs/aacenc/src/sf_estim.c b/media/libstagefright/codecs/aacenc/src/sf_estim.c index fe40137..bc320ec 100644 --- a/media/libstagefright/codecs/aacenc/src/sf_estim.c +++ b/media/libstagefright/codecs/aacenc/src/sf_estim.c @@ -400,7 +400,7 @@ static void assimilateSingleScf(PSY_OUT_CHANNEL *psyOutChan, Word16 *minScfCalculated, Flag restartOnSuccess) { - Word32 sfbLast, sfbAct, sfbNext, scfAct, scfMin; + Word16 sfbLast, sfbAct, sfbNext, scfAct, scfMin; Word16 *scfLast, *scfNext; Word32 sfbPeOld, sfbPeNew; Word32 sfbDistNew; diff --git a/media/libstagefright/codecs/aacenc/src/transform.c b/media/libstagefright/codecs/aacenc/src/transform.c index a154a2f..a02336f 100644 --- a/media/libstagefright/codecs/aacenc/src/transform.c +++ b/media/libstagefright/codecs/aacenc/src/transform.c @@ -339,6 +339,12 @@ static void PostMDCT(int *buf0, int num, const int *csptr) *buf1-- = MULHIGH(cosb, tr2) + MULHIGH(sinb, ti2); } } +#else +void Radix4First(int *buf, int num); +void Radix8First(int *buf, int num); +void Radix4FFT(int *buf, int num, int bgn, int *twidTab); +void PreMDCT(int *buf0, int num, const int *csptr); +void PostMDCT(int *buf0, int num, const int *csptr); #endif |