Reland "Upconvert various types to int.", ilbc portion.

webrtc/modules/audio_coding/codecs/ilbc/cb_mem_energy.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 16 matching lines @@
  *----------------------------------------------------------------*/
 
 void WebRtcIlbcfix_CbMemEnergy(
     int16_t range,
     int16_t *CB,   /* (i) The CB memory (1:st section) */
     int16_t *filteredCB,  /* (i) The filtered CB memory (2:nd section) */
     int16_t lMem,   /* (i) Length of the CB memory */
     int16_t lTarget,   /* (i) Length of the target vector */
     int16_t *energyW16,  /* (o) Energy in the CB vectors */
     int16_t *energyShifts, /* (o) Shift value of the energy */
-    int16_t scale,   /* (i) The scaling of all energy values */
+    int scale,   /* (i) The scaling of all energy values */
     int16_t base_size  /* (i) Index to where energy values should be stored */
                                ) {
   int16_t *ppi, *ppo, *pp;
   int32_t energy, tmp32;
 
   /* Compute the energy and store it in a vector. Also the
    * corresponding shift values are stored. The energy values
    * are reused in all three stages. */
 
   /* Calculate the energy in the first block of 'lTarget' sampels. */
@@ skipping 22 matching lines @@
   /* Normalize the energy and store the number of shifts */
   energyShifts[base_size] = (int16_t)WebRtcSpl_NormW32(energy);
   tmp32 = energy << energyShifts[base_size];
   energyW16[base_size] = (int16_t)(tmp32 >> 16);
 
   ppi = filteredCB + lMem - 1 - lTarget;
   ppo = filteredCB + lMem - 1;
 
   WebRtcIlbcfix_CbMemEnergyCalc(energy, range, ppi, ppo, energyW16, energyShifts, scale, base_size);
 }