From 4b6af2da93379da6ea4778889d678ee6cea964d8 Mon Sep 17 00:00:00 2001 From: Jean-Marc Valin Date: Fri, 16 Feb 2018 12:36:44 -0500 Subject: Fixes integer overflow in SILK VAD for 10-ms frames Reported by Chandrakala Madhira on the mailing list --- silk/VAD.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'silk') diff --git a/silk/VAD.c b/silk/VAD.c index 0a782af2..8b929654 100644 --- a/silk/VAD.c +++ b/silk/VAD.c @@ -252,15 +252,14 @@ opus_int silk_VAD_GetSA_Q8_c( /* O Return v speech_nrg += ( b + 1 ) * silk_RSHIFT( Xnrg[ b ] - psSilk_VAD->NL[ b ], 4 ); } + if( psEncC->frame_length == 20 * psEncC->fs_kHz ) { + speech_nrg = silk_RSHIFT32( speech_nrg, 1 ); + } /* Power scaling */ if( speech_nrg <= 0 ) { SA_Q15 = silk_RSHIFT( SA_Q15, 1 ); - } else if( speech_nrg < 32768 ) { - if( psEncC->frame_length == 10 * psEncC->fs_kHz ) { - speech_nrg = silk_LSHIFT_SAT32( speech_nrg, 16 ); - } else { - speech_nrg = silk_LSHIFT_SAT32( speech_nrg, 15 ); - } + } else if( speech_nrg < 16384 ) { + speech_nrg = silk_LSHIFT32( speech_nrg, 16 ); /* square-root */ speech_nrg = silk_SQRT_APPROX( speech_nrg ); -- cgit v1.2.3