Match existing type usage better.

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 80 matching lines @@
     startPos=440;  /* Start position for enhancement
                     (640-new_blocks*ENH_BLOCKL-40) */
   }
 
   /* Update the pitch prediction for each enhancer block, move the old ones */
   memmove(enh_period, &enh_period[new_blocks],
           (ENH_NBLOCKS_TOT - new_blocks) * sizeof(*enh_period));
 
   k=WebRtcSpl_DownsampleFast(
       enh_buf+ENH_BUFL-inLen,    /* Input samples */
-      (int16_t)(inLen+ENH_BUFL_FILTEROVERHEAD),
+      inLen + ENH_BUFL_FILTEROVERHEAD,
       downsampled,
-      (int16_t)(inLen / 2),
+      inLen / 2,
       (int16_t*)WebRtcIlbcfix_kLpFiltCoefs,  /* Coefficients in Q12 */
       FILTERORDER_DS_PLUS1,    /* Length of filter (order-1) */
       FACTOR_DS,
       DELAY_DS);
 
   /* Estimate the pitch in the down sampled domain. */
   for(iblock = 0; iblock<new_blocks; iblock++){
 
     /* references */
     i = 60 + iblock * ENH_BLOCKL_HALF;
     target=downsampled+i;
     regressor=downsampled+i-10;
 
     /* scaling */
-    max16=WebRtcSpl_MaxAbsValueW16(&regressor[-50],
-                                   (int16_t)(ENH_BLOCKL_HALF+50-1));
+    max16=WebRtcSpl_MaxAbsValueW16(&regressor[-50], ENH_BLOCKL_HALF + 50 - 1);

[kwiberg-webrtc, 2015/06/08 13:09:38]

Optional: fix formatting on the whole line while you're touching it.

[Peter Kasting, 2015/06/08 20:44:29]

I can do that for all three places in this file.

[Peter Kasting, 2015/06/10 01:09:54]

Done.

     shifts = WebRtcSpl_GetSizeInBits((uint32_t)(max16 * max16)) - 25;
     shifts = WEBRTC_SPL_MAX(0, shifts);
 
     /* compute cross correlation */
     WebRtcSpl_CrossCorrelation(corr32, target, regressor,
                                ENH_BLOCKL_HALF, 50, (int16_t)shifts, -1);
 
     /* Find 3 highest correlations that should be compared for the
        highest (corr*corr)/ener */
 
@@ skipping 63 matching lines @@
 
     /* Calculate the best lag of the new frame
        This is used to interpolate backwards and mix with the PLC'd data
     */
 
     /* references */
     target=in;
     regressor=in+tlag-1;
 
     /* scaling */
-    max16=WebRtcSpl_MaxAbsValueW16(regressor, (int16_t)(plc_blockl+3-1));
+    max16=WebRtcSpl_MaxAbsValueW16(regressor, plc_blockl + 3 - 1);
     if (max16>5000)
       shifts=2;
     else
       shifts=0;
 
     /* compute cross correlation */
     WebRtcSpl_CrossCorrelation(corr32, target, regressor,
                                plc_blockl, 3, (int16_t)shifts, 1);
 
     /* find lag */
@@ skipping 118 matching lines @@
       WebRtcSpl_MemSetW16(iLBCdec_inst->hpimemx, 0, 2);
 
       /* Initialize filter memory by filtering through 2 lags */
       WEBRTC_SPL_MEMCPY_W16(&synt[-LPC_FILTERORDER], iLBCdec_inst->syntMem,
                             LPC_FILTERORDER);
       WebRtcSpl_FilterARFastQ12(
           enh_bufPtr1,
           synt,
           &iLBCdec_inst->old_syntdenum[
                                        (iLBCdec_inst->nsub-1)*(LPC_FILTERORDER+1)],
-                                       LPC_FILTERORDER+1, (int16_t)lag);
+                                       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);
       WebRtcSpl_FilterARFastQ12(
           enh_bufPtr1, synt,
           &iLBCdec_inst->old_syntdenum[
                                        (iLBCdec_inst->nsub-1)*(LPC_FILTERORDER+1)],
-                                       LPC_FILTERORDER+1, (int16_t)lag);
+                                       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);
     }
   }
 
 
   /* 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);
 }