Renamed SKP_[u]int* to opus_[u]int*

This commit is contained in:
Jean-Marc Valin 2011-07-29 18:39:57 -04:00
parent d77d6a58fc
commit f9d14f8d77
164 changed files with 3297 additions and 3298 deletions

View file

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