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_main.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_main.cpp')
| -rw-r--r-- | libAACenc/src/psy_main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libAACenc/src/psy_main.cpp b/libAACenc/src/psy_main.cpp index 1c593f8..3cc9438 100644 --- a/libAACenc/src/psy_main.cpp +++ b/libAACenc/src/psy_main.cpp @@ -621,7 +621,7 @@ AAC_ENCODER_ERROR FDKaacEnc_psyMain(INT channels, FDKmemclear(&psyData[ch]->mdctSpectrum[psyData[ch]->lowpassLine+wOffset], (windowLength[ch]-psyData[ch]->lowpassLine)*sizeof(FIXP_DBL)); - if (hPsyConfLong->filterbank != FB_LC) { + if ( (hPsyConfLong->filterbank != FB_LC) && (psyData[ch]->lowpassLine >= FADE_OUT_LEN) ) { /* Do blending to reduce gibbs artifacts */ for (int i=0; i<FADE_OUT_LEN; i++) { psyData[ch]->mdctSpectrum[psyData[ch]->lowpassLine+wOffset - FADE_OUT_LEN + i] = fMult(psyData[ch]->mdctSpectrum[psyData[ch]->lowpassLine+wOffset - FADE_OUT_LEN + i], fadeOutFactor[i]); |