aboutsummaryrefslogtreecommitdiffstats
path: root/libSBRdec/src/sbr_rom.cpp
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2016-04-09 05:44:33 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-04-09 05:44:33 +0000
commit3b6fe4a90f0e82094a7e5826bf0b3517faf9cfcc (patch)
tree359ed01256a717b0161bfba21783634f1250471a /libSBRdec/src/sbr_rom.cpp
parent4a5a256a01c0f6aa0ebd1b94bba77a70fcac75ee (diff)
parent3fbcee802021fc12db8fd6e9e346a2111fe333a9 (diff)
downloadfdk-aac-3b6fe4a90f0e82094a7e5826bf0b3517faf9cfcc.tar.gz
fdk-aac-3b6fe4a90f0e82094a7e5826bf0b3517faf9cfcc.tar.bz2
fdk-aac-3b6fe4a90f0e82094a7e5826bf0b3517faf9cfcc.zip
AAC/SBR decoder improvements and bugfixes am: 203e3f2
am: 3fbcee8 * commit '3fbcee802021fc12db8fd6e9e346a2111fe333a9': AAC/SBR decoder improvements and bugfixes Change-Id: Ic370a51ba08eb6079ab1b74413385e35bf29ecba
Diffstat (limited to 'libSBRdec/src/sbr_rom.cpp')
-rw-r--r--libSBRdec/src/sbr_rom.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/libSBRdec/src/sbr_rom.cpp b/libSBRdec/src/sbr_rom.cpp
index e84c3cd..c48ce35 100644
--- a/libSBRdec/src/sbr_rom.cpp
+++ b/libSBRdec/src/sbr_rom.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 - 2015 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V.
All rights reserved.
1. INTRODUCTION
@@ -189,6 +189,15 @@ const FIXP_SGL FDK_sbrDecoder_sbr_limiterBandsPerOctaveDiv4[4] =
FL2FXCONST_SGL(3.0f / 4.0f)
};
+/*! Constants for calculating the number of limiter bands */
+const FIXP_DBL FDK_sbrDecoder_sbr_limiterBandsPerOctaveDiv4_DBL[4] =
+{
+ FL2FXCONST_DBL(1.0f / 4.0f),
+ FL2FXCONST_DBL(1.2f / 4.0f),
+ FL2FXCONST_DBL(2.0f / 4.0f),
+ FL2FXCONST_DBL(3.0f / 4.0f)
+};
+
/*! Ratio of old gains and noise levels for the first 4 timeslots of an envelope */
const FIXP_SGL FDK_sbrDecoder_sbr_smoothFilter[4] = {
FL2FXCONST_SGL(0.66666666666666f),