Renamed SKP_[u]int* to opus_[u]int*
[opus.git] / silk / silk_process_NLSFs.c
index 392e8a3..57329c4 100644 (file)
@@ -30,17 +30,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /* Limit, stabilize, convert and quantize NLSFs */ \r
 void silk_process_NLSFs(\r
     silk_encoder_state              *psEncC,                                /* I/O  Encoder state                               */\r
-    SKP_int16                       PredCoef_Q12[ 2 ][ MAX_LPC_ORDER ],     /* O    Prediction coefficients                     */\r
-    SKP_int16                       pNLSF_Q15[         MAX_LPC_ORDER ],     /* I/O  Normalized LSFs (quant out) (0 - (2^15-1))  */\r
-    const SKP_int16                 prev_NLSFq_Q15[    MAX_LPC_ORDER ]      /* I    Previous Normalized LSFs (0 - (2^15-1))     */\r
+    opus_int16                       PredCoef_Q12[ 2 ][ MAX_LPC_ORDER ],     /* O    Prediction coefficients                     */\r
+    opus_int16                       pNLSF_Q15[         MAX_LPC_ORDER ],     /* I/O  Normalized LSFs (quant out) (0 - (2^15-1))  */\r
+    const opus_int16                 prev_NLSFq_Q15[    MAX_LPC_ORDER ]      /* I    Previous Normalized LSFs (0 - (2^15-1))     */\r
 )\r
 {\r
-    SKP_int     i, doInterpolate;\r
-    SKP_int     NLSF_mu_Q20;\r
-    SKP_int32   i_sqr_Q15;\r
-    SKP_int16   pNLSF0_temp_Q15[ MAX_LPC_ORDER ];\r
-    SKP_int16   pNLSFW_QW[ MAX_LPC_ORDER ];\r
-    SKP_int16   pNLSFW0_temp_QW[ MAX_LPC_ORDER ];\r
+    opus_int     i, doInterpolate;\r
+    opus_int     NLSF_mu_Q20;\r
+    opus_int32   i_sqr_Q15;\r
+    opus_int16   pNLSF0_temp_Q15[ MAX_LPC_ORDER ];\r
+    opus_int16   pNLSFW_QW[ MAX_LPC_ORDER ];\r
+    opus_int16   pNLSFW0_temp_QW[ MAX_LPC_ORDER ];\r
 \r
     SKP_assert( psEncC->speech_activity_Q8 >=   0 );\r
     SKP_assert( psEncC->speech_activity_Q8 <= SILK_FIX_CONST( 1.0, 8 ) );\r
@@ -98,6 +98,6 @@ void silk_process_NLSFs(
 \r
     } else {\r
         /* Copy LPC coefficients for first half from second half */\r
-        SKP_memcpy( PredCoef_Q12[ 0 ], PredCoef_Q12[ 1 ], psEncC->predictLPCOrder * sizeof( SKP_int16 ) );\r
+        SKP_memcpy( PredCoef_Q12[ 0 ], PredCoef_Q12[ 1 ], psEncC->predictLPCOrder * sizeof( opus_int16 ) );\r
     }\r
 }\r