Renamed SKP_[u]int* to opus_[u]int*
[opus.git] / silk / silk_VQ_WMat_EC.c
index bf123eb..e35e481 100644 (file)
@@ -29,20 +29,20 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 \r
 /* Entropy constrained matrix-weighted VQ, hard-coded to 5-element vectors, for a single input data vector */\r
 void silk_VQ_WMat_EC(\r
-    SKP_int8                        *ind,               /* O    index of best codebook vector               */\r
-    SKP_int32                       *rate_dist_Q14,     /* O    best weighted quantization error + mu * rate*/\r
-    const SKP_int16                 *in_Q14,            /* I    input vector to be quantized                */\r
-    const SKP_int32                 *W_Q18,             /* I    weighting matrix                            */\r
-    const SKP_int8                  *cb_Q7,             /* I    codebook                                    */\r
-    const SKP_uint8                 *cl_Q5,             /* I    code length for each codebook vector        */\r
-    const SKP_int                   mu_Q9,              /* I    tradeoff between weighted error and rate    */\r
-    SKP_int                         L                   /* I    number of vectors in codebook               */\r
+    opus_int8                        *ind,               /* O    index of best codebook vector               */\r
+    opus_int32                       *rate_dist_Q14,     /* O    best weighted quantization error + mu * rate*/\r
+    const opus_int16                 *in_Q14,            /* I    input vector to be quantized                */\r
+    const opus_int32                 *W_Q18,             /* I    weighting matrix                            */\r
+    const opus_int8                  *cb_Q7,             /* I    codebook                                    */\r
+    const opus_uint8                 *cl_Q5,             /* I    code length for each codebook vector        */\r
+    const opus_int                   mu_Q9,              /* I    tradeoff between weighted error and rate    */\r
+    opus_int                         L                   /* I    number of vectors in codebook               */\r
 )\r
 {\r
-    SKP_int   k;\r
-    const SKP_int8 *cb_row_Q7;\r
-    SKP_int16 diff_Q14[ 5 ];\r
-    SKP_int32 sum1_Q14, sum2_Q16;\r
+    opus_int   k;\r
+    const opus_int8 *cb_row_Q7;\r
+    opus_int16 diff_Q14[ 5 ];\r
+    opus_int32 sum1_Q14, sum2_Q16;\r
 \r
     /* Loop over codebook */\r
     *rate_dist_Q14 = SKP_int32_MAX;\r
@@ -98,7 +98,7 @@ void silk_VQ_WMat_EC(
         /* find best */\r
         if( sum1_Q14 < *rate_dist_Q14 ) {\r
             *rate_dist_Q14 = sum1_Q14;\r
-            *ind = (SKP_int8)k;\r
+            *ind = (opus_int8)k;\r
         }\r
 \r
         /* Go to next cbk vector */\r