diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-10-22 03:10:23 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-10-22 03:10:23 +0000 |
| commit | b3ccda1719a116f649dae3316b0eb6d33c6ef8f7 (patch) | |
| tree | fa7778872b05e66a9aeddce2a0fc1d7deab8c770 /libSBRdec/src/sbrdec_freq_sca.cpp | |
| parent | 56b78e9be81bd98878772b46510c771a5036b70d (diff) | |
| parent | fc8faa38d90380adfb61b2b280a36c73369c9aff (diff) | |
| download | fdk-aac-b3ccda1719a116f649dae3316b0eb6d33c6ef8f7.tar.gz fdk-aac-b3ccda1719a116f649dae3316b0eb6d33c6ef8f7.tar.bz2 fdk-aac-b3ccda1719a116f649dae3316b0eb6d33c6ef8f7.zip | |
Snap for 5956624 from fc8faa38d90380adfb61b2b280a36c73369c9aff to rvc-release
Change-Id: I90c7f7de4ed5bb04e355e181028c850f6e95d8ad
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); } /*! |