diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-01-15 00:25:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-01-15 00:25:38 +0000 |
| commit | 8cc30d9c62a956c15f18e1df92715cf06186f5c5 (patch) | |
| tree | 3718f6a4a2bc652939af1e199be69f7b041f9254 /libAACdec/src/channel.cpp | |
| parent | 9ee8fd55598983e94c56bcaba93820fc0e7da907 (diff) | |
| parent | 9a48d4799826e54915f06ca25bfd4e9d81dcf8c7 (diff) | |
| download | fdk-aac-8cc30d9c62a956c15f18e1df92715cf06186f5c5.tar.gz fdk-aac-8cc30d9c62a956c15f18e1df92715cf06186f5c5.tar.bz2 fdk-aac-8cc30d9c62a956c15f18e1df92715cf06186f5c5.zip | |
Merge "Consider TNS headroom for complex prediction."
Diffstat (limited to 'libAACdec/src/channel.cpp')
| -rw-r--r-- | libAACdec/src/channel.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libAACdec/src/channel.cpp b/libAACdec/src/channel.cpp index a020034..7e62bfb 100644 --- a/libAACdec/src/channel.cpp +++ b/libAACdec/src/channel.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2018 Fraunhofer-Gesellschaft zur Förderung der angewandten +© Copyright 1995 - 2020 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -265,7 +265,9 @@ void CChannelElement_Decode( stereo prediction since scaling has already been carried out. */ int max_sfb_ste = (INT)(pAacDecoderChannelInfo[L]->icsInfo.max_sfb_ste); - if ((!CP_active) || (CP_active && (max_sfb_ste < noSfbs)) || + if (!(CP_active && (max_sfb_ste == noSfbs)) || + !(CP_active && + !(pAacDecoderChannelInfo[ch]->pDynData->TnsData.Active)) || ((flags & (AC_USAC | AC_RSVD50 | AC_RSV603DA)) && (pAacDecoderChannelInfo[L]->pDynData->specificTo.usac.tns_on_lr == 0))) { |