diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2018-05-04 17:41:40 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-04 17:41:40 -0700 |
| commit | b2ce5c82bd4288b0e55d23f8cbf1d51150d752fc (patch) | |
| tree | 8bf6f33f28355cd7dd6c4f5a01c5324a43ec66bc /libAACdec/src/stereo.cpp | |
| parent | 2ef3dc81e5bfa012a5b1b7fce573fdd1b73130e8 (diff) | |
| parent | 259a3c5bd5eb9be666f40dfb2978502533dd2b82 (diff) | |
| download | fdk-aac-b2ce5c82bd4288b0e55d23f8cbf1d51150d752fc.tar.gz fdk-aac-b2ce5c82bd4288b0e55d23f8cbf1d51150d752fc.tar.bz2 fdk-aac-b2ce5c82bd4288b0e55d23f8cbf1d51150d752fc.zip | |
FDKv2 additional fixes am: 9ab67882ec
am: 259a3c5bd5
Change-Id: Iac5c03364819ea0ef7a91cccfc0b62af0b19b612
Diffstat (limited to 'libAACdec/src/stereo.cpp')
| -rw-r--r-- | libAACdec/src/stereo.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libAACdec/src/stereo.cpp b/libAACdec/src/stereo.cpp index bb4f050..eed826b 100644 --- a/libAACdec/src/stereo.cpp +++ b/libAACdec/src/stereo.cpp @@ -1177,8 +1177,7 @@ void CJointStereo_ApplyIS(CAacDecoderChannelInfo *pAacDecoderChannelInfo[2], const SHORT *pScaleFactorBandOffsets, const UCHAR *pWindowGroupLength, const int windowGroups, - const int scaleFactorBandsTransmitted, - const UINT CommonWindow) { + const int scaleFactorBandsTransmitted) { CJointStereoData *pJointStereoData = &pAacDecoderChannelInfo[L]->pComData->jointStereoData; @@ -1228,7 +1227,7 @@ void CJointStereo_ApplyIS(CAacDecoderChannelInfo *pAacDecoderChannelInfo[2], rightScale[band] = leftScale[band] + msb + 1; - if (CommonWindow && (pJointStereoData->MsUsed[band] & groupMask)) { + if (pJointStereoData->MsUsed[band] & groupMask) { if (CodeBook[band] == INTENSITY_HCB) /* _NOT_ in-phase */ { scale = -scale; |