Update audio code to use size_t more correctly,

webrtc/modules/audio_coding/codecs/ilbc/enhancer_interface.c

 /*
  *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 12 matching lines @@
 #include "xcorr_coef.h"
 #include "enhancer.h"
 #include "hp_output.h"
 
 
 
 /*----------------------------------------------------------------*
  * interface for enhancer
  *---------------------------------------------------------------*/
 
-int WebRtcIlbcfix_EnhancerInterface( /* (o) Estimated lag in end of in[] */
+size_t WebRtcIlbcfix_EnhancerInterface( /* (o) Estimated lag in end of in[] */
     int16_t *out,     /* (o) enhanced signal */
     int16_t *in,      /* (i) unenhanced signal */
     IlbcDecoder *iLBCdec_inst /* (i) buffers etc */
                                         ){
   int iblock;
-  int lag=20, tlag=20;
-  int inLen=iLBCdec_inst->blockl+120;
-  int16_t scale, scale1, plc_blockl;
+  size_t lag=20, tlag=20;
+  size_t inLen=iLBCdec_inst->blockl+120;
+  int16_t scale, scale1;
+  size_t plc_blockl;
   int16_t *enh_buf, *enh_period;
   int32_t tmp1, tmp2, max, new_blocks;
   int16_t *enh_bufPtr1;
-  int i, k;
+  size_t i;
+  int k;
   int16_t EnChange;
   int16_t SqrtEnChange;
   int16_t inc;
   int16_t win;
   int16_t *tmpW16ptr;
   int16_t startPos;
   int16_t *plc_pred;
   int16_t *target, *regressor;
   int16_t max16;
   int shifts;
   int32_t ener;
   int16_t enerSh;
   int16_t corrSh;
-  int16_t ind, sh;
+  size_t ind;
+  int16_t sh;
   int16_t start, stop;
   /* Stack based */
   int16_t totsh[3];
   int16_t downsampled[(BLOCKL_MAX+120)>>1]; /* length 180 */
   int32_t corr32[50];
   int32_t corrmax[3];
   int16_t corr16[3];
   int16_t en16[3];
   int16_t lagmax[3];
 
@@ skipping 91 matching lines @@
           ind = i;
         }
       } else {
         sh = WEBRTC_SPL_MIN(31, totsh[i]-totsh[ind]);
         if ((corr16[ind] * en16[i]) >> sh < corr16[i] * en16[ind]) {
           ind = i;
         }
       }
     }
 
-    lag = lagmax[ind] + 10;
+    lag = (size_t)(lagmax[ind] + 10);
 
     /* Store the estimated lag in the non-downsampled domain */
     enh_period[ENH_NBLOCKS_TOT - new_blocks + iblock] = (int16_t)(lag * 8);
 
     /* Store the estimated lag for backward PLC */
     if (iLBCdec_inst->prev_enh_pl==1) {
       if (!iblock) {
         tlag = lag * 2;
       }
     } else {
@@ skipping 35 matching lines @@
     if (iLBCdec_inst->prev_enh_pl==1) {
       if (lag>plc_blockl) {
         WEBRTC_SPL_MEMCPY_W16(plc_pred, &in[lag-plc_blockl], plc_blockl);
       } else {
         WEBRTC_SPL_MEMCPY_W16(&plc_pred[plc_blockl-lag], in, lag);
         WEBRTC_SPL_MEMCPY_W16(
             plc_pred, &enh_buf[ENH_BUFL-iLBCdec_inst->blockl-plc_blockl+lag],
             (plc_blockl-lag));
       }
     } else {
-      int pos;
+      size_t pos;
 
       pos = plc_blockl;
 
       while (lag<pos) {
         WEBRTC_SPL_MEMCPY_W16(&plc_pred[pos-lag], in, lag);
         pos = pos - lag;
       }
       WEBRTC_SPL_MEMCPY_W16(plc_pred, &in[lag-pos], pos);
 
     }
@@ skipping 35 matching lines @@
 
         tmp2=WEBRTC_SPL_SHIFT_W32(tmp2, (scale1));
         EnChange = (int16_t)WebRtcSpl_DivW32W16(tmp2,
                                                       (int16_t)tmp1);
 
         /* Calculate the Sqrt of the energy in Q15 ((14+16)/2) */
         SqrtEnChange = (int16_t)WebRtcSpl_SqrtFloor(EnChange << 14);
 
 
         /* Multiply first part of vector with 2*SqrtEnChange */
-        WebRtcSpl_ScaleVector(plc_pred, plc_pred, SqrtEnChange,
-                              (int16_t)(plc_blockl-16), 14);
+        WebRtcSpl_ScaleVector(plc_pred, plc_pred, SqrtEnChange, plc_blockl-16,
+                              14);
 
         /* Calculate increase parameter for window part (16 last samples) */
         /* (1-2*SqrtEnChange)/16 in Q15 */
         inc = 2048 - (SqrtEnChange >> 3);
 
         win=0;
         tmpW16ptr=&plc_pred[plc_blockl-16];
 
         for (i=16;i>0;i--) {
           *tmpW16ptr = (int16_t)(
@@ skipping 41 matching lines @@
           enh_bufPtr1,
           synt,
           &iLBCdec_inst->old_syntdenum[
               (iLBCdec_inst->nsub-1)*(LPC_FILTERORDER+1)],
           LPC_FILTERORDER+1, lag);
 
       WEBRTC_SPL_MEMCPY_W16(&synt[-LPC_FILTERORDER], &synt[lag-LPC_FILTERORDER],
                             LPC_FILTERORDER);
       WebRtcIlbcfix_HpOutput(synt, (int16_t*)WebRtcIlbcfix_kHpOutCoefs,
                              iLBCdec_inst->hpimemy, iLBCdec_inst->hpimemx,
-                             (int16_t)lag);
+                             lag);
       WebRtcSpl_FilterARFastQ12(
           enh_bufPtr1, synt,
           &iLBCdec_inst->old_syntdenum[
               (iLBCdec_inst->nsub-1)*(LPC_FILTERORDER+1)],
           LPC_FILTERORDER+1, lag);
 
       WEBRTC_SPL_MEMCPY_W16(iLBCdec_inst->syntMem, &synt[lag-LPC_FILTERORDER],
                             LPC_FILTERORDER);
       WebRtcIlbcfix_HpOutput(synt, (int16_t*)WebRtcIlbcfix_kHpOutCoefs,
                              iLBCdec_inst->hpimemy, iLBCdec_inst->hpimemx,
-                             (int16_t)lag);
+                             lag);
     }
   }
 
 
   /* Perform enhancement block by block */
 
   for (iblock = 0; iblock<new_blocks; iblock++) {
     WebRtcIlbcfix_Enhancer(out + iblock * ENH_BLOCKL,
                            enh_buf,
                            ENH_BUFL,
                            (int16_t)(iblock * ENH_BLOCKL + startPos),
                            enh_period,
                            (int16_t*)WebRtcIlbcfix_kEnhPlocs, ENH_NBLOCKS_TOT);
   }
 
   return (lag);
 }