Update audio code to use size_t more correctly,

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

 /*
  *  Copyright (c) 2012 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 30 matching lines @@
 /*----------------------------------------------------------------*
  *  main encoder function
  *---------------------------------------------------------------*/
 
 void WebRtcIlbcfix_EncodeImpl(
     uint16_t *bytes,     /* (o) encoded data bits iLBC */
     const int16_t *block, /* (i) speech vector to encode */
     IlbcEncoder *iLBCenc_inst /* (i/o) the general encoder
                                      state */
                           ){
-  int n, meml_gotten, Nfor;
-  int16_t diff, start_pos;
-  int index;
-  int subcount, subframe;
-  int16_t start_count, end_count;
+  size_t n, meml_gotten, Nfor;
+  size_t diff, start_pos;
+  size_t index;
+  size_t subcount, subframe;
+  size_t start_count, end_count;
   int16_t *residual;
   int32_t en1, en2;
   int16_t scale, max;
   int16_t *syntdenum;
   int16_t *decresidual;
   int16_t *reverseResidual;
   int16_t *reverseDecresidual;
   /* Stack based */
   int16_t weightdenum[(LPC_FILTERORDER + 1)*NSUB_MAX];
   int16_t dataVec[BLOCKL_MAX + LPC_FILTERORDER];
@@ skipping 13 matching lines @@
   /* Reuse som buffers to save stack memory */
   residual = &iLBCenc_inst->lpc_buffer[LPC_LOOKBACK+BLOCKL_MAX-iLBCenc_inst->blockl];
   syntdenum = mem;      /* syntdenum[(LPC_FILTERORDER + 1)*NSUB_MAX] and mem are used non overlapping in the code */
   decresidual = residual;     /* Already encoded residual is overwritten by the decoded version */
   reverseResidual = data;     /* data and reverseResidual are used non overlapping in the code */
   reverseDecresidual = reverseResidual; /* Already encoded residual is overwritten by the decoded version */
 
 #ifdef SPLIT_10MS
 
   WebRtcSpl_MemSetW16 (  (int16_t *) iLBCbits_inst, 0,
-                         (int16_t) (sizeof(iLBC_bits) / sizeof(int16_t))  );
+                         sizeof(iLBC_bits) / sizeof(int16_t)  );
 
   start_pos = iLBCenc_inst->start_pos;
   diff = iLBCenc_inst->diff;
 
   if (iLBCenc_inst->section != 0){
     WEBRTC_SPL_MEMCPY_W16 (weightdenum, weightdenumbuf,
                            SCRATCH_ENCODE_DATAVEC - SCRATCH_ENCODE_WEIGHTDENUM);
     /* Un-Packetize the frame into parameters */
     last_bit = WebRtcIlbcfix_UnpackBits (iLBCenc_inst->bytes, iLBCbits_inst, iLBCenc_inst->mode);
     if (last_bit)
@@ skipping 210 matching lines @@
     if (iLBCenc_inst->mode == 20)
     {
       start_count = 0;
       end_count = Nfor;
     }
     if (iLBCenc_inst->mode == 30)
     {
       if (iLBCenc_inst->section == 1)
       {
         start_count = 0;
-        end_count = WEBRTC_SPL_MIN (Nfor, 2);
+        end_count = WEBRTC_SPL_MIN (Nfor, ((size_t)2));
       }
       if (iLBCenc_inst->section == 2)
       {
-        start_count = WEBRTC_SPL_MIN (Nfor, 2);
+        start_count = WEBRTC_SPL_MIN (Nfor, ((size_t)2));
         end_count = Nfor;
       }
     }
 #else
     start_count = 0;
-    end_count = (int16_t)Nfor;
+    end_count = Nfor;
 #endif
 
     /* loop over subframes to encode */
 
     for (subframe = start_count; subframe < end_count; subframe++){
 
       /* encode subframe */
 
       WebRtcIlbcfix_CbSearch(iLBCenc_inst, iLBCbits_inst->cb_index+subcount*CB_NSTAGES,
                              iLBCbits_inst->gain_index+subcount*CB_NSTAGES,
                              &residual[(iLBCbits_inst->startIdx+1+subframe)*SUBL],
                              mem, MEM_LF_TBL, SUBL,
                              &weightdenum[(iLBCbits_inst->startIdx+1+subframe)*(LPC_FILTERORDER+1)],
-                             (int16_t)subcount);
+                             subcount);
 
       /* construct decoded vector */
 
       WebRtcIlbcfix_CbConstruct(&decresidual[(iLBCbits_inst->startIdx+1+subframe)*SUBL],
                                 iLBCbits_inst->cb_index+subcount*CB_NSTAGES,
                                 iLBCbits_inst->gain_index+subcount*CB_NSTAGES,
                                 mem, MEM_LF_TBL,
                                 SUBL
                                 );
 
@@ skipping 24 matching lines @@
 
   /* backward prediction of subframes */
 
   if (iLBCbits_inst->startIdx > 1) {
 
     /* create reverse order vectors
        (The decresidual does not need to be copied since it is
        contained in the same vector as the residual)
     */
 
-    int Nback = iLBCbits_inst->startIdx - 1;
+    size_t Nback = iLBCbits_inst->startIdx - 1;
     WebRtcSpl_MemCpyReversedOrder(&reverseResidual[Nback*SUBL-1], residual, Nback*SUBL);
 
     /* setup memory */
 
     meml_gotten = SUBL*(iLBCenc_inst->nsub+1-iLBCbits_inst->startIdx);
     if( meml_gotten > CB_MEML ) {
       meml_gotten=CB_MEML;
     }
 
     WebRtcSpl_MemCpyReversedOrder(&mem[CB_MEML-1], &decresidual[Nback*SUBL], meml_gotten);
@@ skipping 27 matching lines @@
         end_count = (Nfor >= 2) ? 0 : (2 - NFor);
       }
       if (iLBCenc_inst->section == 2)
       {
         start_count = (Nfor >= 2) ? 0 : (2 - NFor);
         end_count = Nback;
       }
     }
 #else
     start_count = 0;
-    end_count = (int16_t)Nback;
+    end_count = Nback;
 #endif
 
     /* loop over subframes to encode */
 
     for (subframe = start_count; subframe < end_count; subframe++){
 
       /* encode subframe */
 
       WebRtcIlbcfix_CbSearch(iLBCenc_inst, iLBCbits_inst->cb_index+subcount*CB_NSTAGES,
                              iLBCbits_inst->gain_index+subcount*CB_NSTAGES, &reverseResidual[subframe*SUBL],
                              mem, MEM_LF_TBL, SUBL,
                              &weightdenum[(iLBCbits_inst->startIdx-2-subframe)*(LPC_FILTERORDER+1)],
-                             (int16_t)subcount);
+                             subcount);
 
       /* construct decoded vector */
 
       WebRtcIlbcfix_CbConstruct(&reverseDecresidual[subframe*SUBL],
                                 iLBCbits_inst->cb_index+subcount*CB_NSTAGES,
                                 iLBCbits_inst->gain_index+subcount*CB_NSTAGES,
                                 mem, MEM_LF_TBL, SUBL
                                 );
 
       /* update memory */
@@ skipping 48 matching lines @@
   }
   else
   {
     iLBCenc_inst->section++;
     WEBRTC_SPL_MEMCPY_W16 (weightdenumbuf, weightdenum,
                            SCRATCH_ENCODE_DATAVEC - SCRATCH_ENCODE_WEIGHTDENUM);
   }
 #endif
 
 }