diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2016-04-05 17:51:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-05 17:51:06 +0000 |
| commit | b802750fd273c5914970b4cfa0c959fc5fcc32a4 (patch) | |
| tree | a8dc54ef8dba931c72627e7bbebf1844b81a31f7 /libAACenc/src/psy_configuration.cpp | |
| parent | bb7ad8711b3b620a7c7de669b7b6409e610c29dd (diff) | |
| parent | 65750eae6583754ea9d84fed41dc12d1fc3d73d0 (diff) | |
| download | fdk-aac-b802750fd273c5914970b4cfa0c959fc5fcc32a4.tar.gz fdk-aac-b802750fd273c5914970b4cfa0c959fc5fcc32a4.tar.bz2 fdk-aac-b802750fd273c5914970b4cfa0c959fc5fcc32a4.zip | |
SBR/AAC encoder updates, code clean up am: e1c78ed
am: 65750ea
* commit '65750eae6583754ea9d84fed41dc12d1fc3d73d0':
SBR/AAC encoder updates, code clean up
Change-Id: Ife18fb3ee2fe76fab1e5ab8256addf5d39834c2f
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, |