fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'aosp/master'

This commit is contained in:
Martin Storsjo 2016-05-18 09:36:12 +03:00
parent f132ac5f3d 8192b1a98f
commit 8fe6faf261
7 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Android.mk
View File

@ -40,6 +40,7 @@ LOCAL_SRC_FILES := \
$(sbrenc_sources:%=libSBRenc/src/%)
LOCAL_CFLAGS += -Wno-sequence-point -Wno-extra
LOCAL_CFLAGS += "-Wno-\#warnings" -Wno-constant-logical-operand -Wno-self-assign
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/libAACdec/include \

3
libAACdec/src/block.cpp
View File

@ -329,8 +329,7 @@ AAC_DECODER_ERROR CBlock_ReadSectionData(HANDLE_FDK_BITSTREAM bs,
if (numLinesInSecIdx >= MAX_SFB_HCR) {
return AAC_DEC_PARSE_ERROR;
}
if (
(sect_cb == BOOKSCL) )
if (sect_cb == BOOKSCL)
{
return AAC_DEC_INVALID_CODE_BOOK;
} else {

4
libAACdec/src/rvlcconceal.cpp
View File

@ -459,7 +459,7 @@ void BidirectionalEstimation_UseScfOfPrevFrameAsReference (
break;
case NOISE_HCB:
if ( (pAacDecoderStaticChannelInfo->concealmentInfo.aRvlcPreviousCodebook[bnds]==NOISE_HCB) ) {
if ( pAacDecoderStaticChannelInfo->concealmentInfo.aRvlcPreviousCodebook[bnds]==NOISE_HCB ) {
commonMin = FDKmin(pAacDecoderChannelInfo->pComData->overlay.aac.aRvlcScfFwd[bnds],pAacDecoderChannelInfo->pComData->overlay.aac.aRvlcScfBwd[bnds]);
pAacDecoderChannelInfo->pDynData->aScaleFactor[bnds] = FDKmin(commonMin, pAacDecoderStaticChannelInfo->concealmentInfo.aRvlcPreviousScaleFactor[bnds]);
} else {
@ -669,7 +669,7 @@ void PredictiveInterpolation (
break;
case NOISE_HCB:
if ( (pAacDecoderStaticChannelInfo->concealmentInfo.aRvlcPreviousCodebook[bnds]==NOISE_HCB) ) {
if ( pAacDecoderStaticChannelInfo->concealmentInfo.aRvlcPreviousCodebook[bnds]==NOISE_HCB ) {
commonMin = FDKmin(pAacDecoderChannelInfo->pComData->overlay.aac.aRvlcScfFwd[bnds],pAacDecoderChannelInfo->pComData->overlay.aac.aRvlcScfBwd[bnds]);
pAacDecoderChannelInfo->pDynData->aScaleFactor[bnds] = FDKmin(commonMin, pAacDecoderStaticChannelInfo->concealmentInfo.aRvlcPreviousScaleFactor[bnds]);
}

2
libAACenc/src/aacenc_lib.cpp
View File

@ -1046,7 +1046,7 @@ static AACENC_ERROR aacEncInit(HANDLE_AACENCODER hAacEncoder,
}
/* Clear input buffer */
if ( (InitFlags == AACENC_INIT_ALL) ) {
if ( InitFlags == AACENC_INIT_ALL ) {
FDKmemclear(hAacEncoder->inputBuffer, sizeof(INT_PCM)*hAacEncoder->nMaxAacChannels*INPUTBUFFER_SIZE);
}

50
libAACenc/src/metadata_compressor.cpp
View File

@ -193,36 +193,36 @@ struct DRC_COMP {
* Profile tables.
*/
static const FIXP_DBL tabMaxBoostThr[] = {
(FIXP_DBL)(-43<<METADATA_FRACT_BITS),
(FIXP_DBL)(-53<<METADATA_FRACT_BITS),
(FIXP_DBL)(-55<<METADATA_FRACT_BITS),
(FIXP_DBL)(-65<<METADATA_FRACT_BITS),
(FIXP_DBL)(-50<<METADATA_FRACT_BITS),
(FIXP_DBL)(-40<<METADATA_FRACT_BITS)
(FIXP_DBL)(int)((unsigned)-43<<METADATA_FRACT_BITS),
(FIXP_DBL)(int)((unsigned)-53<<METADATA_FRACT_BITS),
(FIXP_DBL)(int)((unsigned)-55<<METADATA_FRACT_BITS),
(FIXP_DBL)(int)((unsigned)-65<<METADATA_FRACT_BITS),
(FIXP_DBL)(int)((unsigned)-50<<METADATA_FRACT_BITS),
(FIXP_DBL)(int)((unsigned)-40<<METADATA_FRACT_BITS)
};
static const FIXP_DBL tabBoostThr[] = {
(FIXP_DBL)(-31<<METADATA_FRACT_BITS),
(FIXP_DBL)(-41<<METADATA_FRACT_BITS),
(FIXP_DBL)(-31<<METADATA_FRACT_BITS),
(FIXP_DBL)(-41<<METADATA_FRACT_BITS),
(FIXP_DBL)(-31<<METADATA_FRACT_BITS),
(FIXP_DBL)(-31<<METADATA_FRACT_BITS)
(FIXP_DBL)(int)((unsigned)-31<<METADATA_FRACT_BITS),
(FIXP_DBL)(int)((unsigned)-41<<METADATA_FRACT_BITS),
(FIXP_DBL)(int)((unsigned)-31<<METADATA_FRACT_BITS),
(FIXP_DBL)(int)((unsigned)-41<<METADATA_FRACT_BITS),
(FIXP_DBL)(int)((unsigned)-31<<METADATA_FRACT_BITS),
(FIXP_DBL)(int)((unsigned)-31<<METADATA_FRACT_BITS)
};
static const FIXP_DBL tabEarlyCutThr[] = {
(FIXP_DBL)(-26<<METADATA_FRACT_BITS),
(FIXP_DBL)(-21<<METADATA_FRACT_BITS),
(FIXP_DBL)(-26<<METADATA_FRACT_BITS),
(FIXP_DBL)(-21<<METADATA_FRACT_BITS),
(FIXP_DBL)(-26<<METADATA_FRACT_BITS),
(FIXP_DBL)(-20<<METADATA_FRACT_BITS)
(FIXP_DBL)(int)((unsigned)-26<<METADATA_FRACT_BITS),
(FIXP_DBL)(int)((unsigned)-21<<METADATA_FRACT_BITS),
(FIXP_DBL)(int)((unsigned)-26<<METADATA_FRACT_BITS),
(FIXP_DBL)(int)((unsigned)-21<<METADATA_FRACT_BITS),
(FIXP_DBL)(int)((unsigned)-26<<METADATA_FRACT_BITS),
(FIXP_DBL)(int)((unsigned)-20<<METADATA_FRACT_BITS)
};
static const FIXP_DBL tabCutThr[] = {
(FIXP_DBL)(-16<<METADATA_FRACT_BITS),
(FIXP_DBL)(-11<<METADATA_FRACT_BITS),
(FIXP_DBL)(-16<<METADATA_FRACT_BITS),
(FIXP_DBL)(-21<<METADATA_FRACT_BITS),
(FIXP_DBL)(-16<<METADATA_FRACT_BITS),
(FIXP_DBL)(-10<<METADATA_FRACT_BITS)
(FIXP_DBL)(int)((unsigned)-16<<METADATA_FRACT_BITS),
(FIXP_DBL)(int)((unsigned)-11<<METADATA_FRACT_BITS),
(FIXP_DBL)(int)((unsigned)-16<<METADATA_FRACT_BITS),
(FIXP_DBL)(int)((unsigned)-21<<METADATA_FRACT_BITS),
(FIXP_DBL)(int)((unsigned)-16<<METADATA_FRACT_BITS),
(FIXP_DBL)(int)((unsigned)-10<<METADATA_FRACT_BITS)
};
static const FIXP_DBL tabMaxCutThr[] = {
(FIXP_DBL)(4<<METADATA_FRACT_BITS),
@ -576,7 +576,7 @@ INT FDK_DRC_Generator_Initialize(
drcComp->channels = channelMapping.nChannels;
/* Init states. */
drcComp->smoothLevel[0] = drcComp->smoothLevel[1] = (FIXP_DBL)(-135<<METADATA_FRACT_BITS);
drcComp->smoothLevel[0] = drcComp->smoothLevel[1] = (FIXP_DBL)(int)((unsigned)-135<<METADATA_FRACT_BITS);
FDKmemclear(drcComp->smoothGain, sizeof(drcComp->smoothGain));
FDKmemclear(drcComp->holdCnt, sizeof(drcComp->holdCnt));

3
libSBRdec/src/env_extr.cpp
View File

@ -904,6 +904,9 @@ static const FRAME_INFO v_frame_info4_8 = { 0, 4, {0, 2, 4, 6, 8}, {1, 1, 1, 1},
break;
default:
FDK_ASSERT(0);
/* in case assertion checks are disabled, force a definite memory fault at first access */
pTable = NULL;
break;
}
/* look number of envelopes in table */

4
libSBRenc/src/sbr_encoder.cpp
View File

@ -1851,10 +1851,10 @@ INT sbrEncoder_Init(
if ( (aot==AOT_PS) || (aot==AOT_MP2_PS) || (aot==AOT_DABPLUS_PS) || (aot==AOT_DRM_MPEG_PS) ) {
usePs = 1;
}
if ( (aot==AOT_ER_AAC_ELD) ) {
if ( aot==AOT_ER_AAC_ELD ) {
lowDelay = 1;
}
else if ( (aot==AOT_ER_AAC_LD) ) {
else if ( aot==AOT_ER_AAC_LD ) {
error = 1;
goto bail;
}