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

Rename _t struct types in audio_coding.

Browse Source 
_t names are reserved in POSIX.

R=henrik.lundin@webrtc.org
BUG=162

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7933 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org
2014-12-17 15:23:29 +00:00
parent 209df9bf77
commit eb544460e4
51 changed files with 187 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
webrtc/modules/audio_coding/codecs/isac/fix/source/codec.h
View File

@ -33,19 +33,19 @@ int WebRtcIsacfix_EstimateBandwidth(BwEstimatorstr* bwest_str,
uint32_t arr_ts);
int16_t WebRtcIsacfix_DecodeImpl(int16_t* signal_out16,
ISACFIX_DecInst_t* ISACdec_obj,
IsacFixDecoderInstance* ISACdec_obj,
int16_t* current_framesamples);
int16_t WebRtcIsacfix_DecodePlcImpl(int16_t* decoded,
ISACFIX_DecInst_t* ISACdec_obj,
IsacFixDecoderInstance* ISACdec_obj,
int16_t* current_framesample );
int WebRtcIsacfix_EncodeImpl(int16_t* in,
ISACFIX_EncInst_t* ISACenc_obj,
IsacFixEncoderInstance* ISACenc_obj,
BwEstimatorstr* bw_estimatordata,
int16_t CodingMode);
int WebRtcIsacfix_EncodeStoredData(ISACFIX_EncInst_t* ISACenc_obj,
int WebRtcIsacfix_EncodeStoredData(IsacFixEncoderInstance* ISACenc_obj,
int BWnumber,
float scale);

2
webrtc/modules/audio_coding/codecs/isac/fix/source/decode.c
View File

@ -28,7 +28,7 @@
int16_t WebRtcIsacfix_DecodeImpl(int16_t *signal_out16,
ISACFIX_DecInst_t *ISACdec_obj,
IsacFixDecoderInstance *ISACdec_obj,
int16_t *current_framesamples)
{
int k;

2
webrtc/modules/audio_coding/codecs/isac/fix/source/decode_plc.c
View File

@ -236,7 +236,7 @@ static void LinearResampler( int16_t *in, int16_t *out, int16_t lenIn, int16_t l
int16_t WebRtcIsacfix_DecodePlcImpl(int16_t *signal_out16,
ISACFIX_DecInst_t *ISACdec_obj,
IsacFixDecoderInstance *ISACdec_obj,
int16_t *current_framesamples )
{
int subframecnt;

6
webrtc/modules/audio_coding/codecs/isac/fix/source/encode.c
View File

@ -32,7 +32,7 @@
int WebRtcIsacfix_EncodeImpl(int16_t *in,
ISACFIX_EncInst_t *ISACenc_obj,
IsacFixEncoderInstance *ISACenc_obj,
BwEstimatorstr *bw_estimatordata,
int16_t CodingMode)
{
@ -491,7 +491,7 @@ int WebRtcIsacfix_EncodeImpl(int16_t *in,
The same data as previously encoded with the fucntion WebRtcIsacfix_EncodeImpl()
is used. The data needed is taken from the struct, where it was stored
when calling the encoder. */
int WebRtcIsacfix_EncodeStoredData(ISACFIX_EncInst_t *ISACenc_obj,
int WebRtcIsacfix_EncodeStoredData(IsacFixEncoderInstance *ISACenc_obj,
int BWnumber,
float scale)
{
@ -503,7 +503,7 @@ int WebRtcIsacfix_EncodeStoredData(ISACFIX_EncInst_t *ISACenc_obj,
int16_t model;
const uint16_t *Q_PitchGain_cdf_ptr[1];
const uint16_t **cdf;
const ISAC_SaveEncData_t *SaveEnc_str;
const IsacSaveEncoderData *SaveEnc_str;
int32_t tmpLPCcoeffs_g[KLT_ORDER_GAIN<<1];
int16_t tmpLPCindex_g[KLT_ORDER_GAIN<<1];
int16_t tmp_fre[FRAMESAMPLES];

18
webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c
View File

@ -1059,7 +1059,7 @@ static int EstCodeLpcCoef(int32_t *LPCCoefQ17,
int16_t *model,
int32_t *sizeQ11,
Bitstr_enc *streamdata,
ISAC_SaveEncData_t* encData,
IsacSaveEncoderData* encData,
transcode_obj *transcodingParam) {
int j, k, n;
int16_t posQQ, pos2QQ, gainpos;
@ -1334,7 +1334,7 @@ static int EstCodeLpcCoef(int32_t *LPCCoefQ17,
int WebRtcIsacfix_EstCodeLpcGain(int32_t *gain_lo_hiQ17,
Bitstr_enc *streamdata,
ISAC_SaveEncData_t* encData) {
IsacSaveEncoderData* encData) {
int j, k;
int16_t posQQ, pos2QQ, gainpos;
int16_t posg;
@ -1440,7 +1440,7 @@ int WebRtcIsacfix_EncodeLpc(int32_t *gain_lo_hiQ17,
int16_t *model,
int32_t *sizeQ11,
Bitstr_enc *streamdata,
ISAC_SaveEncData_t* encData,
IsacSaveEncoderData* encData,
transcode_obj *transcodeParam)
{
int status = 0;
@ -1599,8 +1599,9 @@ int WebRtcIsacfix_DecodePitchGain(Bitstr_dec *streamdata, int16_t *PitchGains_Q1
/* quantize & code Pitch Gains */
int WebRtcIsacfix_EncodePitchGain(int16_t *PitchGains_Q12, Bitstr_enc *streamdata, ISAC_SaveEncData_t* encData)
{
int WebRtcIsacfix_EncodePitchGain(int16_t* PitchGains_Q12,
Bitstr_enc* streamdata,
IsacSaveEncoderData* encData) {
int k,j;
int16_t SQ15[PITCH_SUBFRAMES];
int16_t index[3];
@ -1754,9 +1755,10 @@ int WebRtcIsacfix_DecodePitchLag(Bitstr_dec *streamdata,
/* quantize & code Pitch Lags */
int WebRtcIsacfix_EncodePitchLag(int16_t *PitchLagsQ7,int16_t *PitchGain_Q12,
Bitstr_enc *streamdata, ISAC_SaveEncData_t* encData)
{
int WebRtcIsacfix_EncodePitchLag(int16_t* PitchLagsQ7,
int16_t* PitchGain_Q12,
Bitstr_enc* streamdata,
IsacSaveEncoderData* encData) {
int k, j;
int16_t index[PITCH_SUBFRAMES];
int32_t meangainQ12, CQ17;

8
webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.h
View File

@ -53,12 +53,12 @@ int WebRtcIsacfix_EncodeLpc(int32_t *gain_lo_hiQ17,
int16_t *model,
int32_t *sizeQ11,
Bitstr_enc *streamdata,
ISAC_SaveEncData_t* encData,
IsacSaveEncoderData* encData,
transcode_obj *transcodeParam);
int WebRtcIsacfix_EstCodeLpcGain(int32_t *gain_lo_hiQ17,
Bitstr_enc *streamdata,
ISAC_SaveEncData_t* encData);
IsacSaveEncoderData* encData);
/* decode & dequantize RC */
int WebRtcIsacfix_DecodeRcCoef(Bitstr_dec *streamdata,
int16_t *RCQ15);
@ -77,12 +77,12 @@ int WebRtcIsacfix_EncodeGain2(int32_t *gain2,
int WebRtcIsacfix_EncodePitchGain(int16_t *PitchGains_Q12,
Bitstr_enc *streamdata,
ISAC_SaveEncData_t* encData);
IsacSaveEncoderData* encData);
int WebRtcIsacfix_EncodePitchLag(int16_t *PitchLagQ7,
int16_t *PitchGain_Q12,
Bitstr_enc *streamdata,
ISAC_SaveEncData_t* encData);
IsacSaveEncoderData* encData);
int WebRtcIsacfix_DecodePitchGain(Bitstr_dec *streamdata,
int16_t *PitchGain_Q12);

2
webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.c
View File

@ -135,7 +135,7 @@ int16_t WebRtcIsacfix_CreateInternal(ISACFIX_MainStruct *ISAC_main_inst)
ISAC_inst = (ISACFIX_SubStruct *)ISAC_main_inst;
/* Allocate memory for storing encoder data */
ISAC_inst->ISACenc_obj.SaveEnc_ptr = malloc(1 * sizeof(ISAC_SaveEncData_t));
ISAC_inst->ISACenc_obj.SaveEnc_ptr = malloc(1 * sizeof(IsacSaveEncoderData));
if (ISAC_inst->ISACenc_obj.SaveEnc_ptr!=NULL) {
return(0);

12
webrtc/modules/audio_coding/codecs/isac/fix/source/structs.h
View File

@ -299,7 +299,7 @@ typedef struct {
/* Used in adaptive mode only */
int minBytes;
} ISAC_SaveEncData_t;
} IsacSaveEncoderData;
typedef struct {
@ -327,14 +327,14 @@ typedef struct {
PostFiltBankstr interpolatorstr_obj;
#endif
ISAC_SaveEncData_t *SaveEnc_ptr;
IsacSaveEncoderData *SaveEnc_ptr;
int16_t payloadLimitBytes30; /* Maximum allowed number of bits for a 30 msec packet */
int16_t payloadLimitBytes60; /* Maximum allowed number of bits for a 30 msec packet */
int16_t maxPayloadBytes; /* Maximum allowed number of bits for both 30 and 60 msec packet */
int16_t maxRateInBytes; /* Maximum allowed rate in bytes per 30 msec packet */
int16_t enforceFrameSize; /* If set iSAC will never change packet size */
} ISACFIX_EncInst_t;
} IsacFixEncoderInstance;
typedef struct {
@ -349,14 +349,14 @@ typedef struct {
PreFiltBankstr decimatorstr_obj;
#endif
} ISACFIX_DecInst_t;
} IsacFixDecoderInstance;
typedef struct {
ISACFIX_EncInst_t ISACenc_obj;
ISACFIX_DecInst_t ISACdec_obj;
IsacFixEncoderInstance ISACenc_obj;
IsacFixDecoderInstance ISACdec_obj;
BwEstimatorstr bwestimator_obj;
int16_t CodingMode; /* 0 = adaptive; 1 = instantaneous */
int16_t errorcode;

2
webrtc/modules/audio_coding/codecs/isac/main/source/codec.h
View File

@ -42,7 +42,7 @@ int WebRtcIsac_EncodeLb(float* in, ISACLBEncStruct* ISACencLB_obj,
int16_t codingMode, int16_t
bottleneckIndex);
int WebRtcIsac_EncodeStoredDataLb(const ISAC_SaveEncData_t* ISACSavedEnc_obj,
int WebRtcIsac_EncodeStoredDataLb(const IsacSaveEncoderData* ISACSavedEnc_obj,
Bitstr* ISACBitStr_obj, int BWnumber,
float scale);

2
webrtc/modules/audio_coding/codecs/isac/main/source/encode.c
View File

@ -1004,7 +1004,7 @@ int WebRtcIsac_EncodeUb12(float* in, ISACUBEncStruct* ISACencUB_obj,
The data needed is taken from the structure, where it was stored
when calling the encoder. */
int WebRtcIsac_EncodeStoredDataLb(const ISAC_SaveEncData_t* ISACSavedEnc_obj,
int WebRtcIsac_EncodeStoredDataLb(const IsacSaveEncoderData* ISACSavedEnc_obj,
Bitstr* ISACBitStr_obj, int BWnumber,
float scale) {
int ii;

10
webrtc/modules/audio_coding/codecs/isac/main/source/entropy_coding.c
View File

@ -995,7 +995,7 @@ int WebRtcIsac_DecodeLpcCoef(Bitstr* streamdata, double* LPCCoef) {
/* Encode LPC in LAR domain. */
void WebRtcIsac_EncodeLar(double* LPCCoef, Bitstr* streamdata,
ISAC_SaveEncData_t* encData) {
IsacSaveEncoderData* encData) {
int j, k, n, pos, pos2, poss, offss, offs2;
int index_s[KLT_ORDER_SHAPE];
int index_ovr_s[KLT_ORDER_SHAPE];
@ -1155,7 +1155,7 @@ void WebRtcIsac_EncodeLar(double* LPCCoef, Bitstr* streamdata,
void WebRtcIsac_EncodeLpcLb(double* LPCCoef_lo, double* LPCCoef_hi,
Bitstr* streamdata, ISAC_SaveEncData_t* encData) {
Bitstr* streamdata, IsacSaveEncoderData* encData) {
double lars[KLT_ORDER_GAIN + KLT_ORDER_SHAPE];
int k;
@ -1233,7 +1233,7 @@ int16_t WebRtcIsac_EncodeLpcUB(double* lpcVecs, Bitstr* streamdata,
void WebRtcIsac_EncodeLpcGainLb(double* LPCCoef_lo, double* LPCCoef_hi,
Bitstr* streamdata,
ISAC_SaveEncData_t* encData) {
IsacSaveEncoderData* encData) {
int j, k, n, pos, pos2, posg, offsg, offs2;
int index_g[KLT_ORDER_GAIN];
int index_ovr_g[KLT_ORDER_GAIN];
@ -1533,7 +1533,7 @@ int WebRtcIsac_DecodePitchGain(Bitstr* streamdata,
/* Quantize & code Pitch Gains. */
void WebRtcIsac_EncodePitchGain(int16_t* PitchGains_Q12,
Bitstr* streamdata,
ISAC_SaveEncData_t* encData) {
IsacSaveEncoderData* encData) {
int k, j;
double C;
double S[PITCH_SUBFRAMES];
@ -1678,7 +1678,7 @@ int WebRtcIsac_DecodePitchLag(Bitstr* streamdata, int16_t* PitchGain_Q12,
/* Quantize & code pitch lags. */
void WebRtcIsac_EncodePitchLag(double* PitchLags, int16_t* PitchGain_Q12,
Bitstr* streamdata,
ISAC_SaveEncData_t* encData) {
IsacSaveEncoderData* encData) {
int k, j;
double StepSize;
double C;

12
webrtc/modules/audio_coding/codecs/isac/main/source/entropy_coding.h
View File

@ -87,11 +87,11 @@ int WebRtcIsac_DecodeLpc(Bitstr* streamdata, double* LPCCoef_lo,
/* quantize & code LPC Coef */
void WebRtcIsac_EncodeLpcLb(double* LPCCoef_lo, double* LPCCoef_hi,
Bitstr* streamdata, ISAC_SaveEncData_t* encData);
Bitstr* streamdata, IsacSaveEncoderData* encData);
void WebRtcIsac_EncodeLpcGainLb(double* LPCCoef_lo, double* LPCCoef_hi,
Bitstr* streamdata,
ISAC_SaveEncData_t* encData);
IsacSaveEncoderData* encData);
/******************************************************************************
* WebRtcIsac_EncodeLpcUB()
@ -177,10 +177,12 @@ int WebRtcIsac_EncodeGain2(int32_t* gain2, Bitstr* streamdata);
void WebRtcIsac_EncodePitchGain(int16_t* PitchGains_Q12,
Bitstr* streamdata,
ISAC_SaveEncData_t* encData);
IsacSaveEncoderData* encData);
void WebRtcIsac_EncodePitchLag(double* PitchLags, int16_t* PitchGain_Q12,
Bitstr* streamdata, ISAC_SaveEncData_t* encData);
void WebRtcIsac_EncodePitchLag(double* PitchLags,
int16_t* PitchGain_Q12,
Bitstr* streamdata,
IsacSaveEncoderData* encData);
int WebRtcIsac_DecodePitchGain(Bitstr* streamdata,
int16_t* PitchGain_Q12);

4
webrtc/modules/audio_coding/codecs/isac/main/source/structs.h
View File

@ -290,7 +290,7 @@ typedef struct {
/* Used in adaptive mode only */
int minBytes;
} ISAC_SaveEncData_t;
} IsacSaveEncoderData;
typedef struct {
@ -315,7 +315,7 @@ typedef struct {
PitchFiltstr pitchfiltstr_obj;
PitchAnalysisStruct pitchanalysisstr_obj;
FFTstr fftstr_obj;
ISAC_SaveEncData_t SaveEnc_obj;
IsacSaveEncoderData SaveEnc_obj;
int buffer_index;
int16_t current_framesamples;