diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2018-03-07 14:27:17 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2018-03-07 14:27:17 +0100 |
| commit | 3eab23670d4d9fb2a8ee01c1be7b4acfc14c1552 (patch) | |
| tree | 66307d4c7722477b8add1f133a84da311bb99470 /libAACenc/src/sf_estim.cpp | |
| parent | 89639e36b29a622c641c3de3a4737a4c848dc365 (diff) | |
| parent | a30bfced6b6d6d976c728552d247cb30dd86e238 (diff) | |
| download | fdk-aac-dabplus.tar.gz fdk-aac-dabplus.tar.bz2 fdk-aac-dabplus.zip | |
Merge branch 'mstorjo/master' into dabplusHEADv0.1.6-dabdabplus
Diffstat (limited to 'libAACenc/src/sf_estim.cpp')
| -rw-r--r-- | libAACenc/src/sf_estim.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libAACenc/src/sf_estim.cpp b/libAACenc/src/sf_estim.cpp index 1cb243b..75b8d42 100644 --- a/libAACenc/src/sf_estim.cpp +++ b/libAACenc/src/sf_estim.cpp @@ -533,6 +533,7 @@ static void FDKaacEnc_assimilateSingleScf(PSY_OUT_CHANNEL *psyOutChan, (scfAct > scfMin) && (scfAct <= scfMin+MAX_SCF_DELTA) && (scfAct >= scfMax-MAX_SCF_DELTA) && + (scfAct <= fixMin(scfMin,fixMin(*scfLast, *scfNext))+MAX_SCF_DELTA) && (*scfLast != prevScfLast[sfbAct] || *scfNext != prevScfNext[sfbAct] || deltaPe < deltaPeLast[sfbAct])) { |