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 /libAACenc/src/psy_configuration.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 'libAACenc/src/psy_configuration.cpp')
| -rw-r--r-- | libAACenc/src/psy_configuration.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libAACenc/src/psy_configuration.cpp b/libAACenc/src/psy_configuration.cpp index 4393fa1..9a72c68 100644 --- a/libAACenc/src/psy_configuration.cpp +++ b/libAACenc/src/psy_configuration.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 @@ -634,13 +634,14 @@ AAC_ENCODER_ERROR FDKaacEnc_InitPsyConfiguration(INT bitrate, if (psyConf->sfbOffset[sfb] >= psyConf->lowpassLine) break; } - psyConf->sfbActive = sfb; + psyConf->sfbActive = FDKmax(sfb, 1); for (sfb = 0; sfb < psyConf->sfbCnt; sfb++){ if (psyConf->sfbOffset[sfb] >= psyConf->lowpassLineLFE) break; } psyConf->sfbActiveLFE = sfb; + psyConf->sfbActive = FDKmax(psyConf->sfbActive, psyConf->sfbActiveLFE); /* calculate minSnr */ FDKaacEnc_initMinSnr(bitrate, |