diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2020-04-17 15:05:08 +0200 |
|---|---|---|
| committer | Ray Essick <essick@google.com> | 2021-02-14 12:23:02 -0800 |
| commit | 5e031b67ba74f2713af8f4237f43825742c0a28a (patch) | |
| tree | f6d8047e4dc9b7d62cf769678d82f845c525f754 | |
| parent | 09e7c40a3aa31a47edd272269325e72b40668e90 (diff) | |
| download | fdk-aac-5e031b67ba74f2713af8f4237f43825742c0a28a.tar.gz fdk-aac-5e031b67ba74f2713af8f4237f43825742c0a28a.tar.bz2 fdk-aac-5e031b67ba74f2713af8f4237f43825742c0a28a.zip | |
Consider TNS headroom for complex prediction.
Bug: 176246647
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: I8261106b98d7e7c5a8a2af38585c726285ea8623
| -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))) { |