Renamed SKP_[u]int* to opus_[u]int*
[opus.git] / silk / silk_resampler_private_ARMA4.c
index c277238..cfc2140 100644 (file)
@@ -36,18 +36,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /* where it is assumed that B*_Q14[0], B*_Q14[2], A*_Q14[0] are all 16384                           */\r
 \r
 void silk_resampler_private_ARMA4(\r
-       SKP_int32                                           S[],                    /* I/O: State vector [ 4 ]                              */\r
-       SKP_int16                                           out[],                  /* O:       Output signal                                       */\r
-       const SKP_int16                             in[],                       /* I:   Input signal                                        */\r
-       const SKP_int16                             Coef[],                 /* I:       ARMA coefficients [ 7 ]                 */\r
-       SKP_int32                                       len                             /* I:   Signal length                                           */\r
+       opus_int32                                          S[],                    /* I/O: State vector [ 4 ]                              */\r
+       opus_int16                                          out[],                  /* O:       Output signal                                       */\r
+       const opus_int16                                    in[],                       /* I:   Input signal                                        */\r
+       const opus_int16                                    Coef[],                 /* I:       ARMA coefficients [ 7 ]                 */\r
+       opus_int32                                      len                             /* I:   Signal length                                           */\r
 )\r
 {\r
-       SKP_int32 k;\r
-       SKP_int32 in_Q8, out1_Q8, out2_Q8, X;\r
+       opus_int32 k;\r
+       opus_int32 in_Q8, out1_Q8, out2_Q8, X;\r
 \r
        for( k = 0; k < len; k++ ) {\r
-        in_Q8  = SKP_LSHIFT32( (SKP_int32)in[ k ], 8 );\r
+        in_Q8  = SKP_LSHIFT32( (opus_int32)in[ k ], 8 );\r
 \r
         /* Outputs of first and second biquad */\r
         out1_Q8 = SKP_ADD_LSHIFT32( in_Q8,   S[ 0 ], 2 );\r
@@ -64,7 +64,7 @@ void silk_resampler_private_ARMA4(
         S[ 3 ] = SKP_SMLAWB( SKP_RSHIFT32( out1_Q8, 2 ), out2_Q8, Coef[ 5 ] );\r
 \r
         /* Apply gain and store to output. The coefficient is in Q16 */\r
-        out[ k ] = (SKP_int16)SKP_SAT16( SKP_RSHIFT32( SKP_SMLAWB( 128, out2_Q8, Coef[ 6 ] ), 8 ) );\r
+        out[ k ] = (opus_int16)SKP_SAT16( SKP_RSHIFT32( SKP_SMLAWB( 128, out2_Q8, Coef[ 6 ] ), 8 ) );\r
        }\r
 }\r
 \r