Renamed SKP_[u]int* to opus_[u]int*
[opus.git] / silk / silk_API.h
index 24c530a..1d00dc9 100644 (file)
@@ -43,9 +43,9 @@ extern "C"
 \r
 /* Struct for TOC (Table of Contents) */\r
 typedef struct {\r
-    SKP_int     VADFlag;                                /* Voice activity for packet                            */\r
-    SKP_int     VADFlags[ SILK_MAX_FRAMES_PER_PACKET ]; /* Voice activity for each frame in packet              */\r
-    SKP_int     inbandFECFlag;                          /* Flag indicating if packet contains in-band FEC       */\r
+    opus_int     VADFlag;                                /* Voice activity for packet                            */\r
+    opus_int     VADFlags[ SILK_MAX_FRAMES_PER_PACKET ]; /* Voice activity for each frame in packet              */\r
+    opus_int     inbandFECFlag;                          /* Flag indicating if packet contains in-band FEC       */\r
 } silk_TOC_struct;\r
 \r
 /****************************************/\r
@@ -55,14 +55,14 @@ typedef struct {
 /***********************************************/\r
 /* Get size in bytes of the Silk encoder state */\r
 /***********************************************/\r
-SKP_int silk_Get_Encoder_Size(                          /* O:   Returns error code                              */\r
-    SKP_int32                           *encSizeBytes   /* O:   Number of bytes in SILK encoder state           */\r
+opus_int silk_Get_Encoder_Size(                          /* O:   Returns error code                              */\r
+    opus_int32                           *encSizeBytes   /* O:   Number of bytes in SILK encoder state           */\r
 );\r
 \r
 /*************************/\r
 /* Init or reset encoder */\r
 /*************************/\r
-SKP_int silk_InitEncoder(                               /* O:   Returns error code                              */\r
+opus_int silk_InitEncoder(                               /* O:   Returns error code                              */\r
     void                                *encState,      /* I/O: State                                           */\r
     silk_EncControlStruct               *encStatus      /* O:   Encoder Status                                  */\r
 );\r
@@ -70,7 +70,7 @@ SKP_int silk_InitEncoder(                               /* O:   Returns error co
 /***************************************/\r
 /* Read control structure from encoder */\r
 /***************************************/\r
-SKP_int silk_QueryEncoder(                              /* O:   Returns error code                              */\r
+opus_int silk_QueryEncoder(                              /* O:   Returns error code                              */\r
     const void                          *encState,      /* I:   State                                           */\r
     silk_EncControlStruct               *encStatus      /* O:   Encoder Status                                  */\r
 );\r
@@ -80,14 +80,14 @@ SKP_int silk_QueryEncoder(                              /* O:   Returns error co
 /**************************/\r
 /* Note: if prefillFlag is set, the input must contain 10 ms of audio, irrespective of what                                    */\r
 /* encControl->payloadSize_ms is set to                                                                                                                                                */\r
-SKP_int silk_Encode(                                    /* O:   Returns error code                              */\r
+opus_int silk_Encode(                                    /* O:   Returns error code                              */\r
     void                                *encState,      /* I/O: State                                           */\r
     silk_EncControlStruct               *encControl,    /* I:   Control status                                  */\r
-    const SKP_int16                     *samplesIn,     /* I:   Speech sample input vector                      */\r
-    SKP_int                             nSamplesIn,     /* I:   Number of samples in input vector               */\r
+    const opus_int16                     *samplesIn,     /* I:   Speech sample input vector                      */\r
+    opus_int                             nSamplesIn,     /* I:   Number of samples in input vector               */\r
     ec_enc                              *psRangeEnc,    /* I/O  Compressor data structure                       */\r
-    SKP_int32                           *nBytesOut,     /* I/O: Number of bytes in payload (input: Max bytes)   */\r
-    const SKP_int                       prefillFlag     /* I:   Flag to indicate prefilling buffers no coding   */\r
+    opus_int32                           *nBytesOut,     /* I/O: Number of bytes in payload (input: Max bytes)   */\r
+    const opus_int                       prefillFlag     /* I:   Flag to indicate prefilling buffers no coding   */\r
 );\r
 \r
 /****************************************/\r
@@ -97,37 +97,37 @@ SKP_int silk_Encode(                                    /* O:   Returns error co
 /***********************************************/\r
 /* Get size in bytes of the Silk decoder state */\r
 /***********************************************/\r
-SKP_int silk_Get_Decoder_Size(                          /* O:   Returns error code                              */\r
-    SKP_int32                           *decSizeBytes   /* O:   Number of bytes in SILK decoder state           */\r
+opus_int silk_Get_Decoder_Size(                          /* O:   Returns error code                              */\r
+    opus_int32                           *decSizeBytes   /* O:   Number of bytes in SILK decoder state           */\r
 );\r
 \r
 /*************************/\r
 /* Init or Reset decoder */\r
 /*************************/\r
-SKP_int silk_InitDecoder(                               /* O:   Returns error code                              */\r
+opus_int silk_InitDecoder(                               /* O:   Returns error code                              */\r
     void                                *decState       /* I/O: State                                           */\r
 );\r
 \r
 /******************/\r
 /* Decode a frame */\r
 /******************/\r
-SKP_int silk_Decode(                                    /* O:   Returns error code                              */\r
+opus_int silk_Decode(                                    /* O:   Returns error code                              */\r
     void*                               decState,       /* I/O: State                                           */\r
     silk_DecControlStruct*              decControl,     /* I/O: Control Structure                               */\r
-    SKP_int                             lostFlag,       /* I:   0: no loss, 1 loss, 2 decode fec                */\r
-    SKP_int                             newPacketFlag,  /* I:   Indicates first decoder call for this packet    */\r
+    opus_int                             lostFlag,       /* I:   0: no loss, 1 loss, 2 decode fec                */\r
+    opus_int                             newPacketFlag,  /* I:   Indicates first decoder call for this packet    */\r
     ec_dec                              *psRangeDec,    /* I/O  Compressor data structure                       */\r
-    SKP_int16                           *samplesOut,    /* O:   Decoded output speech vector                    */\r
-    SKP_int32                           *nSamplesOut    /* O:   Number of samples decoded                       */\r
+    opus_int16                           *samplesOut,    /* O:   Decoded output speech vector                    */\r
+    opus_int32                           *nSamplesOut    /* O:   Number of samples decoded                       */\r
 );\r
 \r
 /**************************************/\r
 /* Get table of contents for a packet */\r
 /**************************************/\r
-SKP_int silk_get_TOC(\r
-    const SKP_uint8                     *payload,           /* I    Payload data                                */\r
-    const SKP_int                       nBytesIn,           /* I:   Number of input bytes                       */\r
-    const SKP_int                       nFramesPerPayload,  /* I:   Number of SILK frames per payload           */\r
+opus_int silk_get_TOC(\r
+    const opus_uint8                     *payload,           /* I    Payload data                                */\r
+    const opus_int                       nBytesIn,           /* I:   Number of input bytes                       */\r
+    const opus_int                       nFramesPerPayload,  /* I:   Number of SILK frames per payload           */\r
     silk_TOC_struct                     *Silk_TOC           /* O:   Type of content                             */\r
 );\r
 \r