Renamed SKP_[u]int* to opus_[u]int*
[opus.git] / silk / silk_decode_frame.c
index 3d508db..731bc83 100644 (file)
@@ -31,17 +31,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /****************/\r
 /* Decode frame */\r
 /****************/\r
-SKP_int silk_decode_frame(\r
+opus_int silk_decode_frame(\r
     silk_decoder_state      *psDec,             /* I/O  Pointer to Silk decoder state               */\r
     ec_dec                      *psRangeDec,        /* I/O  Compressor data structure                   */\r
-    SKP_int16                   pOut[],             /* O    Pointer to output speech frame              */\r
-    SKP_int32                   *pN,                /* O    Pointer to size of output frame             */\r
-    SKP_int                     lostFlag            /* I    0: no loss, 1 loss, 2 decode fec            */\r
+    opus_int16                   pOut[],             /* O    Pointer to output speech frame              */\r
+    opus_int32                   *pN,                /* O    Pointer to size of output frame             */\r
+    opus_int                     lostFlag            /* I    0: no loss, 1 loss, 2 decode fec            */\r
 )\r
 {\r
     silk_decoder_control sDecCtrl;\r
-    SKP_int         L, mv_len, ret = 0;\r
-    SKP_int         pulses[ MAX_FRAME_LENGTH ];\r
+    opus_int         L, mv_len, ret = 0;\r
+    opus_int         pulses[ MAX_FRAME_LENGTH ];\r
 \r
 TIC(DECODE_FRAME)\r
 \r
@@ -107,8 +107,8 @@ TOC(decode_core)
     /*************************/\r
     SKP_assert( psDec->ltp_mem_length >= psDec->frame_length );\r
     mv_len = psDec->ltp_mem_length - psDec->frame_length;\r
-    SKP_memmove( psDec->outBuf, &psDec->outBuf[ psDec->frame_length ], mv_len * sizeof(SKP_int16) );\r
-    SKP_memcpy( &psDec->outBuf[ mv_len ], pOut, psDec->frame_length * sizeof( SKP_int16 ) );\r
+    SKP_memmove( psDec->outBuf, &psDec->outBuf[ psDec->frame_length ], mv_len * sizeof(opus_int16) );\r
+    SKP_memcpy( &psDec->outBuf[ mv_len ], pOut, psDec->frame_length * sizeof( opus_int16 ) );\r
 \r
     /****************************************************************/\r
     /* Ensure smooth connection of extrapolated and good frames     */\r