Renamed SKP_[u]int* to opus_[u]int*
[opus.git] / silk / fixed / silk_find_pitch_lags_FIX.c
index d6c4ee8..866f1d7 100644 (file)
@@ -32,18 +32,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 void silk_find_pitch_lags_FIX(\r
     silk_encoder_state_FIX          *psEnc,         /* I/O  encoder state                               */\r
     silk_encoder_control_FIX        *psEncCtrl,     /* I/O  encoder control                             */\r
-    SKP_int16                       res[],          /* O    residual                                    */\r
-    const SKP_int16                 x[]             /* I    Speech signal                               */\r
+    opus_int16                       res[],          /* O    residual                                    */\r
+    const opus_int16                 x[]             /* I    Speech signal                               */\r
 )\r
 {\r
-    SKP_int   buf_len, i, scale;\r
-    SKP_int32 thrhld_Q15, res_nrg;\r
-    const SKP_int16 *x_buf, *x_buf_ptr;\r
-    SKP_int16 Wsig[      FIND_PITCH_LPC_WIN_MAX ], *Wsig_ptr;\r
-    SKP_int32 auto_corr[ MAX_FIND_PITCH_LPC_ORDER + 1 ];\r
-    SKP_int16 rc_Q15[    MAX_FIND_PITCH_LPC_ORDER ];\r
-    SKP_int32 A_Q24[     MAX_FIND_PITCH_LPC_ORDER ];\r
-    SKP_int16 A_Q12[     MAX_FIND_PITCH_LPC_ORDER ];\r
+    opus_int   buf_len, i, scale;\r
+    opus_int32 thrhld_Q15, res_nrg;\r
+    const opus_int16 *x_buf, *x_buf_ptr;\r
+    opus_int16 Wsig[      FIND_PITCH_LPC_WIN_MAX ], *Wsig_ptr;\r
+    opus_int32 auto_corr[ MAX_FIND_PITCH_LPC_ORDER + 1 ];\r
+    opus_int16 rc_Q15[    MAX_FIND_PITCH_LPC_ORDER ];\r
+    opus_int32 A_Q24[     MAX_FIND_PITCH_LPC_ORDER ];\r
+    opus_int16 A_Q12[     MAX_FIND_PITCH_LPC_ORDER ];\r
 \r
     /******************************************/\r
     /* Setup buffer lengths etc based on Fs   */\r
@@ -69,7 +69,7 @@ void silk_find_pitch_lags_FIX(
     /* Middle un - windowed samples */\r
     Wsig_ptr  += psEnc->sCmn.la_pitch;\r
     x_buf_ptr += psEnc->sCmn.la_pitch;\r
-    SKP_memcpy( Wsig_ptr, x_buf_ptr, ( psEnc->sCmn.pitch_LPC_win_length - SKP_LSHIFT( psEnc->sCmn.la_pitch, 1 ) ) * sizeof( SKP_int16 ) );\r
+    SKP_memcpy( Wsig_ptr, x_buf_ptr, ( psEnc->sCmn.pitch_LPC_win_length - SKP_LSHIFT( psEnc->sCmn.la_pitch, 1 ) ) * sizeof( opus_int16 ) );\r
 \r
     /* Last LA_LTP samples */\r
     Wsig_ptr  += psEnc->sCmn.pitch_LPC_win_length - SKP_LSHIFT( psEnc->sCmn.la_pitch, 1 );\r
@@ -93,7 +93,7 @@ void silk_find_pitch_lags_FIX(
     \r
     /* Convert From 32 bit Q24 to 16 bit Q12 coefs */\r
     for( i = 0; i < psEnc->sCmn.pitchEstimationLPCOrder; i++ ) {\r
-        A_Q12[ i ] = ( SKP_int16 )SKP_SAT16( SKP_RSHIFT( A_Q24[ i ], 12 ) );\r
+        A_Q12[ i ] = ( opus_int16 )SKP_SAT16( SKP_RSHIFT( A_Q24[ i ], 12 ) );\r
     }\r
 \r
     /* Do BWE */\r
@@ -118,7 +118,7 @@ void silk_find_pitch_lags_FIX(
         /*****************************************/\r
         if( silk_pitch_analysis_core( res, psEncCtrl->pitchL, &psEnc->sCmn.indices.lagIndex, &psEnc->sCmn.indices.contourIndex, \r
                 &psEnc->LTPCorr_Q15, psEnc->sCmn.prevLag, psEnc->sCmn.pitchEstimationThreshold_Q16, \r
-                ( SKP_int16 )thrhld_Q15, psEnc->sCmn.fs_kHz, psEnc->sCmn.pitchEstimationComplexity, psEnc->sCmn.nb_subfr ) == 0 ) \r
+                ( opus_int16 )thrhld_Q15, psEnc->sCmn.fs_kHz, psEnc->sCmn.pitchEstimationComplexity, psEnc->sCmn.nb_subfr ) == 0 ) \r
         {\r
             psEnc->sCmn.indices.signalType = TYPE_VOICED;\r
         } else {\r