diff options
| author | Martin Storsjo <martin@martin.st> | 2016-05-18 09:36:12 +0300 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2016-05-18 09:36:12 +0300 |
| commit | 8fe6faf261313279879f7fbce8798f03aa63ebd5 (patch) | |
| tree | 39d67cd6aa0b970eef549eb090dba17c83f26aa4 /libAACdec | |
| parent | f132ac5f3dd37f9810b40d36caaa53e0f4ecfd06 (diff) | |
| parent | 8192b1a98f60cc39253c658ba1ca70a70c2e0dfa (diff) | |
| download | fdk-aac-8fe6faf261313279879f7fbce8798f03aa63ebd5.tar.gz fdk-aac-8fe6faf261313279879f7fbce8798f03aa63ebd5.tar.bz2 fdk-aac-8fe6faf261313279879f7fbce8798f03aa63ebd5.zip | |
Merge remote-tracking branch 'aosp/master'
Diffstat (limited to 'libAACdec')
| -rw-r--r-- | libAACdec/src/block.cpp | 3 | ||||
| -rw-r--r-- | libAACdec/src/rvlcconceal.cpp | 4 |
2 files changed, 3 insertions, 4 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]); } |