aboutsummaryrefslogtreecommitdiffstats
path: root/fdk-aac/libSBRdec/src/lpp_tran.cpp
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2020-09-16 10:15:54 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2020-09-16 10:15:54 +0200
commitac10ac25317d2027e21b1390054e47201e7aec98 (patch)
tree4b1114b5806709d99634c1b1571e3fe1ed0a7417 /fdk-aac/libSBRdec/src/lpp_tran.cpp
parentc9b14925962bf6ca3978dc07bf8db32ada7003c5 (diff)
downloadODR-AudioEnc-ac10ac25317d2027e21b1390054e47201e7aec98.tar.gz
ODR-AudioEnc-ac10ac25317d2027e21b1390054e47201e7aec98.tar.bz2
ODR-AudioEnc-ac10ac25317d2027e21b1390054e47201e7aec98.zip
Update fdk-aac
This corresponds to 9718203 in https://github.com/Opendigitalradio/fdk-aac
Diffstat (limited to 'fdk-aac/libSBRdec/src/lpp_tran.cpp')
-rw-r--r--fdk-aac/libSBRdec/src/lpp_tran.cpp24
1 files changed, 21 insertions, 3 deletions
diff --git a/fdk-aac/libSBRdec/src/lpp_tran.cpp b/fdk-aac/libSBRdec/src/lpp_tran.cpp
index 2ef07eb..6acb626 100644
--- a/fdk-aac/libSBRdec/src/lpp_tran.cpp
+++ b/fdk-aac/libSBRdec/src/lpp_tran.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 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten
Forschung e.V. All rights reserved.
1. INTRODUCTION
@@ -446,8 +446,26 @@ void lppTransposer(
pSettings->nCols) +
lowBandShift);
}
- dynamicScale = fixMax(
- 0, dynamicScale - 1); /* one additional bit headroom to prevent -1.0 */
+
+ if (dynamicScale == 0) {
+ /* In this special case the available headroom bits as well as
+ ovLowBandShift and lowBandShift are zero. The spectrum is limited to
+ prevent -1.0, so negative values for dynamicScale can be avoided. */
+ for (i = 0; i < (LPC_ORDER + pSettings->overlap + pSettings->nCols);
+ i++) {
+ lowBandReal[i] = fixMax(lowBandReal[i], (FIXP_DBL)0x80000001);
+ }
+ if (!useLP) {
+ for (i = 0; i < (LPC_ORDER + pSettings->overlap + pSettings->nCols);
+ i++) {
+ lowBandImag[i] = fixMax(lowBandImag[i], (FIXP_DBL)0x80000001);
+ }
+ }
+ } else {
+ dynamicScale =
+ fixMax(0, dynamicScale -
+ 1); /* one additional bit headroom to prevent -1.0 */
+ }
/*
Scale temporal QMF buffer.