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

resolve merge conflicts of ad1e898 to nyc-dev-plus-aosp 

am: 2809968

* commit '28099687b733eac90cff9273b6f8f660176e0784':
  Remove redundant parentheses around == comparison operator

Change-Id: I87566357ee932ac57eed79645fec146625c85cdb
This commit is contained in:
Glenn Kasten 2016-04-20 23:40:28 +00:00 committed by android-build-merger
parent 268c63c4a5 28099687b7
commit 18a9bb8b6d
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libAACdec/src/block.cpp
View File

@ -329,8 +329,7 @@ AAC_DECODER_ERROR CBlock_ReadSectionData(HANDLE_FDK_BITSTREAM bs,
} }
pNumLinesInSec[numLinesInSecIdx] = BandOffsets[top] - BandOffsets[band]; pNumLinesInSec[numLinesInSecIdx] = BandOffsets[top] - BandOffsets[band];
numLinesInSecIdx++; numLinesInSecIdx++;
if ( if (sect_cb == BOOKSCL)
(sect_cb == BOOKSCL) )
{ {
return AAC_DEC_INVALID_CODE_BOOK; return AAC_DEC_INVALID_CODE_BOOK;
} else { } else {

4
libAACdec/src/rvlcconceal.cpp
View File

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

2
libAACenc/src/aacenc_lib.cpp
View File

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

4
libSBRenc/src/sbr_encoder.cpp
View File

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