diff options
author | Jean-Michel Trivi <jmtrivi@google.com> | 2016-04-09 00:36:07 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-04-09 00:36:07 +0000 |
commit | 3fbcee802021fc12db8fd6e9e346a2111fe333a9 (patch) | |
tree | 359ed01256a717b0161bfba21783634f1250471a /libSBRdec/src/sbr_rom.cpp | |
parent | 125815b0ed558c72bb019a2d36c662e5e7f7c030 (diff) | |
parent | 203e3f28fbebec7011342017fafc2a0bda0ce530 (diff) | |
download | fdk-aac-3fbcee802021fc12db8fd6e9e346a2111fe333a9.tar.gz fdk-aac-3fbcee802021fc12db8fd6e9e346a2111fe333a9.tar.bz2 fdk-aac-3fbcee802021fc12db8fd6e9e346a2111fe333a9.zip |
AAC/SBR decoder improvements and bugfixes
am: 203e3f2
* commit '203e3f28fbebec7011342017fafc2a0bda0ce530':
AAC/SBR decoder improvements and bugfixes
Change-Id: I2f7f5bb7f4c486347a1fdbd7c481cde33037441e
Diffstat (limited to 'libSBRdec/src/sbr_rom.cpp')
-rw-r--r-- | libSBRdec/src/sbr_rom.cpp | 11 |
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), |