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

webrtc/modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.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 10 matching lines @@
 /* Compute the energy of the rest of the cb memory
  * by step wise adding and subtracting the next
  * sample and the last sample respectively */
 void WebRtcIlbcfix_CbMemEnergyCalc(
     int32_t energy,   /* (i) input start energy */
     int16_t range,   /* (i) number of iterations */
     int16_t *ppi,   /* (i) input pointer 1 */
     int16_t *ppo,   /* (i) input pointer 2 */
     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 j,shft;
   int32_t tmp;
   int16_t *eSh_ptr;
   int16_t *eW16_ptr;
 
 
   eSh_ptr  = &energyShifts[1+base_size];
@@ skipping 13 matching lines @@
     /* Normalize the energy into a int16_t and store
        the number of shifts */
 
     shft = (int16_t)WebRtcSpl_NormW32(energy);
     *eSh_ptr++ = shft;
 
     tmp = energy << shft;
     *eW16_ptr++ = (int16_t)(tmp >> 16);
   }
 }