| Index: webrtc/modules/audio_coding/codecs/ilbc/defines.h
|
| diff --git a/webrtc/modules/audio_coding/codecs/ilbc/defines.h b/webrtc/modules/audio_coding/codecs/ilbc/defines.h
|
| index 2d37e52650d85e363e29fc5c1d12792bfb03b558..5fcd4a01e48e531c7546cc593d90f1ef46e4d36e 100644
|
| --- a/webrtc/modules/audio_coding/codecs/ilbc/defines.h
|
| +++ b/webrtc/modules/audio_coding/codecs/ilbc/defines.h
|
| @@ -121,11 +121,11 @@ typedef struct iLBC_bits_t_ {
|
| int16_t lsf[LSF_NSPLIT*LPC_N_MAX];
|
| int16_t cb_index[CB_NSTAGES*(NASUB_MAX+1)]; /* First CB_NSTAGES values contains extra CB index */
|
| int16_t gain_index[CB_NSTAGES*(NASUB_MAX+1)]; /* First CB_NSTAGES values contains extra CB gain */
|
| - int16_t idxForMax;
|
| + size_t idxForMax;
|
| int16_t state_first;
|
| int16_t idxVec[STATE_SHORT_LEN_30MS];
|
| int16_t firstbits;
|
| - int16_t startIdx;
|
| + size_t startIdx;
|
| } iLBC_bits;
|
|
|
| /* type definition encoder instance */
|
| @@ -135,12 +135,12 @@ typedef struct IlbcEncoder_ {
|
| int16_t mode;
|
|
|
| /* basic parameters for different frame sizes */
|
| - int16_t blockl;
|
| - int16_t nsub;
|
| + size_t blockl;
|
| + size_t nsub;
|
| int16_t nasub;
|
| - int16_t no_of_bytes, no_of_words;
|
| + size_t no_of_bytes, no_of_words;
|
| int16_t lpc_n;
|
| - int16_t state_short_len;
|
| + size_t state_short_len;
|
|
|
| /* analysis filter state */
|
| int16_t anaMem[LPC_FILTERORDER];
|
| @@ -164,7 +164,7 @@ typedef struct IlbcEncoder_ {
|
| int16_t Nfor_flag;
|
| int16_t Nback_flag;
|
| int16_t start_pos;
|
| - int16_t diff;
|
| + size_t diff;
|
| #endif
|
|
|
| } IlbcEncoder;
|
| @@ -176,12 +176,12 @@ typedef struct IlbcDecoder_ {
|
| int16_t mode;
|
|
|
| /* basic parameters for different frame sizes */
|
| - int16_t blockl;
|
| - int16_t nsub;
|
| + size_t blockl;
|
| + size_t nsub;
|
| int16_t nasub;
|
| - int16_t no_of_bytes, no_of_words;
|
| + size_t no_of_bytes, no_of_words;
|
| int16_t lpc_n;
|
| - int16_t state_short_len;
|
| + size_t state_short_len;
|
|
|
| /* synthesis filter state */
|
| int16_t syntMem[LPC_FILTERORDER];
|
| @@ -190,14 +190,15 @@ typedef struct IlbcDecoder_ {
|
| int16_t lsfdeqold[LPC_FILTERORDER];
|
|
|
| /* pitch lag estimated in enhancer and used in PLC */
|
| - int last_lag;
|
| + size_t last_lag;
|
|
|
| /* PLC state information */
|
| int consPLICount, prev_enh_pl;
|
| int16_t perSquare;
|
|
|
| int16_t prevScale, prevPLI;
|
| - int16_t prevLag, prevLpc[LPC_FILTERORDER+1];
|
| + size_t prevLag;
|
| + int16_t prevLpc[LPC_FILTERORDER+1];
|
| int16_t prevResidual[NSUB_MAX*SUBL];
|
| int16_t seed;
|
|
|
|
|