Saturate additions in FDKaacEnc_IntensityStereoProcessing

This fixes a crash when encoding a sample from github issue #98.
mstorsjo · Nov 6, 2018 · 35d6f66 · 35d6f66
1 parent 2df6698
commit 35d6f66
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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);