aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de>2019-05-15 23:05:02 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-05-15 23:05:02 -0700
commitc9fbf5a360290435dba58610414d8e5d5a749cac (patch)
tree8528dcb05a51c14173957c4c193642652f591218
parentced1a601f09f6cb276064457d38da04fb6398260 (diff)
parent69a5c189ad088715d1fac7140c57248d747d6a2a (diff)
downloadfdk-aac-c9fbf5a360290435dba58610414d8e5d5a749cac.tar.gz
fdk-aac-c9fbf5a360290435dba58610414d8e5d5a749cac.tar.bz2
fdk-aac-c9fbf5a360290435dba58610414d8e5d5a749cac.zip
Improve accuracy of division in calcSubbandGain().
am: 69a5c189ad Change-Id: I2bc889856aa9b066ba5d1c2043a6864b2455733f
-rw-r--r--libSBRdec/src/env_calc.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/libSBRdec/src/env_calc.cpp b/libSBRdec/src/env_calc.cpp
index cb1474f..11b7eca 100644
--- a/libSBRdec/src/env_calc.cpp
+++ b/libSBRdec/src/env_calc.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
@@ -2325,7 +2325,15 @@ static void calcSubbandGain(
}
/* gain = nrgRef / B */
- FDK_divide_MantExp(nrgRef, nrgRef_e, b, b_e, ptrNrgGain, ptrNrgGain_e);
+ INT result_exp = 0;
+ *ptrNrgGain = fDivNorm(nrgRef, b, &result_exp);
+ *ptrNrgGain_e = (SCHAR)result_exp + (nrgRef_e - b_e);
+
+ /* There could be a one bit diffs. This is important to compensate,
+ because later in the code values are compared by exponent only. */
+ int headroom = CountLeadingBits(*ptrNrgGain);
+ *ptrNrgGain <<= headroom;
+ *ptrNrgGain_e -= headroom;
}
}