diff options
| author | Felicia Lim <flim@google.com> | 2016-07-28 15:21:19 +0200 |
|---|---|---|
| committer | gitbuildkicker <android-build@google.com> | 2016-12-01 14:45:03 -0800 |
| commit | 0d052d64480a30e83fcdda80f4774624e044beb7 (patch) | |
| tree | fc7709f5bf07328286a5dcf3a3fc59c69317ae2c | |
| parent | 170ba5679fe8c3a1d892f3c5ffdc16bb892ed853 (diff) | |
| download | libopus-android-cts-7.1_r22.tar.gz | |
Ensure that NLSF cannot be negative when computing a min distance between themandroid-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r35android-7.1.1_r26android-7.1.1_r25android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20nougat-mr1.3-releasenougat-mr1-releasenougat-mr1-cts-release
b/31607432
Signed-off-by: Jean-Marc Valin <jmvalin@jmvalin.ca>
(cherry picked from commit d9d5ac4027c5ee1da2ff1c6572ae3b35a845db19)
| -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] ); |