| Index: webrtc/modules/audio_coding/codecs/ilbc/decode.c
|
| diff --git a/webrtc/modules/audio_coding/codecs/ilbc/decode.c b/webrtc/modules/audio_coding/codecs/ilbc/decode.c
|
| index 9918de201ed4ff0e088d6de8f1665422fdb73acc..4c8497a568cc6635adb4a4b34bd525b3cc16d586 100644
|
| --- a/webrtc/modules/audio_coding/codecs/ilbc/decode.c
|
| +++ b/webrtc/modules/audio_coding/codecs/ilbc/decode.c
|
| @@ -44,7 +44,7 @@ void WebRtcIlbcfix_DecodeImpl(
|
| int16_t mode /* (i) 0: bad packet, PLC,
|
| 1: normal */
|
| ) {
|
| - int i;
|
| + size_t i;
|
| int16_t order_plus_one;
|
|
|
| int16_t last_bit;
|
| @@ -106,7 +106,7 @@ void WebRtcIlbcfix_DecodeImpl(
|
| WebRtcIlbcfix_DoThePlc(
|
| PLCresidual, PLClpc, 0, decresidual,
|
| syntdenum + (LPC_FILTERORDER + 1) * (iLBCdec_inst->nsub - 1),
|
| - (int16_t)(iLBCdec_inst->last_lag), iLBCdec_inst);
|
| + iLBCdec_inst->last_lag, iLBCdec_inst);
|
|
|
| /* Use the output from doThePLC */
|
| WEBRTC_SPL_MEMCPY_W16(decresidual, PLCresidual, iLBCdec_inst->blockl);
|
| @@ -122,7 +122,7 @@ void WebRtcIlbcfix_DecodeImpl(
|
| /* packet loss conceal */
|
|
|
| WebRtcIlbcfix_DoThePlc(PLCresidual, PLClpc, 1, decresidual, syntdenum,
|
| - (int16_t)(iLBCdec_inst->last_lag), iLBCdec_inst);
|
| + iLBCdec_inst->last_lag, iLBCdec_inst);
|
|
|
| WEBRTC_SPL_MEMCPY_W16(decresidual, PLCresidual, iLBCdec_inst->blockl);
|
|
|
| @@ -188,18 +188,18 @@ void WebRtcIlbcfix_DecodeImpl(
|
| WEBRTC_SPL_MEMCPY_W16(iLBCdec_inst->syntMem, &data[iLBCdec_inst->blockl-LPC_FILTERORDER], LPC_FILTERORDER);
|
|
|
| } else { /* Enhancer not activated */
|
| - int16_t lag;
|
| + size_t lag;
|
|
|
| /* Find last lag (since the enhancer is not called to give this info) */
|
| lag = 20;
|
| if (iLBCdec_inst->mode==20) {
|
| - lag = (int16_t)WebRtcIlbcfix_XcorrCoef(
|
| + lag = WebRtcIlbcfix_XcorrCoef(
|
| &decresidual[iLBCdec_inst->blockl-60],
|
| &decresidual[iLBCdec_inst->blockl-60-lag],
|
| 60,
|
| 80, lag, -1);
|
| } else {
|
| - lag = (int16_t)WebRtcIlbcfix_XcorrCoef(
|
| + lag = WebRtcIlbcfix_XcorrCoef(
|
| &decresidual[iLBCdec_inst->blockl-ENH_BLOCKL],
|
| &decresidual[iLBCdec_inst->blockl-ENH_BLOCKL-lag],
|
| ENH_BLOCKL,
|
|
|