Revert "Upconvert various types to int."

webrtc/modules/audio_coding/codecs/ilbc/cb_mem_energy_augmentation.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.
  */
 
 /******************************************************************
 
  iLBC Speech Coder ANSI-C Source Code
 
  WebRtcIlbcfix_CbMemEnergyAugmentation.c
 
 ******************************************************************/
 
 #include "defines.h"
 #include "constants.h"
 
 void WebRtcIlbcfix_CbMemEnergyAugmentation(
     int16_t *interpSamples, /* (i) The interpolated samples */
     int16_t *CBmem,   /* (i) The CB memory */
-    int scale,   /* (i) The scaling of all energy values */
+    int16_t scale,   /* (i) The scaling of all energy values */
     int16_t base_size,  /* (i) Index to where the energy values should be stored */
     int16_t *energyW16,  /* (o) Energy in the CB vectors */
     int16_t *energyShifts /* (o) Shift value of the energy */
                                            ){
   int32_t energy, tmp32;
   int16_t *ppe, *pp, *interpSamplesPtr;
   int16_t *CBmemPtr, lagcount;
   int16_t *enPtr=&energyW16[base_size-20];
   int16_t *enShPtr=&energyShifts[base_size-20];
   int32_t nrjRecursive;
@@ skipping 21 matching lines @@
     energy += WebRtcSpl_DotProductWithScale(pp, pp, SUBL-lagcount, scale);
 
     /* Normalize the energy and store the number of shifts */
     (*enShPtr) = (int16_t)WebRtcSpl_NormW32(energy);
     tmp32 = energy << *enShPtr;
     *enPtr = (int16_t)(tmp32 >> 16);
     enShPtr++;
     enPtr++;
   }
 }