diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2021-06-01 14:25:25 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2021-06-01 14:25:25 +0200 |
| commit | e778887e4e5589528b06b04404ce4c71aaae267a (patch) | |
| tree | fcce7bfb237a99ac174e16611f39bf363f6b280c /libSBRdec/src/sbrdec_freq_sca.cpp | |
| parent | 97182034e8829014bdfc0449c2116d629196f1d4 (diff) | |
| parent | 801f67f671929311e0c9952c5f92d6e147c7b003 (diff) | |
| download | fdk-aac-e778887e4e5589528b06b04404ce4c71aaae267a.tar.gz fdk-aac-e778887e4e5589528b06b04404ce4c71aaae267a.tar.bz2 fdk-aac-e778887e4e5589528b06b04404ce4c71aaae267a.zip | |
Merge v2.0.2 into dabplus2
Diffstat (limited to 'libSBRdec/src/sbrdec_freq_sca.cpp')
| -rw-r--r-- | libSBRdec/src/sbrdec_freq_sca.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libSBRdec/src/sbrdec_freq_sca.cpp b/libSBRdec/src/sbrdec_freq_sca.cpp index 165f94b..e187656 100644 --- a/libSBRdec/src/sbrdec_freq_sca.cpp +++ b/libSBRdec/src/sbrdec_freq_sca.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 @@ -230,6 +230,8 @@ static UCHAR getStopBand( } } + stopMin = fMin(stopMin, 64); + /* Choose a stop band between k1 and 64 depending on stopFreq (0..13), based on a logarithmic scale. @@ -523,7 +525,8 @@ static FIXP_SGL calcFactorPerBand(int k_start, int k_stop, int num_bands) { step = FL2FXCONST_DBL(0.0f); } } - return FX_DBL2FX_SGL(bandfactor << 1); + return (bandfactor >= FL2FXCONST_DBL(0.5)) ? (FIXP_SGL)MAXVAL_SGL + : FX_DBL2FX_SGL(bandfactor << 1); } /*! |