Index: silk/fixed/find_pitch_lags_FIX.c |
diff --git a/silk/fixed/find_pitch_lags_FIX.c b/silk/fixed/find_pitch_lags_FIX.c |
index 39c3048710a28c6ae73a468ec50f620bf9634d83..f60b43641564e3f634e12f7253c1edebf56b8cba 100644 |
--- a/silk/fixed/find_pitch_lags_FIX.c |
+++ b/silk/fixed/find_pitch_lags_FIX.c |
@@ -8,11 +8,11 @@ this list of conditions and the following disclaimer. |
- Redistributions in binary form must reproduce the above copyright |
notice, this list of conditions and the following disclaimer in the |
documentation and/or other materials provided with the distribution. |
-- Neither the name of Internet Society, IETF or IETF Trust, nor the |
+- Neither the name of Internet Society, IETF or IETF Trust, nor the |
names of specific contributors, may be used to endorse or promote |
products derived from this software without specific prior written |
permission. |
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” |
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE |
@@ -30,6 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. |
#endif |
#include "main_FIX.h" |
+#include "stack_alloc.h" |
#include "tuning_parameters.h" |
/* Find pitch lags */ |
@@ -41,13 +42,15 @@ void silk_find_pitch_lags_FIX( |
) |
{ |
opus_int buf_len, i, scale; |
- opus_int32 thrhld_Q15, res_nrg; |
+ opus_int32 thrhld_Q13, res_nrg; |
const opus_int16 *x_buf, *x_buf_ptr; |
- opus_int16 Wsig[ FIND_PITCH_LPC_WIN_MAX ], *Wsig_ptr; |
+ VARDECL( opus_int16, Wsig ); |
+ opus_int16 *Wsig_ptr; |
opus_int32 auto_corr[ MAX_FIND_PITCH_LPC_ORDER + 1 ]; |
opus_int16 rc_Q15[ MAX_FIND_PITCH_LPC_ORDER ]; |
opus_int32 A_Q24[ MAX_FIND_PITCH_LPC_ORDER ]; |
opus_int16 A_Q12[ MAX_FIND_PITCH_LPC_ORDER ]; |
+ SAVE_STACK; |
/******************************************/ |
/* Set up buffer lengths etc based on Fs */ |
@@ -65,6 +68,8 @@ void silk_find_pitch_lags_FIX( |
/* Calculate windowed signal */ |
+ ALLOC( Wsig, psEnc->sCmn.pitch_LPC_win_length, opus_int16 ); |
+ |
/* First LA_LTP samples */ |
x_buf_ptr = x_buf + buf_len - psEnc->sCmn.pitch_LPC_win_length; |
Wsig_ptr = Wsig; |
@@ -110,19 +115,19 @@ void silk_find_pitch_lags_FIX( |
if( psEnc->sCmn.indices.signalType != TYPE_NO_VOICE_ACTIVITY && psEnc->sCmn.first_frame_after_reset == 0 ) { |
/* Threshold for pitch estimator */ |
- thrhld_Q15 = SILK_FIX_CONST( 0.6, 15 ); |
- thrhld_Q15 = silk_SMLABB( thrhld_Q15, SILK_FIX_CONST( -0.004, 15 ), psEnc->sCmn.pitchEstimationLPCOrder ); |
- thrhld_Q15 = silk_SMLABB( thrhld_Q15, SILK_FIX_CONST( -0.1, 7 ), psEnc->sCmn.speech_activity_Q8 ); |
- thrhld_Q15 = silk_SMLABB( thrhld_Q15, SILK_FIX_CONST( -0.15, 15 ), silk_RSHIFT( psEnc->sCmn.prevSignalType, 1 ) ); |
- thrhld_Q15 = silk_SMLAWB( thrhld_Q15, SILK_FIX_CONST( -0.1, 16 ), psEnc->sCmn.input_tilt_Q15 ); |
- thrhld_Q15 = silk_SAT16( thrhld_Q15 ); |
+ thrhld_Q13 = SILK_FIX_CONST( 0.6, 13 ); |
+ thrhld_Q13 = silk_SMLABB( thrhld_Q13, SILK_FIX_CONST( -0.004, 13 ), psEnc->sCmn.pitchEstimationLPCOrder ); |
+ thrhld_Q13 = silk_SMLAWB( thrhld_Q13, SILK_FIX_CONST( -0.1, 21 ), psEnc->sCmn.speech_activity_Q8 ); |
+ thrhld_Q13 = silk_SMLABB( thrhld_Q13, SILK_FIX_CONST( -0.15, 13 ), silk_RSHIFT( psEnc->sCmn.prevSignalType, 1 ) ); |
+ thrhld_Q13 = silk_SMLAWB( thrhld_Q13, SILK_FIX_CONST( -0.1, 14 ), psEnc->sCmn.input_tilt_Q15 ); |
+ thrhld_Q13 = silk_SAT16( thrhld_Q13 ); |
/*****************************************/ |
/* Call pitch estimator */ |
/*****************************************/ |
if( silk_pitch_analysis_core( res, psEncCtrl->pitchL, &psEnc->sCmn.indices.lagIndex, &psEnc->sCmn.indices.contourIndex, |
&psEnc->LTPCorr_Q15, psEnc->sCmn.prevLag, psEnc->sCmn.pitchEstimationThreshold_Q16, |
- (opus_int16)thrhld_Q15, psEnc->sCmn.fs_kHz, psEnc->sCmn.pitchEstimationComplexity, psEnc->sCmn.nb_subfr ) == 0 ) |
+ (opus_int)thrhld_Q13, psEnc->sCmn.fs_kHz, psEnc->sCmn.pitchEstimationComplexity, psEnc->sCmn.nb_subfr ) == 0 ) |
{ |
psEnc->sCmn.indices.signalType = TYPE_VOICED; |
} else { |
@@ -134,4 +139,5 @@ void silk_find_pitch_lags_FIX( |
psEnc->sCmn.indices.contourIndex = 0; |
psEnc->LTPCorr_Q15 = 0; |
} |
+ RESTORE_STACK; |
} |