diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2019-03-04 15:52:49 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2019-03-04 15:52:49 +0100 |
| commit | c7f9c2d1d996ac8f67927e9c86b907196ca6a72d (patch) | |
| tree | a2dcc8e8cd3df5628f43242243fd475562ea4082 /libAACenc/src/intensity.cpp | |
| parent | f665ac21b355ebc74c951c09b4774936a74fdca0 (diff) | |
| parent | 95858d7bd36f19bde4a9595e2bd68f195215b164 (diff) | |
| download | fdk-aac-c7f9c2d1d996ac8f67927e9c86b907196ca6a72d.tar.gz fdk-aac-c7f9c2d1d996ac8f67927e9c86b907196ca6a72d.tar.bz2 fdk-aac-c7f9c2d1d996ac8f67927e9c86b907196ca6a72d.zip | |
Merge remote-tracking branch 'mstorjo/master' into dabplus2
Diffstat (limited to 'libAACenc/src/intensity.cpp')
| -rw-r--r-- | libAACenc/src/intensity.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libAACenc/src/intensity.cpp b/libAACenc/src/intensity.cpp index a160a4f..8cb1b45 100644 --- a/libAACenc/src/intensity.cpp +++ b/libAACenc/src/intensity.cpp @@ -747,9 +747,9 @@ void FDKaacEnc_IntensityStereoProcessing( j++) { s = ((mdctSpectrumLeft[j] << s0) >> 1) + ((mdctSpectrumRight[j] << s0) >> 1); - es += fMultDiv2(s, s) >> + es = fAddSaturate(es, fMultDiv2(s, s) >> (MDCT_SPEC_SF - - 1); // scaled 2*(mdctScale - s0 + 1) + MDCT_SPEC_SF + 1)); // scaled 2*(mdctScale - s0 + 1) + MDCT_SPEC_SF } msMask[sfb + sfboffs] = 0; tmp = fDivNorm(sfbEnergyLeft[sfb + sfboffs], es, &s1); |