Match existing type usage better.

webrtc/modules/audio_coding/codecs/ilbc/cb_search.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 90 matching lines @@
   WebRtcSpl_FilterARFastQ12(
       intarget, target,
       weightDenum, LPC_FILTERORDER+1, lTarget);
 
   /* Store target, towards the end codedVec is calculated as
      the initial target minus the remaining target */
   WEBRTC_SPL_MEMCPY_W16(codedVec, target, lTarget);
 
   /* Find the highest absolute value to calculate proper
      vector scale factor (so that it uses 12 bits) */
-  temp1 = WebRtcSpl_MaxAbsValueW16(buf, (int16_t)lMem);
-  temp2 = WebRtcSpl_MaxAbsValueW16(target, (int16_t)lTarget);
+  temp1 = WebRtcSpl_MaxAbsValueW16(buf, lMem);
+  temp2 = WebRtcSpl_MaxAbsValueW16(target, lTarget);
 
   if ((temp1>0)&&(temp2>0)) {
     temp1 = WEBRTC_SPL_MAX(temp1, temp2);
     scale = WebRtcSpl_GetSizeInBits((uint32_t)(temp1 * temp1));
   } else {
     /* temp1 or temp2 is negative (maximum was -32768) */
     scale = 30;
   }
 
   /* Scale to so that a mul-add 40 times does not overflow */
@@ skipping 203 matching lines @@
           WebRtcIlbcfix_CreateAugmentedVec((int16_t)(index[stage]-2*base_size+40),
                                            cbvectors+lMem, aug_vec);
           pp = aug_vec;
         }
       }
     }
 
     /* Subtract the best codebook vector, according
        to measure, from the target vector */
 
-    WebRtcSpl_AddAffineVectorToVector(target, pp, (int16_t)(-bestGain), (int32_t)8192, (int16_t)14, (int)lTarget);
+    WebRtcSpl_AddAffineVectorToVector(target, pp, (int16_t)(-bestGain),
+                                      (int32_t)8192, (int16_t)14, lTarget);
 
     /* record quantized gain */
     gains[stage+1] = bestGain;
 
   } /* end of Main Loop. for (stage=0;... */
 
   /* Calculte the coded vector (original target - what's left) */
   for (i=0;i<lTarget;i++) {
     codedVec[i]-=target[i];
   }
@@ skipping 40 matching lines @@
         j=i;
         WebRtcIlbcfix_kGainSq5_ptr = (int16_t*)&WebRtcIlbcfix_kGainSq5[i];
       }
     }
     gainPtr++;
   }
   gain_index[0]=j;
 
   return;
 }