diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-06 07:23:21 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-06 07:23:21 +0000 |
| commit | 2fd44f2027f15c5e141f05245819bf424a44cfa1 (patch) | |
| tree | 8bf6f33f28355cd7dd6c4f5a01c5324a43ec66bc /libAACdec/src/stereo.cpp | |
| parent | fa5ad13b3761cc0d4cfe3780944eed80fb52d842 (diff) | |
| parent | 9ab67882eca7454dc001e158bc1e6e2219d6650b (diff) | |
| download | fdk-aac-2fd44f2027f15c5e141f05245819bf424a44cfa1.tar.gz fdk-aac-2fd44f2027f15c5e141f05245819bf424a44cfa1.tar.bz2 fdk-aac-2fd44f2027f15c5e141f05245819bf424a44cfa1.zip | |
Snap for 4765094 from 9ab67882eca7454dc001e158bc1e6e2219d6650b to pi-release
Change-Id: Iecf0e5905c400a1b43555619b5bf7e1823f15f48
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; |