diff options
| author | Martin Storsjo <martin@martin.st> | 2016-08-25 22:12:15 +0300 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2016-08-25 22:12:15 +0300 |
| commit | f9d0f65e6578592149c01d8417197896283a821f (patch) | |
| tree | b6293c11023d196ed31b9c6ef765d645d872db49 /libSBRdec/src/sbr_rom.cpp | |
| parent | 15b128dd826ba86ee962d86b0b06966a25ed9158 (diff) | |
| parent | 00fc1c66d5a524c6961db04d05e1076b18003231 (diff) | |
| download | fdk-aac-f9d0f65e6578592149c01d8417197896283a821f.tar.gz fdk-aac-f9d0f65e6578592149c01d8417197896283a821f.tar.bz2 fdk-aac-f9d0f65e6578592149c01d8417197896283a821f.zip | |
Merge remote-tracking branch 'aosp/master'
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), |