diff options
| author | Martin Storsjo <martin@martin.st> | 2014-08-01 10:31:53 +0300 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2014-08-01 10:36:54 +0300 |
| commit | 9a3234055adb1e18f80571925779503c8dec5251 (patch) | |
| tree | aeeee5731dd99ba58eb0e4f68a427bf336f021aa /libAACenc/src/intensity.cpp | |
| parent | 6522e87ad6a10ed1786bda310c27a37129a517a6 (diff) | |
| download | fdk-aac-9a3234055adb1e18f80571925779503c8dec5251.tar.gz fdk-aac-9a3234055adb1e18f80571925779503c8dec5251.tar.bz2 fdk-aac-9a3234055adb1e18f80571925779503c8dec5251.zip | |
Extend the GetInvInt table to 80 elements
This is a bug fix patch from Fraunhofer, amending/replacing/extending
the previous commit which only extended the table to 55 elements.
(In my previous fix, 55 seemed to be enough for the issue at hand at
least. A few of the coefficients had slightly different rounding than
what Fraunhofer had used though).
This will show up in AOSP in the next code drop as well.
Diffstat (limited to 'libAACenc/src/intensity.cpp')
| -rw-r--r-- | libAACenc/src/intensity.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libAACenc/src/intensity.cpp b/libAACenc/src/intensity.cpp index 6d807f7..2f2109c 100644 --- a/libAACenc/src/intensity.cpp +++ b/libAACenc/src/intensity.cpp @@ -2,7 +2,7 @@ /* ----------------------------------------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2013 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. +© Copyright 1995 - 2014 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -325,7 +325,6 @@ FDKaacEnc_prepareIntensityDecision(const FIXP_DBL *sfbEnergyLeft, channelCorr[sfb + sfboffs] = FL2FXCONST_DBL(0.0f); - FDK_ASSERT(50 >= 49); /* max width of scalefactorband is 96; width's are always even */ /* inv_n is scaled with factor 2 to compensate fMultDiv2() in subsequent loops */ inv_n = GetInvInt((sfbOffset[sfb + sfboffs + 1] - sfbOffset[sfb + sfboffs])>>1); |