diff options
| author | Rémi Verschelde | 2017-04-09 15:17:43 +0200 |
|---|---|---|
| committer | Rémi Verschelde | 2017-04-09 15:51:48 +0200 |
| commit | 2bc0208b2c01994c4c65cbb1b99795189f6b8c41 (patch) | |
| tree | 143084d4cc1ffd03d7d21ffe895abc8620f249a9 | |
| parent | 20d1a283415f367917ffcfb58f1add25b0fb5d45 (diff) | |
| download | godot-2bc0208b2c01994c4c65cbb1b99795189f6b8c41.tar.gz godot-2bc0208b2c01994c4c65cbb1b99795189f6b8c41.tar.zst godot-2bc0208b2c01994c4c65cbb1b99795189f6b8c41.zip | |
| -rw-r--r-- | thirdparty/README.md | 3 | ||||
| -rw-r--r-- | thirdparty/opus/silk/NLSF_stabilize.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/thirdparty/README.md b/thirdparty/README.md index 0859c8947..4c284a7e4 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -135,7 +135,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: @@ -143,6 +143,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 1fa1ea379..8f3426b91 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] ); |