generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove or rename typedefs with _t prefixes.

Browse Source 
_t prefixes are reserved for additional typenames in POSIX.

R=henrik.lundin@webrtc.org, hta@webrtc.org, stefan@webrtc.org
BUG=162

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7931 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org
2014-12-17 13:43:55 +00:00
parent 5263c58923
commit e728ee03ba
16 changed files with 165 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
webrtc/modules/audio_coding/codecs/ilbc/ilbc.c
View File

@@ -24,9 +24,10 @@
#include "decode.h"
#include <stdlib.h>
int16_t WebRtcIlbcfix_EncoderAssign(iLBC_encinst_t **iLBC_encinst, int16_t *ILBCENC_inst_Addr, int16_t *size) {
*iLBC_encinst=(iLBC_encinst_t*)ILBCENC_inst_Addr;
int16_t WebRtcIlbcfix_EncoderAssign(IlbcEncoderInstance** iLBC_encinst,
int16_t* ILBCENC_inst_Addr,
int16_t* size) {
*iLBC_encinst=(IlbcEncoderInstance*)ILBCENC_inst_Addr;
*size=sizeof(iLBC_Enc_Inst_t)/sizeof(int16_t);
if (*iLBC_encinst!=NULL) {
return(0);
@@ -35,8 +36,10 @@ int16_t WebRtcIlbcfix_EncoderAssign(iLBC_encinst_t **iLBC_encinst, int16_t *ILBC
}
}
int16_t WebRtcIlbcfix_DecoderAssign(iLBC_decinst_t **iLBC_decinst, int16_t *ILBCDEC_inst_Addr, int16_t *size) {
*iLBC_decinst=(iLBC_decinst_t*)ILBCDEC_inst_Addr;
int16_t WebRtcIlbcfix_DecoderAssign(IlbcDecoderInstance** iLBC_decinst,
int16_t* ILBCDEC_inst_Addr,
int16_t* size) {
*iLBC_decinst=(IlbcDecoderInstance*)ILBCDEC_inst_Addr;
*size=sizeof(iLBC_Dec_Inst_t)/sizeof(int16_t);
if (*iLBC_decinst!=NULL) {
return(0);
@@ -45,8 +48,8 @@ int16_t WebRtcIlbcfix_DecoderAssign(iLBC_decinst_t **iLBC_decinst, int16_t *ILBC
}
}
int16_t WebRtcIlbcfix_EncoderCreate(iLBC_encinst_t **iLBC_encinst) {
*iLBC_encinst=(iLBC_encinst_t*)malloc(sizeof(iLBC_Enc_Inst_t));
int16_t WebRtcIlbcfix_EncoderCreate(IlbcEncoderInstance **iLBC_encinst) {
*iLBC_encinst=(IlbcEncoderInstance*)malloc(sizeof(iLBC_Enc_Inst_t));
if (*iLBC_encinst!=NULL) {
WebRtcSpl_Init();
return(0);
@@ -55,8 +58,8 @@ int16_t WebRtcIlbcfix_EncoderCreate(iLBC_encinst_t **iLBC_encinst) {
}
}
int16_t WebRtcIlbcfix_DecoderCreate(iLBC_decinst_t **iLBC_decinst) {
*iLBC_decinst=(iLBC_decinst_t*)malloc(sizeof(iLBC_Dec_Inst_t));
int16_t WebRtcIlbcfix_DecoderCreate(IlbcDecoderInstance **iLBC_decinst) {
*iLBC_decinst=(IlbcDecoderInstance*)malloc(sizeof(iLBC_Dec_Inst_t));
if (*iLBC_decinst!=NULL) {
WebRtcSpl_Init();
return(0);
@@ -65,19 +68,18 @@ int16_t WebRtcIlbcfix_DecoderCreate(iLBC_decinst_t **iLBC_decinst) {
}
}
int16_t WebRtcIlbcfix_EncoderFree(iLBC_encinst_t *iLBC_encinst) {
int16_t WebRtcIlbcfix_EncoderFree(IlbcEncoderInstance *iLBC_encinst) {
free(iLBC_encinst);
return(0);
}
int16_t WebRtcIlbcfix_DecoderFree(iLBC_decinst_t *iLBC_decinst) {
int16_t WebRtcIlbcfix_DecoderFree(IlbcDecoderInstance *iLBC_decinst) {
free(iLBC_decinst);
return(0);
}
int16_t WebRtcIlbcfix_EncoderInit(iLBC_encinst_t *iLBCenc_inst, int16_t mode)
{
int16_t WebRtcIlbcfix_EncoderInit(IlbcEncoderInstance* iLBCenc_inst,
int16_t mode) {
if ((mode==20)||(mode==30)) {
WebRtcIlbcfix_InitEncode((iLBC_Enc_Inst_t*) iLBCenc_inst, mode);
return(0);
@@ -86,7 +88,7 @@ int16_t WebRtcIlbcfix_EncoderInit(iLBC_encinst_t *iLBCenc_inst, int16_t mode)
}
}
int16_t WebRtcIlbcfix_Encode(iLBC_encinst_t* iLBCenc_inst,
int16_t WebRtcIlbcfix_Encode(IlbcEncoderInstance* iLBCenc_inst,
const int16_t* speechIn,
int16_t len,
uint8_t* encoded) {
@@ -120,7 +122,8 @@ int16_t WebRtcIlbcfix_Encode(iLBC_encinst_t* iLBCenc_inst,
}
}
int16_t WebRtcIlbcfix_DecoderInit(iLBC_decinst_t *iLBCdec_inst, int16_t mode) {
int16_t WebRtcIlbcfix_DecoderInit(IlbcDecoderInstance* iLBCdec_inst,
int16_t mode) {
if ((mode==20)||(mode==30)) {
WebRtcIlbcfix_InitDecode((iLBC_Dec_Inst_t*) iLBCdec_inst, mode, 1);
return(0);
@@ -128,17 +131,17 @@ int16_t WebRtcIlbcfix_DecoderInit(iLBC_decinst_t *iLBCdec_inst, int16_t mode) {
return(-1);
}
}
int16_t WebRtcIlbcfix_DecoderInit20Ms(iLBC_decinst_t *iLBCdec_inst) {
int16_t WebRtcIlbcfix_DecoderInit20Ms(IlbcDecoderInstance *iLBCdec_inst) {
WebRtcIlbcfix_InitDecode((iLBC_Dec_Inst_t*) iLBCdec_inst, 20, 1);
return(0);
}
int16_t WebRtcIlbcfix_Decoderinit30Ms(iLBC_decinst_t *iLBCdec_inst) {
int16_t WebRtcIlbcfix_Decoderinit30Ms(IlbcDecoderInstance *iLBCdec_inst) {
WebRtcIlbcfix_InitDecode((iLBC_Dec_Inst_t*) iLBCdec_inst, 30, 1);
return(0);
}
int16_t WebRtcIlbcfix_Decode(iLBC_decinst_t *iLBCdec_inst,
int16_t WebRtcIlbcfix_Decode(IlbcDecoderInstance *iLBCdec_inst,
const int16_t *encoded,
int16_t len,
int16_t *decoded,
@@ -157,7 +160,9 @@ int16_t WebRtcIlbcfix_Decode(iLBC_decinst_t *iLBCdec_inst,
if ((len==NO_OF_BYTES_30MS)||
(len==2*NO_OF_BYTES_30MS)||
(len==3*NO_OF_BYTES_30MS)) {
WebRtcIlbcfix_InitDecode(((iLBC_Dec_Inst_t*)iLBCdec_inst), 30, ((iLBC_Dec_Inst_t*)iLBCdec_inst)->use_enhancer);
WebRtcIlbcfix_InitDecode(
((iLBC_Dec_Inst_t*)iLBCdec_inst), 30,
((iLBC_Dec_Inst_t*)iLBCdec_inst)->use_enhancer);
} else {
/* Unsupported frame length */
return(-1);
@@ -166,7 +171,9 @@ int16_t WebRtcIlbcfix_Decode(iLBC_decinst_t *iLBCdec_inst,
if ((len==NO_OF_BYTES_20MS)||
(len==2*NO_OF_BYTES_20MS)||
(len==3*NO_OF_BYTES_20MS)) {
WebRtcIlbcfix_InitDecode(((iLBC_Dec_Inst_t*)iLBCdec_inst), 20, ((iLBC_Dec_Inst_t*)iLBCdec_inst)->use_enhancer);
WebRtcIlbcfix_InitDecode(
((iLBC_Dec_Inst_t*)iLBCdec_inst), 20,
((iLBC_Dec_Inst_t*)iLBCdec_inst)->use_enhancer);
} else {
/* Unsupported frame length */
return(-1);
@@ -175,7 +182,11 @@ int16_t WebRtcIlbcfix_Decode(iLBC_decinst_t *iLBCdec_inst,
}
while ((i*((iLBC_Dec_Inst_t*)iLBCdec_inst)->no_of_bytes)<len) {
WebRtcIlbcfix_DecodeImpl(&decoded[i*((iLBC_Dec_Inst_t*)iLBCdec_inst)->blockl], (const uint16_t*) &encoded[i*((iLBC_Dec_Inst_t*)iLBCdec_inst)->no_of_words], (iLBC_Dec_Inst_t*) iLBCdec_inst, 1);
WebRtcIlbcfix_DecodeImpl(
&decoded[i * ((iLBC_Dec_Inst_t*)iLBCdec_inst)->blockl],
(const uint16_t*)&encoded
[i * ((iLBC_Dec_Inst_t*)iLBCdec_inst)->no_of_words],
(iLBC_Dec_Inst_t*)iLBCdec_inst, 1);
i++;
}
/* iLBC does not support VAD/CNG yet */
@@ -183,7 +194,7 @@ int16_t WebRtcIlbcfix_Decode(iLBC_decinst_t *iLBCdec_inst,
return(i*((iLBC_Dec_Inst_t*)iLBCdec_inst)->blockl);
}
int16_t WebRtcIlbcfix_Decode20Ms(iLBC_decinst_t *iLBCdec_inst,
int16_t WebRtcIlbcfix_Decode20Ms(IlbcDecoderInstance *iLBCdec_inst,
const int16_t *encoded,
int16_t len,
int16_t *decoded,
@@ -199,7 +210,11 @@ int16_t WebRtcIlbcfix_Decode20Ms(iLBC_decinst_t *iLBCdec_inst,
}
while ((i*((iLBC_Dec_Inst_t*)iLBCdec_inst)->no_of_bytes)<len) {
WebRtcIlbcfix_DecodeImpl(&decoded[i*((iLBC_Dec_Inst_t*)iLBCdec_inst)->blockl], (const uint16_t*) &encoded[i*((iLBC_Dec_Inst_t*)iLBCdec_inst)->no_of_words], (iLBC_Dec_Inst_t*) iLBCdec_inst, 1);
WebRtcIlbcfix_DecodeImpl(
&decoded[i * ((iLBC_Dec_Inst_t*)iLBCdec_inst)->blockl],
(const uint16_t*)&encoded
[i * ((iLBC_Dec_Inst_t*)iLBCdec_inst)->no_of_words],
(iLBC_Dec_Inst_t*)iLBCdec_inst, 1);
i++;
}
/* iLBC does not support VAD/CNG yet */
@@ -207,7 +222,7 @@ int16_t WebRtcIlbcfix_Decode20Ms(iLBC_decinst_t *iLBCdec_inst,
return(i*((iLBC_Dec_Inst_t*)iLBCdec_inst)->blockl);
}
int16_t WebRtcIlbcfix_Decode30Ms(iLBC_decinst_t *iLBCdec_inst,
int16_t WebRtcIlbcfix_Decode30Ms(IlbcDecoderInstance *iLBCdec_inst,
const int16_t *encoded,
int16_t len,
int16_t *decoded,
@@ -223,7 +238,11 @@ int16_t WebRtcIlbcfix_Decode30Ms(iLBC_decinst_t *iLBCdec_inst,
}
while ((i*((iLBC_Dec_Inst_t*)iLBCdec_inst)->no_of_bytes)<len) {
WebRtcIlbcfix_DecodeImpl(&decoded[i*((iLBC_Dec_Inst_t*)iLBCdec_inst)->blockl], (const uint16_t*) &encoded[i*((iLBC_Dec_Inst_t*)iLBCdec_inst)->no_of_words], (iLBC_Dec_Inst_t*) iLBCdec_inst, 1);
WebRtcIlbcfix_DecodeImpl(
&decoded[i * ((iLBC_Dec_Inst_t*)iLBCdec_inst)->blockl],
(const uint16_t*)&encoded
[i * ((iLBC_Dec_Inst_t*)iLBCdec_inst)->no_of_words],
(iLBC_Dec_Inst_t*)iLBCdec_inst, 1);
i++;
}
/* iLBC does not support VAD/CNG yet */
@@ -231,19 +250,24 @@ int16_t WebRtcIlbcfix_Decode30Ms(iLBC_decinst_t *iLBCdec_inst,
return(i*((iLBC_Dec_Inst_t*)iLBCdec_inst)->blockl);
}
int16_t WebRtcIlbcfix_DecodePlc(iLBC_decinst_t *iLBCdec_inst, int16_t *decoded, int16_t noOfLostFrames) {
int16_t WebRtcIlbcfix_DecodePlc(IlbcDecoderInstance* iLBCdec_inst,
int16_t* decoded,
int16_t noOfLostFrames) {
int i;
uint16_t dummy;
for (i=0;i<noOfLostFrames;i++) {
/* call decoder */
WebRtcIlbcfix_DecodeImpl(&decoded[i*((iLBC_Dec_Inst_t*)iLBCdec_inst)->blockl], &dummy, (iLBC_Dec_Inst_t*) iLBCdec_inst, 0);
WebRtcIlbcfix_DecodeImpl(
&decoded[i * ((iLBC_Dec_Inst_t*)iLBCdec_inst)->blockl], &dummy,
(iLBC_Dec_Inst_t*)iLBCdec_inst, 0);
}
return (noOfLostFrames*((iLBC_Dec_Inst_t*)iLBCdec_inst)->blockl);
}
int16_t WebRtcIlbcfix_NetEqPlc(iLBC_decinst_t *iLBCdec_inst, int16_t *decoded, int16_t noOfLostFrames) {
int16_t WebRtcIlbcfix_NetEqPlc(IlbcDecoderInstance* iLBCdec_inst,
int16_t* decoded,
int16_t noOfLostFrames) {
/* Two input parameters not used, but needed for function pointers in NetEQ */
(void)(decoded = NULL);
(void)(noOfLostFrames = 0);

2
webrtc/modules/audio_coding/codecs/ilbc/interface/audio_encoder_ilbc.h
View File

@@ -48,7 +48,7 @@ class AudioEncoderIlbc : public AudioEncoder {
int num_10ms_frames_buffered_;
uint32_t first_timestamp_in_buffer_;
int16_t input_buffer_[kMaxSamplesPerPacket];
iLBC_encinst_t* encoder_;
IlbcEncoderInstance* encoder_;
};
} // namespace webrtc

45
webrtc/modules/audio_coding/codecs/ilbc/interface/ilbc.h
View File

@@ -29,9 +29,9 @@
* Customer has to cast instance to proper type
*/
typedef struct iLBC_encinst_t_ iLBC_encinst_t;
typedef struct iLBC_encinst_t_ IlbcEncoderInstance;
typedef struct iLBC_decinst_t_ iLBC_decinst_t;
typedef struct iLBC_decinst_t_ IlbcDecoderInstance;
/*
* Comfort noise constants
@@ -60,10 +60,10 @@ extern "C" {
* -1 - Error
*/
int16_t WebRtcIlbcfix_EncoderAssign(iLBC_encinst_t **iLBC_encinst,
int16_t WebRtcIlbcfix_EncoderAssign(IlbcEncoderInstance **iLBC_encinst,
int16_t *ILBCENC_inst_Addr,
int16_t *size);
int16_t WebRtcIlbcfix_DecoderAssign(iLBC_decinst_t **iLBC_decinst,
int16_t WebRtcIlbcfix_DecoderAssign(IlbcDecoderInstance **iLBC_decinst,
int16_t *ILBCDEC_inst_Addr,
int16_t *size);
@@ -80,8 +80,8 @@ extern "C" {
* -1 - Error
*/
int16_t WebRtcIlbcfix_EncoderCreate(iLBC_encinst_t **iLBC_encinst);
int16_t WebRtcIlbcfix_DecoderCreate(iLBC_decinst_t **iLBC_decinst);
int16_t WebRtcIlbcfix_EncoderCreate(IlbcEncoderInstance **iLBC_encinst);
int16_t WebRtcIlbcfix_DecoderCreate(IlbcDecoderInstance **iLBC_decinst);
/****************************************************************************
* WebRtcIlbcfix_XxxFree(...)
@@ -95,8 +95,8 @@ extern "C" {
* -1 - Error
*/
int16_t WebRtcIlbcfix_EncoderFree(iLBC_encinst_t *iLBC_encinst);
int16_t WebRtcIlbcfix_DecoderFree(iLBC_decinst_t *iLBC_decinst);
int16_t WebRtcIlbcfix_EncoderFree(IlbcEncoderInstance *iLBC_encinst);
int16_t WebRtcIlbcfix_DecoderFree(IlbcDecoderInstance *iLBC_decinst);
/****************************************************************************
@@ -113,7 +113,7 @@ extern "C" {
* -1 - Error
*/
int16_t WebRtcIlbcfix_EncoderInit(iLBC_encinst_t *iLBCenc_inst,
int16_t WebRtcIlbcfix_EncoderInit(IlbcEncoderInstance *iLBCenc_inst,
int16_t frameLen);
/****************************************************************************
@@ -135,7 +135,7 @@ extern "C" {
* -1 - Error
*/
int16_t WebRtcIlbcfix_Encode(iLBC_encinst_t *iLBCenc_inst,
int16_t WebRtcIlbcfix_Encode(IlbcEncoderInstance *iLBCenc_inst,
const int16_t *speechIn,
int16_t len,
uint8_t* encoded);
@@ -148,18 +148,17 @@ extern "C" {
* not needed to specify the frame length with a variable.
*
* Input:
* - iLBC_decinst_t : iLBC instance, i.e. the user that should receive
* be initialized
* - frameLen : The frame length of the codec 20/30 (ms)
* - IlbcDecoderInstance : iLBC decoder instance
* - frameLen : The frame length of the codec 20/30 (ms)
*
* Return value : 0 - Ok
* -1 - Error
* Return value : 0 - Ok
* -1 - Error
*/
int16_t WebRtcIlbcfix_DecoderInit(iLBC_decinst_t *iLBCdec_inst,
int16_t WebRtcIlbcfix_DecoderInit(IlbcDecoderInstance *iLBCdec_inst,
int16_t frameLen);
int16_t WebRtcIlbcfix_DecoderInit20Ms(iLBC_decinst_t *iLBCdec_inst);
int16_t WebRtcIlbcfix_Decoderinit30Ms(iLBC_decinst_t *iLBCdec_inst);
int16_t WebRtcIlbcfix_DecoderInit20Ms(IlbcDecoderInstance *iLBCdec_inst);
int16_t WebRtcIlbcfix_Decoderinit30Ms(IlbcDecoderInstance *iLBCdec_inst);
/****************************************************************************
* WebRtcIlbcfix_Decode(...)
@@ -181,17 +180,17 @@ extern "C" {
* -1 - Error
*/
int16_t WebRtcIlbcfix_Decode(iLBC_decinst_t *iLBCdec_inst,
int16_t WebRtcIlbcfix_Decode(IlbcDecoderInstance *iLBCdec_inst,
const int16_t* encoded,
int16_t len,
int16_t *decoded,
int16_t *speechType);
int16_t WebRtcIlbcfix_Decode20Ms(iLBC_decinst_t *iLBCdec_inst,
int16_t WebRtcIlbcfix_Decode20Ms(IlbcDecoderInstance *iLBCdec_inst,
const int16_t *encoded,
int16_t len,
int16_t *decoded,
int16_t *speechType);
int16_t WebRtcIlbcfix_Decode30Ms(iLBC_decinst_t *iLBCdec_inst,
int16_t WebRtcIlbcfix_Decode30Ms(IlbcDecoderInstance *iLBCdec_inst,
const int16_t *encoded,
int16_t len,
int16_t *decoded,
@@ -215,7 +214,7 @@ extern "C" {
* -1 - Error
*/
int16_t WebRtcIlbcfix_DecodePlc(iLBC_decinst_t *iLBCdec_inst,
int16_t WebRtcIlbcfix_DecodePlc(IlbcDecoderInstance *iLBCdec_inst,
int16_t *decoded,
int16_t noOfLostFrames);
@@ -237,7 +236,7 @@ extern "C" {
* -1 - Error
*/
int16_t WebRtcIlbcfix_NetEqPlc(iLBC_decinst_t *iLBCdec_inst,
int16_t WebRtcIlbcfix_NetEqPlc(IlbcDecoderInstance *iLBCdec_inst,
int16_t *decoded,
int16_t noOfLostFrames);

4
webrtc/modules/audio_coding/codecs/ilbc/test/iLBC_test.c
View File

@@ -52,8 +52,8 @@ int main(int argc, char* argv[])
int packetlosscount = 0;
int frameLen;
int16_t speechType;
iLBC_encinst_t *Enc_Inst;
iLBC_decinst_t *Dec_Inst;
IlbcEncoderInstance *Enc_Inst;
IlbcDecoderInstance *Dec_Inst;
#ifdef __ILBC_WITH_40BITACC
/* Doublecheck that long long exists */

4
webrtc/modules/audio_coding/codecs/ilbc/test/iLBC_testLib.c
View File

@@ -44,8 +44,8 @@ int main(int argc, char* argv[])
short len, mode, pli;
int blockcount = 0;
iLBC_encinst_t *Enc_Inst;
iLBC_decinst_t *Dec_Inst;
IlbcEncoderInstance *Enc_Inst;
IlbcDecoderInstance *Dec_Inst;
#ifdef JUNK_DATA
int i;
FILE *seedfile;

2
webrtc/modules/audio_coding/neteq/audio_decoder_impl.h
View File

@@ -119,7 +119,7 @@ class AudioDecoderIlbc : public AudioDecoder {
virtual int Init();
private:
iLBC_decinst_t* dec_state_;
IlbcDecoderInstance* dec_state_;
DISALLOW_COPY_AND_ASSIGN(AudioDecoderIlbc);
};
#endif

2
webrtc/modules/audio_coding/neteq/test/RTPencode.cc
View File

@@ -204,7 +204,7 @@ WebRtcVadInst *VAD_inst[2];
int16_t AMRWB_bitrate;
#endif
#ifdef CODEC_ILBC
iLBC_encinst_t *iLBCenc_inst[2];
IlbcEncoderInstance *iLBCenc_inst[2];
#endif
#ifdef CODEC_ISAC
ISACStruct *ISAC_inst[2];