aboutsummaryrefslogtreecommitdiffstats
path: root/libSBRenc
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-05-06 07:23:21 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-05-06 07:23:21 +0000
commit2fd44f2027f15c5e141f05245819bf424a44cfa1 (patch)
tree8bf6f33f28355cd7dd6c4f5a01c5324a43ec66bc /libSBRenc
parentfa5ad13b3761cc0d4cfe3780944eed80fb52d842 (diff)
parent9ab67882eca7454dc001e158bc1e6e2219d6650b (diff)
downloadfdk-aac-2fd44f2027f15c5e141f05245819bf424a44cfa1.tar.gz
fdk-aac-2fd44f2027f15c5e141f05245819bf424a44cfa1.tar.bz2
fdk-aac-2fd44f2027f15c5e141f05245819bf424a44cfa1.zip
Snap for 4765094 from 9ab67882eca7454dc001e158bc1e6e2219d6650b to pi-release
Change-Id: Iecf0e5905c400a1b43555619b5bf7e1823f15f48
Diffstat (limited to 'libSBRenc')
-rw-r--r--libSBRenc/src/tran_det.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libSBRenc/src/tran_det.cpp b/libSBRenc/src/tran_det.cpp
index ba9ae68..b6f1b9f 100644
--- a/libSBRenc/src/tran_det.cpp
+++ b/libSBRenc/src/tran_det.cpp
@@ -366,7 +366,7 @@ static FIXP_DBL addHighbandEnergies(
accu += (EnergiesM[slotOut][j] >> scale[0]);
}
}
- nrgTotal = accu >> (scaleEnergies[1] - scale[1]);
+ nrgTotal = fAddSaturate(nrgTotal, accu >> (scaleEnergies[1] - scale[1]));
}
return (nrgTotal);