Renamed SKP_[u]int* to opus_[u]int*
[opus.git] / silk / fixed / silk_find_LPC_FIX.c
index 97bf1c9..f1a0434 100644 (file)
@@ -30,29 +30,29 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 \r
 /* Finds LPC vector from correlations, and converts to NLSF */\r
 void silk_find_LPC_FIX(\r
-    SKP_int16                       NLSF_Q15[],             /* O    NLSFs                                                           */\r
-    SKP_int8                        *interpIndex,           /* O    NLSF interpolation index, only used for NLSF interpolation      */\r
-    const SKP_int16                 prev_NLSFq_Q15[],       /* I    previous NLSFs, only used for NLSF interpolation                */\r
-    const SKP_int                   useInterpNLSFs,         /* I    Flag                                                            */\r
-    const SKP_int                   firstFrameAfterReset,   /* I    Flag                                                            */\r
-    const SKP_int                   LPC_order,              /* I    LPC order                                                       */\r
-    const SKP_int16                 x[],                    /* I    Input signal                                                    */\r
-    const SKP_int                   subfr_length,           /* I    Input signal subframe length including preceeding samples       */\r
-    const SKP_int                   nb_subfr                /* I:   Number of subframes                                             */\r
+    opus_int16                       NLSF_Q15[],             /* O    NLSFs                                                           */\r
+    opus_int8                        *interpIndex,           /* O    NLSF interpolation index, only used for NLSF interpolation      */\r
+    const opus_int16                 prev_NLSFq_Q15[],       /* I    previous NLSFs, only used for NLSF interpolation                */\r
+    const opus_int                   useInterpNLSFs,         /* I    Flag                                                            */\r
+    const opus_int                   firstFrameAfterReset,   /* I    Flag                                                            */\r
+    const opus_int                   LPC_order,              /* I    LPC order                                                       */\r
+    const opus_int16                 x[],                    /* I    Input signal                                                    */\r
+    const opus_int                   subfr_length,           /* I    Input signal subframe length including preceeding samples       */\r
+    const opus_int                   nb_subfr                /* I:   Number of subframes                                             */\r
 )\r
 {\r
-    SKP_int     k;\r
-    SKP_int32   a_Q16[ MAX_LPC_ORDER ];\r
-    SKP_int     isInterpLower, shift;\r
-    SKP_int32   res_nrg0, res_nrg1;\r
-    SKP_int     rshift0, rshift1; \r
+    opus_int     k;\r
+    opus_int32   a_Q16[ MAX_LPC_ORDER ];\r
+    opus_int     isInterpLower, shift;\r
+    opus_int32   res_nrg0, res_nrg1;\r
+    opus_int     rshift0, rshift1; \r
 \r
     /* Used only for LSF interpolation */\r
-    SKP_int32   a_tmp_Q16[ MAX_LPC_ORDER ], res_nrg_interp, res_nrg, res_tmp_nrg, res_nrg_2nd;\r
-    SKP_int     res_nrg_interp_Q, res_nrg_Q, res_tmp_nrg_Q, res_nrg_2nd_Q;\r
-    SKP_int16   a_tmp_Q12[ MAX_LPC_ORDER ];\r
-    SKP_int16   NLSF0_Q15[ MAX_LPC_ORDER ];\r
-    SKP_int16   LPC_res[ ( MAX_FRAME_LENGTH + MAX_NB_SUBFR * MAX_LPC_ORDER ) / 2 ];\r
+    opus_int32   a_tmp_Q16[ MAX_LPC_ORDER ], res_nrg_interp, res_nrg, res_tmp_nrg, res_nrg_2nd;\r
+    opus_int     res_nrg_interp_Q, res_nrg_Q, res_tmp_nrg_Q, res_nrg_2nd_Q;\r
+    opus_int16   a_tmp_Q12[ MAX_LPC_ORDER ];\r
+    opus_int16   NLSF0_Q15[ MAX_LPC_ORDER ];\r
+    opus_int16   LPC_res[ ( MAX_FRAME_LENGTH + MAX_NB_SUBFR * MAX_LPC_ORDER ) / 2 ];\r
 \r
     /* Default: no interpolation */\r
     *interpIndex = 4;\r
@@ -141,7 +141,7 @@ void silk_find_LPC_FIX(
                 /* Interpolation has lower residual energy */\r
                 res_nrg   = res_nrg_interp;\r
                 res_nrg_Q = res_nrg_interp_Q;\r
-                *interpIndex = (SKP_int8)k;\r
+                *interpIndex = (opus_int8)k;\r
             }\r
             res_nrg_2nd   = res_nrg_interp;\r
             res_nrg_2nd_Q = res_nrg_interp_Q;\r