zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WebRtc_Word32 => int32_t etc. in audio_coding/

Browse Source 
BUG=314

Review URL: https://webrtc-codereview.appspot.com/1271006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3789 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org
2013-04-09 00:28:06 +00:00
parent 6faf71d27b
commit 0946a56023
382 changed files with 8469 additions and 8488 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
webrtc/modules/audio_coding/neteq/interface/webrtc_neteq.h
View File

@ -111,25 +111,25 @@ enum WebRtcNetEQBGNMode
* API function calls for each codec
*/
typedef WebRtc_Word16 (*WebRtcNetEQ_FuncDecode)(void* state, WebRtc_Word16* encoded,
WebRtc_Word16 len, WebRtc_Word16* decoded,
WebRtc_Word16* speechType);
typedef WebRtc_Word16 (*WebRtcNetEQ_FuncDecodePLC)(void* state, WebRtc_Word16* decoded,
WebRtc_Word16 frames);
typedef WebRtc_Word16 (*WebRtcNetEQ_FuncDecodeInit)(void* state);
typedef WebRtc_Word16 (*WebRtcNetEQ_FuncAddLatePkt)(void* state, WebRtc_Word16* encoded,
WebRtc_Word16 len);
typedef WebRtc_Word16 (*WebRtcNetEQ_FuncGetMDinfo)(void* state);
typedef WebRtc_Word16 (*WebRtcNetEQ_FuncGetPitchInfo)(void* state, WebRtc_Word16* encoded,
WebRtc_Word16* length);
typedef WebRtc_Word16 (*WebRtcNetEQ_FuncUpdBWEst)(void* state, const WebRtc_UWord16 *encoded,
WebRtc_Word32 packet_size,
WebRtc_UWord16 rtp_seq_number,
WebRtc_UWord32 send_ts,
WebRtc_UWord32 arr_ts);
typedef int16_t (*WebRtcNetEQ_FuncDecode)(void* state, int16_t* encoded,
int16_t len, int16_t* decoded,
int16_t* speechType);
typedef int16_t (*WebRtcNetEQ_FuncDecodePLC)(void* state, int16_t* decoded,
int16_t frames);
typedef int16_t (*WebRtcNetEQ_FuncDecodeInit)(void* state);
typedef int16_t (*WebRtcNetEQ_FuncAddLatePkt)(void* state, int16_t* encoded,
int16_t len);
typedef int16_t (*WebRtcNetEQ_FuncGetMDinfo)(void* state);
typedef int16_t (*WebRtcNetEQ_FuncGetPitchInfo)(void* state, int16_t* encoded,
int16_t* length);
typedef int16_t (*WebRtcNetEQ_FuncUpdBWEst)(void* state, const uint16_t *encoded,
int32_t packet_size,
uint16_t rtp_seq_number,
uint32_t send_ts,
uint32_t arr_ts);
typedef int (*WebRtcNetEQ_FuncDurationEst)(void* state, const uint8_t* payload,
int payload_length_bytes);
typedef WebRtc_Word16 (*WebRtcNetEQ_FuncGetErrorCode)(void* state);
typedef int16_t (*WebRtcNetEQ_FuncGetErrorCode)(void* state);
/**********************************************************
* Structures
@ -138,7 +138,7 @@ typedef WebRtc_Word16 (*WebRtcNetEQ_FuncGetErrorCode)(void* state);
typedef struct
{
enum WebRtcNetEQDecoder codec;
WebRtc_Word16 payloadType;
int16_t payloadType;
WebRtcNetEQ_FuncDecode funcDecode;
WebRtcNetEQ_FuncDecode funcDecodeRCU;
WebRtcNetEQ_FuncDecodePLC funcDecodePLC;
@ -150,15 +150,15 @@ typedef struct
WebRtcNetEQ_FuncDurationEst funcDurationEst;
WebRtcNetEQ_FuncGetErrorCode funcGetErrorCode;
void* codec_state;
WebRtc_UWord16 codec_fs;
uint16_t codec_fs;
} WebRtcNetEQ_CodecDef;
typedef struct
{
WebRtc_UWord16 fraction_lost;
WebRtc_UWord32 cum_lost;
WebRtc_UWord32 ext_max;
WebRtc_UWord32 jitter;
uint16_t fraction_lost;
uint32_t cum_lost;
uint32_t ext_max;
uint32_t jitter;
} WebRtcNetEQ_RTCPStat;
/**********************************************************
@ -184,7 +184,7 @@ int WebRtcNetEQ_AssignBuffer(void *inst, int MaxNoOfPackets, void *NETEQ_Buffer_
/* Init functions */
int WebRtcNetEQ_Init(void *inst, WebRtc_UWord16 fs);
int WebRtcNetEQ_Init(void *inst, uint16_t fs);
int WebRtcNetEQ_SetAVTPlayout(void *inst, int PlayoutAVTon);
int WebRtcNetEQ_SetExtraDelay(void *inst, int DelayInMs);
int WebRtcNetEQ_SetPlayoutMode(void *inst, enum WebRtcNetEQPlayoutMode playoutMode);
@ -196,29 +196,29 @@ int WebRtcNetEQ_GetBGNMode(const void *inst, enum WebRtcNetEQBGNMode *bgnMode);
int WebRtcNetEQ_CodecDbReset(void *inst);
int WebRtcNetEQ_CodecDbAdd(void *inst, WebRtcNetEQ_CodecDef *codecInst);
int WebRtcNetEQ_CodecDbRemove(void *inst, enum WebRtcNetEQDecoder codec);
int WebRtcNetEQ_CodecDbGetSizeInfo(void *inst, WebRtc_Word16 *UsedEntries,
WebRtc_Word16 *MaxEntries);
int WebRtcNetEQ_CodecDbGetCodecInfo(void *inst, WebRtc_Word16 Entry,
int WebRtcNetEQ_CodecDbGetSizeInfo(void *inst, int16_t *UsedEntries,
int16_t *MaxEntries);
int WebRtcNetEQ_CodecDbGetCodecInfo(void *inst, int16_t Entry,
enum WebRtcNetEQDecoder *codec);
/* Real-time functions */
int WebRtcNetEQ_RecIn(void *inst, WebRtc_Word16 *p_w16datagramstart, WebRtc_Word16 w16_RTPlen,
WebRtc_UWord32 uw32_timeRec);
int WebRtcNetEQ_RecOut(void *inst, WebRtc_Word16 *pw16_outData, WebRtc_Word16 *pw16_len);
int WebRtcNetEQ_RecIn(void *inst, int16_t *p_w16datagramstart, int16_t w16_RTPlen,
uint32_t uw32_timeRec);
int WebRtcNetEQ_RecOut(void *inst, int16_t *pw16_outData, int16_t *pw16_len);
int WebRtcNetEQ_GetRTCPStats(void *inst, WebRtcNetEQ_RTCPStat *RTCP_inst);
int WebRtcNetEQ_GetRTCPStatsNoReset(void *inst, WebRtcNetEQ_RTCPStat *RTCP_inst);
int WebRtcNetEQ_GetSpeechTimeStamp(void *inst, WebRtc_UWord32 *timestamp);
int WebRtcNetEQ_GetSpeechTimeStamp(void *inst, uint32_t *timestamp);
int WebRtcNetEQ_GetSpeechOutputType(void *inst, enum WebRtcNetEQOutputType *outputType);
/* VQmon related functions */
int WebRtcNetEQ_VQmonRecOutStatistics(void *inst, WebRtc_UWord16 *validVoiceDurationMs,
WebRtc_UWord16 *concealedVoiceDurationMs,
WebRtc_UWord8 *concealedVoiceFlags);
int WebRtcNetEQ_VQmonGetConfiguration(void *inst, WebRtc_UWord16 *absMaxDelayMs,
WebRtc_UWord8 *adaptationRate);
int WebRtcNetEQ_VQmonGetRxStatistics(void *inst, WebRtc_UWord16 *avgDelayMs,
WebRtc_UWord16 *maxDelayMs);
int WebRtcNetEQ_VQmonRecOutStatistics(void *inst, uint16_t *validVoiceDurationMs,
uint16_t *concealedVoiceDurationMs,
uint8_t *concealedVoiceFlags);
int WebRtcNetEQ_VQmonGetConfiguration(void *inst, uint16_t *absMaxDelayMs,
uint8_t *adaptationRate);
int WebRtcNetEQ_VQmonGetRxStatistics(void *inst, uint16_t *avgDelayMs,
uint16_t *maxDelayMs);
#ifdef __cplusplus
}

26
webrtc/modules/audio_coding/neteq/interface/webrtc_neteq_internal.h
View File

@ -24,11 +24,11 @@ extern "C"
typedef struct
{
WebRtc_UWord8 payloadType;
WebRtc_UWord16 sequenceNumber;
WebRtc_UWord32 timeStamp;
WebRtc_UWord32 SSRC;
WebRtc_UWord8 markerBit;
uint8_t payloadType;
uint16_t sequenceNumber;
uint32_t timeStamp;
uint32_t SSRC;
uint8_t markerBit;
} WebRtcNetEQ_RTPInfo;
/****************************************************************************
@ -48,8 +48,8 @@ typedef struct
* -1 - Error
*/
int WebRtcNetEQ_RecInRTPStruct(void *inst, WebRtcNetEQ_RTPInfo *rtpInfo,
const WebRtc_UWord8 *payloadPtr, WebRtc_Word16 payloadLenBytes,
WebRtc_UWord32 timeRec);
const uint8_t *payloadPtr, int16_t payloadLenBytes,
uint32_t timeRec);
/****************************************************************************
* WebRtcNetEQ_GetMasterSlaveInfoSize(...)
@ -86,9 +86,9 @@ int WebRtcNetEQ_GetMasterSlaveInfoSize();
* -1 - Error
*/
int WebRtcNetEQ_RecOutMasterSlave(void *inst, WebRtc_Word16 *pw16_outData,
WebRtc_Word16 *pw16_len, void *msInfo,
WebRtc_Word16 isMaster);
int WebRtcNetEQ_RecOutMasterSlave(void *inst, int16_t *pw16_outData,
int16_t *pw16_len, void *msInfo,
int16_t isMaster);
typedef struct
{
@ -143,7 +143,7 @@ int WebRtcNetEQ_GetRawFrameWaitingTimes(void *inst,
typedef int (*WebRtcNetEQ_VADInitFunction)(void *VAD_inst);
typedef int (*WebRtcNetEQ_VADSetmodeFunction)(void *VAD_inst, int mode);
typedef int (*WebRtcNetEQ_VADFunction)(void *VAD_inst, int fs,
WebRtc_Word16 *frame, int frameLen);
int16_t *frame, int frameLen);
/****************************************************************************
* WebRtcNetEQ_SetVADInstance(...)
@ -210,8 +210,8 @@ int WebRtcNetEQ_SetVADMode(void *NetEQ_inst, int mode);
* -1 - Error
*/
int WebRtcNetEQ_RecOutNoDecode(void *inst, WebRtc_Word16 *pw16_outData,
WebRtc_Word16 *pw16_len);
int WebRtcNetEQ_RecOutNoDecode(void *inst, int16_t *pw16_outData,
int16_t *pw16_len);
/****************************************************************************
* WebRtcNetEQ_FlushBuffers(...)