diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2018-05-04 17:25:53 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-04 17:25:53 -0700 |
| commit | 259a3c5bd5eb9be666f40dfb2978502533dd2b82 (patch) | |
| tree | 8bf6f33f28355cd7dd6c4f5a01c5324a43ec66bc /libAACdec/src/channel.cpp | |
| parent | df390e34924dd8ccf7d16f5f4781f9da523e225e (diff) | |
| parent | 9ab67882eca7454dc001e158bc1e6e2219d6650b (diff) | |
| download | fdk-aac-259a3c5bd5eb9be666f40dfb2978502533dd2b82.tar.gz fdk-aac-259a3c5bd5eb9be666f40dfb2978502533dd2b82.tar.bz2 fdk-aac-259a3c5bd5eb9be666f40dfb2978502533dd2b82.zip | |
FDKv2 additional fixes
am: 9ab67882ec
Change-Id: Ia2ecfc503d1c2a429ad1c7dd5103263c02691a56
Diffstat (limited to 'libAACdec/src/channel.cpp')
| -rw-r--r-- | libAACdec/src/channel.cpp | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/libAACdec/src/channel.cpp b/libAACdec/src/channel.cpp index dbbf58a..cfffd57 100644 --- a/libAACdec/src/channel.cpp +++ b/libAACdec/src/channel.cpp @@ -225,15 +225,18 @@ void CChannelElement_Decode( /* apply intensity stereo */ /* modifies pAacDecoderChannelInfo[]->aSpecSfb */ if (!(flags & (AC_USAC | AC_RSVD50 | AC_RSV603DA))) { - CJointStereo_ApplyIS( - pAacDecoderChannelInfo, - GetScaleFactorBandOffsets(&pAacDecoderChannelInfo[L]->icsInfo, - pSamplingRateInfo), - GetWindowGroupLengthTable(&pAacDecoderChannelInfo[L]->icsInfo), - GetWindowGroups(&pAacDecoderChannelInfo[L]->icsInfo), - GetScaleFactorBandsTransmitted(&pAacDecoderChannelInfo[L]->icsInfo), - pAacDecoderChannelInfo[L]->pDynData->RawDataInfo.CommonWindow ? 1 - : 0); + if ((pAacDecoderChannelInfo[L]->pDynData->RawDataInfo.CommonWindow == + 1) && + (el_channels == 2)) { + CJointStereo_ApplyIS( + pAacDecoderChannelInfo, + GetScaleFactorBandOffsets(&pAacDecoderChannelInfo[L]->icsInfo, + pSamplingRateInfo), + GetWindowGroupLengthTable(&pAacDecoderChannelInfo[L]->icsInfo), + GetWindowGroups(&pAacDecoderChannelInfo[L]->icsInfo), + GetScaleFactorBandsTransmitted( + &pAacDecoderChannelInfo[L]->icsInfo)); + } } } /* maybe_stereo */ |