diff options
| author | Glenn Kasten <gkasten@google.com> | 2016-04-20 19:00:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-20 19:00:06 +0000 |
| commit | ad1e8985d954c289b1c5c0683ac92d5ec08c5e0d (patch) | |
| tree | 3c6a3b7657ccf8a34c79167142f209f5b3ecea93 | |
| parent | c203653dcb46c1fbee0cf8bd719427cbe7fa4f7f (diff) | |
| parent | 34fb05353bbabe1ba04362f26b3ae507fbb687d4 (diff) | |
| download | fdk-aac-ad1e8985d954c289b1c5c0683ac92d5ec08c5e0d.tar.gz fdk-aac-ad1e8985d954c289b1c5c0683ac92d5ec08c5e0d.tar.bz2 fdk-aac-ad1e8985d954c289b1c5c0683ac92d5ec08c5e0d.zip | |
Merge "Remove redundant parentheses around == comparison operator"
am: 34fb053
* commit '34fb05353bbabe1ba04362f26b3ae507fbb687d4':
Remove redundant parentheses around == comparison operator
Change-Id: I7a37ef8293371cc0287a0e0b9f0115f82f294b31
| -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 9d703cc..526accb 100644 --- a/libAACdec/src/block.cpp +++ b/libAACdec/src/block.cpp @@ -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 { 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 63563fd..e24df65 100644 --- a/libAACenc/src/aacenc_lib.cpp +++ b/libAACenc/src/aacenc_lib.cpp @@ -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); } diff --git a/libSBRenc/src/sbr_encoder.cpp b/libSBRenc/src/sbr_encoder.cpp index 464c013..abe9793 100644 --- a/libSBRenc/src/sbr_encoder.cpp +++ b/libSBRenc/src/sbr_encoder.cpp @@ -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; } |