diff options
| author | Glenn Kasten <gkasten@google.com> | 2016-04-20 23:59:17 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-20 23:59:17 +0000 |
| commit | 450151173c60fb9481b9757b6049573cdc04aa08 (patch) | |
| tree | 54f00c5c12777852b7dc3a7999e49e3c4bf5fc78 | |
| parent | 7342ab656882c2355518176bacb92410462780f9 (diff) | |
| parent | 18a9bb8b6d6bebae0cf3bdb404a2f8c417cd17fc (diff) | |
| download | fdk-aac-450151173c60fb9481b9757b6049573cdc04aa08.tar.gz fdk-aac-450151173c60fb9481b9757b6049573cdc04aa08.tar.bz2 fdk-aac-450151173c60fb9481b9757b6049573cdc04aa08.zip | |
resolve merge conflicts of ad1e898 to nyc-dev-plus-aosp am: 2809968
am: 18a9bb8
* commit '18a9bb8b6d6bebae0cf3bdb404a2f8c417cd17fc':
Remove redundant parentheses around == comparison operator
Change-Id: If91ecced946588a7d6f48aab5a90e0e8503793b1
| -rw-r--r-- | libAACdec/src/block.cpp | 3 | ||||
| -rw-r--r-- | libAACdec/src/rvlcconceal.cpp | 4 | ||||
| -rw-r--r-- | libAACenc/src/aacenc_lib.cpp | 2 | ||||
| -rw-r--r-- | libSBRenc/src/sbr_encoder.cpp | 4 |
4 files changed, 6 insertions, 7 deletions
diff --git a/libAACdec/src/block.cpp b/libAACdec/src/block.cpp index 2965fa6..a19284e 100644 --- a/libAACdec/src/block.cpp +++ b/libAACdec/src/block.cpp @@ -329,8 +329,7 @@ AAC_DECODER_ERROR CBlock_ReadSectionData(HANDLE_FDK_BITSTREAM bs, } pNumLinesInSec[numLinesInSecIdx] = BandOffsets[top] - BandOffsets[band]; numLinesInSecIdx++; - if ( - (sect_cb == BOOKSCL) ) + if (sect_cb == BOOKSCL) { return AAC_DEC_INVALID_CODE_BOOK; } else { diff --git a/libAACdec/src/rvlcconceal.cpp b/libAACdec/src/rvlcconceal.cpp index ae6b4da..cf33dd5 100644 --- a/libAACdec/src/rvlcconceal.cpp +++ b/libAACdec/src/rvlcconceal.cpp @@ -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]); } diff --git a/libAACenc/src/aacenc_lib.cpp b/libAACenc/src/aacenc_lib.cpp index 2845177..64445b9 100644 --- a/libAACenc/src/aacenc_lib.cpp +++ b/libAACenc/src/aacenc_lib.cpp @@ -1037,7 +1037,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); } diff --git a/libSBRenc/src/sbr_encoder.cpp b/libSBRenc/src/sbr_encoder.cpp index 90b19cf..86a3f91 100644 --- a/libSBRenc/src/sbr_encoder.cpp +++ b/libSBRenc/src/sbr_encoder.cpp @@ -1942,10 +1942,10 @@ INT sbrEncoder_Init( if ( (aot==AOT_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; } |