diff options
author | Felicia Lim <flim@google.com> | 2016-11-12 01:38:45 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-11-12 01:38:45 +0000 |
commit | 0b99ea7a4849105ed48b8e97f3e41606d19947f5 (patch) | |
tree | fc7709f5bf07328286a5dcf3a3fc59c69317ae2c | |
parent | 170ba5679fe8c3a1d892f3c5ffdc16bb892ed853 (diff) | |
parent | 8207d6fc566da93fd716506a8870b5d7cf6abc04 (diff) | |
download | libopus-nougat-mr2.2-release.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: ae7f372e44android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-dev
am: 8207d6fc56
Change-Id: Ic1d97945d85962f2e75963e44ee839076bdf819c
-rw-r--r-- | silk/NLSF_stabilize.c | 2 |
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] ); |