Commit 4f0f910a authored by Felicia Lim's avatar Felicia Lim Committed by Commit Bot

[opus] Apply patch to fix another int-overflow in silk

Applies patch from https://gitlab.xiph.org/xiph/opus/-/commit/adcb7bc2

Bug: 1061593
Change-Id: I377991d493cfd1cf5bf509fee2deec6207feee56
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2132634
Auto-Submit: Felicia Lim <flim@chromium.org>
Commit-Queue: James Zern <jzern@google.com>
Reviewed-by: default avatarJames Zern <jzern@google.com>
Cr-Commit-Position: refs/heads/master@{#755511}
parent dd751928
...@@ -16,6 +16,7 @@ Local changes: ...@@ -16,6 +16,7 @@ Local changes:
* set 'x' flags: "chmod 750 win32/genversion.bat" * set 'x' flags: "chmod 750 win32/genversion.bat"
* remove assertion messages in release builds (see crbug/1053572) * remove assertion messages in release builds (see crbug/1053572)
* apply patch to fix int-overflow in silk (https://gitlab.xiph.org/xiph/opus/-/commit/923bebde) * apply patch to fix int-overflow in silk (https://gitlab.xiph.org/xiph/opus/-/commit/923bebde)
* apply patch to fix another int-overflow in silk (https://gitlab.xiph.org/xiph/opus/-/commit/adcb7bc2)
Opus' own unit tests are located in ./src/tests Opus' own unit tests are located in ./src/tests
Additional chromium tests are located in ./tests Additional chromium tests are located in ./tests
...@@ -451,7 +451,7 @@ static OPUS_INLINE void silk_noise_shape_quantizer_del_dec( ...@@ -451,7 +451,7 @@ static OPUS_INLINE void silk_noise_shape_quantizer_del_dec(
/* Input minus prediction plus noise feedback */ /* Input minus prediction plus noise feedback */
/* r = x[ i ] - LTP_pred - LPC_pred + n_AR + n_Tilt + n_LF + n_LTP */ /* r = x[ i ] - LTP_pred - LPC_pred + n_AR + n_Tilt + n_LF + n_LTP */
tmp1 = silk_ADD32( n_AR_Q14, n_LF_Q14 ); /* Q14 */ tmp1 = silk_ADD_SAT32( n_AR_Q14, n_LF_Q14 ); /* Q14 */
tmp2 = silk_ADD32( n_LTP_Q14, LPC_pred_Q14 ); /* Q13 */ tmp2 = silk_ADD32( n_LTP_Q14, LPC_pred_Q14 ); /* Q13 */
tmp1 = silk_SUB_SAT32( tmp2, tmp1 ); /* Q13 */ tmp1 = silk_SUB_SAT32( tmp2, tmp1 ); /* Q13 */
tmp1 = silk_RSHIFT_ROUND( tmp1, 4 ); /* Q10 */ tmp1 = silk_RSHIFT_ROUND( tmp1, 4 ); /* Q10 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment