Prepare to convert various types to size_t.

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, Nback;
+  int n, meml_gotten, Nfor;
   int16_t diff, start_pos;
   int index;
   int subcount, subframe;
   int16_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;
@@ skipping 310 matching lines @@
     /* Packetize the parameters into the frame */
     WebRtcIlbcfix_PackBits (iLBCenc_inst->bytes, iLBCbits_inst, iLBCenc_inst->mode);
     WEBRTC_SPL_MEMCPY_W16 (weightdenumbuf, weightdenum,
                            SCRATCH_ENCODE_DATAVEC - SCRATCH_ENCODE_WEIGHTDENUM);
     return;
   }
 #endif
 
   /* backward prediction of subframes */
 
-  Nback = iLBCbits_inst->startIdx-1;
-
-  if( Nback > 0 ){
+  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;
     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 17 matching lines @@
     if (iLBCenc_inst->mode == 20)
     {
       start_count = 0;
       end_count = Nback;
     }
     if (iLBCenc_inst->mode == 30)
     {
       if (iLBCenc_inst->section == 1)
       {
         start_count = 0;
-        end_count = WEBRTC_SPL_MAX (2 - Nfor, 0);
+        end_count = (Nfor > 1) ? 0 : (2 - NFor);
       }
       if (iLBCenc_inst->section == 2)
       {
-        start_count = WEBRTC_SPL_MAX (2 - Nfor, 0);
+        start_count = (Nfor > 1) ? 0 : (2 - NFor);

[kwiberg-webrtc, 2015/06/10 07:49:10]

See previous comment.

[kwiberg-webrtc, 2015/06/10 07:49:10]

Nit: it'd be slightly easier to read if you said Nfor >= 2

[Peter Kasting, 2015/06/11 04:14:53]

Done (for both).

         end_count = Nback;
       }
     }
 #else
     start_count = 0;
     end_count = (int16_t)Nback;
 #endif
 
     /* loop over subframes to encode */
 
@@ skipping 67 matching lines @@
   }
   else
   {
     iLBCenc_inst->section++;
     WEBRTC_SPL_MEMCPY_W16 (weightdenumbuf, weightdenum,
                            SCRATCH_ENCODE_DATAVEC - SCRATCH_ENCODE_WEIGHTDENUM);
   }
 #endif
 
 }