aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelicia Lim <flim@google.com>2016-11-12 01:31:43 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-11-12 01:31:43 +0000
commit8207d6fc566da93fd716506a8870b5d7cf6abc04 (patch)
treefc7709f5bf07328286a5dcf3a3fc59c69317ae2c
parent170ba5679fe8c3a1d892f3c5ffdc16bb892ed853 (diff)
parentae7f372e449a3481bff5f8549d5cd40a8b37f438 (diff)
downloadlibopus-8207d6fc566da93fd716506a8870b5d7cf6abc04.tar.gz
Ensure that NLSF cannot be negative when computing a min distance between them am: d9d5ac4027 am: 0c9f64428e am: 08bee81353 am: af7b9188dd am: 1e52f31e06 am: 77d9e761ae am: 98092cecc4 am: 910dc7b667 am: dc699bde53
am: ae7f372e44 Change-Id: Ib8c6668c55b7181838f1c9bdbb08332ed59fc141
-rw-r--r--silk/NLSF_stabilize.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/silk/NLSF_stabilize.c b/silk/NLSF_stabilize.c
index 1fa1ea37..8f3426b9 100644
--- a/silk/NLSF_stabilize.c
+++ b/silk/NLSF_stabilize.c
@@ -130,7 +130,7 @@ void silk_NLSF_stabilize(
/* Keep delta_min distance between the NLSFs */
for( i = 1; i < L; i++ )
- NLSF_Q15[i] = silk_max_int( NLSF_Q15[i], NLSF_Q15[i-1] + NDeltaMin_Q15[i] );
+ NLSF_Q15[i] = silk_max_int( NLSF_Q15[i], silk_ADD_SAT16( NLSF_Q15[i-1], NDeltaMin_Q15[i] ) );
/* Last NLSF should be no higher than 1 - NDeltaMin[L] */
NLSF_Q15[L-1] = silk_min_int( NLSF_Q15[L-1], (1<<15) - NDeltaMin_Q15[L] );