From ebb66ffd4ab69646c40c0e464c63c0fe428bcb3d Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Tue, 30 Aug 2016 09:54:44 +0300
Subject: Avoid a warning about extra parentheses

This fixes the following warning:

libSBRenc/src/sbr_encoder.cpp:1942:14: warning: equality comparison
      with extraneous parentheses [-Wparentheses-equality]

Change-Id: I2c833d19348574473c752076a4efff6642c0d653
---
 libSBRenc/src/sbr_encoder.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libSBRenc')

diff --git a/libSBRenc/src/sbr_encoder.cpp b/libSBRenc/src/sbr_encoder.cpp
index 86a3f91..71aab78 100644
--- a/libSBRenc/src/sbr_encoder.cpp
+++ b/libSBRenc/src/sbr_encoder.cpp
@@ -1939,7 +1939,7 @@ INT sbrEncoder_Init(
 
 
 
-    if ( (aot==AOT_PS) ) {
+    if ( aot==AOT_PS ) {
         usePs = 1;
     }
     if ( aot==AOT_ER_AAC_ELD ) {
-- 
cgit v1.2.3


From 5eb6f0db8cc1ecc00af2ef534078e4c65fdf978f Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Tue, 14 Mar 2017 14:29:20 +0200
Subject: Saturate additions in spectralChange

This fixes a crash.
---
 libSBRenc/src/tran_det.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'libSBRenc')

diff --git a/libSBRenc/src/tran_det.cpp b/libSBRenc/src/tran_det.cpp
index 33ea60e..0e35ec3 100644
--- a/libSBRenc/src/tran_det.cpp
+++ b/libSBRenc/src/tran_det.cpp
@@ -187,12 +187,12 @@ static FIXP_DBL spectralChange(FIXP_DBL Energies[NUMBER_TIME_SLOTS_2304][MAX_FRE
 
     /* Sum up energies in first half */
     for (i=start; i<border; i++) {
-      accu1 += scaleValue(Energies[i][j], -energies_e_diff[i]);
+      accu1 = fAddSaturate(accu1, scaleValue(Energies[i][j], -energies_e_diff[i]));
     }
 
     /* Sum up energies in second half */
     for (i=border; i<stop; i++) {
-      accu2 += scaleValue(Energies[i][j], -energies_e_diff[i]);
+      accu2 = fAddSaturate(accu2, scaleValue(Energies[i][j], -energies_e_diff[i]));
     }
 
     /* Energy change in current band */
-- 
cgit v1.2.3