Renamed SKP_[u]int* to opus_[u]int*
[opus.git] / silk / fixed / silk_residual_energy16_FIX.c
index f651160..c3b571c 100644 (file)
@@ -28,19 +28,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "silk_main_FIX.h"\r
 \r
 /* Residual energy: nrg = wxx - 2 * wXx * c + c' * wXX * c */\r
-SKP_int32 silk_residual_energy16_covar_FIX(\r
-    const SKP_int16                 *c,                 /* I    Prediction vector                           */\r
-    const SKP_int32                 *wXX,               /* I    Correlation matrix                          */\r
-    const SKP_int32                 *wXx,               /* I    Correlation vector                          */\r
-    SKP_int32                       wxx,                /* I    Signal energy                               */\r
-    SKP_int                         D,                  /* I    Dimension                                   */\r
-    SKP_int                         cQ                  /* I    Q value for c vector 0 - 15                 */\r
+opus_int32 silk_residual_energy16_covar_FIX(\r
+    const opus_int16                 *c,                 /* I    Prediction vector                           */\r
+    const opus_int32                 *wXX,               /* I    Correlation matrix                          */\r
+    const opus_int32                 *wXx,               /* I    Correlation vector                          */\r
+    opus_int32                       wxx,                /* I    Signal energy                               */\r
+    opus_int                         D,                  /* I    Dimension                                   */\r
+    opus_int                         cQ                  /* I    Q value for c vector 0 - 15                 */\r
 )\r
 {\r
-    SKP_int   i, j, lshifts, Qxtra;\r
-    SKP_int32 c_max, w_max, tmp, tmp2, nrg;\r
-    SKP_int   cn[ MAX_MATRIX_SIZE ]; \r
-    const SKP_int32 *pRow;\r
+    opus_int   i, j, lshifts, Qxtra;\r
+    opus_int32 c_max, w_max, tmp, tmp2, nrg;\r
+    opus_int   cn[ MAX_MATRIX_SIZE ]; \r
+    const opus_int32 *pRow;\r
 \r
     /* Safety checks */\r
     SKP_assert( D >=  0 );\r
@@ -53,7 +53,7 @@ SKP_int32 silk_residual_energy16_covar_FIX(
 \r
     c_max = 0;\r
     for( i = 0; i < D; i++ ) {\r
-        c_max = SKP_max_32( c_max, SKP_abs( ( SKP_int32 )c[ i ] ) );\r
+        c_max = SKP_max_32( c_max, SKP_abs( ( opus_int32 )c[ i ] ) );\r
     }\r
     Qxtra = SKP_min_int( Qxtra, silk_CLZ32( c_max ) - 17 );\r
 \r
@@ -61,7 +61,7 @@ SKP_int32 silk_residual_energy16_covar_FIX(
     Qxtra = SKP_min_int( Qxtra, silk_CLZ32( SKP_MUL( D, SKP_RSHIFT( SKP_SMULWB( w_max, c_max ), 4 ) ) ) - 5 );\r
     Qxtra = SKP_max_int( Qxtra, 0 );\r
     for( i = 0; i < D; i++ ) {\r
-        cn[ i ] = SKP_LSHIFT( ( SKP_int )c[ i ], Qxtra );\r
+        cn[ i ] = SKP_LSHIFT( ( opus_int )c[ i ], Qxtra );\r
         SKP_assert( SKP_abs(cn[i]) <= ( SKP_int16_MAX + 1 ) ); /* Check that SKP_SMLAWB can be used */\r
     }\r
     lshifts -= Qxtra;\r