summaryrefslogtreecommitdiff
path: root/thirdparty
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2017-04-09 15:17:43 +0200
committerRémi Verschelde <rverschelde@gmail.com>2017-04-09 15:17:58 +0200
commitdd8655aac93dacc24e5e1c7778209ef8b610640b (patch)
treec94cba5faa001e348a52b2e25f6d0b6590ade778 /thirdparty
parentfa2d5b91dc390a11262859e5309351ba58842901 (diff)
opus: Update to upstream version 1.1.4
Diffstat (limited to 'thirdparty')
-rw-r--r--thirdparty/README.md3
-rw-r--r--thirdparty/opus/silk/NLSF_stabilize.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/thirdparty/README.md b/thirdparty/README.md
index 8aec75b57d..f6edff490f 100644
--- a/thirdparty/README.md
+++ b/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
diff --git a/thirdparty/opus/silk/NLSF_stabilize.c b/thirdparty/opus/silk/NLSF_stabilize.c
index 1fa1ea379b..8f3426b91e 100644
--- a/thirdparty/opus/silk/NLSF_stabilize.c
+++ b/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] );