Browse Source

opus: Update to upstream version 1.1.4

Rémi Verschelde 8 years ago
parent
commit
dd8655aac9
2 changed files with 3 additions and 2 deletions
  1. 2 1
      thirdparty/README.md
  2. 1 1
      thirdparty/opus/silk/NLSF_stabilize.c

+ 2 - 1
thirdparty/README.md

@@ -156,7 +156,7 @@ TODO.
 ## opus
 
 - Upstream: https://opus-codec.org
-- Version: 1.1.3 (opus) and 0.8 (opusfile)
+- Version: 1.1.4 (opus) and 0.8 (opusfile)
 - License: BSD-3-Clause
 
 Files extracted from upstream source:
@@ -164,6 +164,7 @@ Files extracted from upstream source:
 - all .c and .h files in src/ (both opus and opusfile),
   except `opus_demo.c`
 - all .h files in include/ (both opus and opusfile) as opus/
+- celt/ and silk/ subfolders
 - COPYING
 
 

+ 1 - 1
thirdparty/opus/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] );