Renamed SKP_[u]int* to opus_[u]int*
[opus.git] / silk / silk_resampler_down3.c
index cf445f7..58169d5 100644 (file)
@@ -32,18 +32,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 \r
 /* Downsample by a factor 3, low quality */\r
 void silk_resampler_down3(\r
-    SKP_int32                           *S,         /* I/O: State vector [ 8 ]                  */\r
-    SKP_int16                           *out,       /* O:   Output signal [ floor(inLen/3) ]    */\r
-    const SKP_int16                     *in,        /* I:   Input signal [ inLen ]              */\r
-    SKP_int32                           inLen       /* I:   Number of input samples             */\r
+    opus_int32                           *S,         /* I/O: State vector [ 8 ]                  */\r
+    opus_int16                           *out,       /* O:   Output signal [ floor(inLen/3) ]    */\r
+    const opus_int16                     *in,        /* I:   Input signal [ inLen ]              */\r
+    opus_int32                           inLen       /* I:   Number of input samples             */\r
 )\r
 {\r
-       SKP_int32 nSamplesIn, counter, res_Q6;\r
-       SKP_int32 buf[ RESAMPLER_MAX_BATCH_SIZE_IN + ORDER_FIR ];\r
-       SKP_int32 *buf_ptr;\r
+       opus_int32 nSamplesIn, counter, res_Q6;\r
+       opus_int32 buf[ RESAMPLER_MAX_BATCH_SIZE_IN + ORDER_FIR ];\r
+       opus_int32 *buf_ptr;\r
 \r
        /* Copy buffered samples to start of buffer */  \r
-       SKP_memcpy( buf, S, ORDER_FIR * sizeof( SKP_int32 ) );\r
+       SKP_memcpy( buf, S, ORDER_FIR * sizeof( opus_int32 ) );\r
 \r
        /* Iterate over blocks of frameSizeIn input samples */\r
        while( 1 ) {\r
@@ -63,7 +63,7 @@ void silk_resampler_down3(
             res_Q6 = SKP_SMLAWB( res_Q6, SKP_ADD32( buf_ptr[ 2 ], buf_ptr[ 3 ] ), silk_Resampler_1_3_COEFS_LQ[ 4 ] );\r
 \r
             /* Scale down, saturate and store in output array */\r
-            *out++ = (SKP_int16)SKP_SAT16( SKP_RSHIFT_ROUND( res_Q6, 6 ) );\r
+            *out++ = (opus_int16)SKP_SAT16( SKP_RSHIFT_ROUND( res_Q6, 6 ) );\r
 \r
             buf_ptr += 3;\r
             counter -= 3;\r
@@ -74,12 +74,12 @@ void silk_resampler_down3(
 \r
                if( inLen > 0 ) {\r
                        /* More iterations to do; copy last part of filtered signal to beginning of buffer */\r
-                       SKP_memcpy( buf, &buf[ nSamplesIn ], ORDER_FIR * sizeof( SKP_int32 ) );\r
+                       SKP_memcpy( buf, &buf[ nSamplesIn ], ORDER_FIR * sizeof( opus_int32 ) );\r
                } else {\r
                        break;\r
                }\r
        }\r
 \r
        /* Copy last part of filtered signal to the state for the next call */\r
-       SKP_memcpy( S, &buf[ nSamplesIn ], ORDER_FIR * sizeof( SKP_int32 ) );\r
+       SKP_memcpy( S, &buf[ nSamplesIn ], ORDER_FIR * sizeof( opus_int32 ) );\r
 }\r