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

webrtc/modules/audio_coding/codecs/ilbc/init_decode.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_InitDecode.c
 
 ******************************************************************/
 
 #include "defines.h"
 #include "constants.h"
 
 /*----------------------------------------------------------------*
  *  Initiation of decoder instance.
  *---------------------------------------------------------------*/
 
-int16_t WebRtcIlbcfix_InitDecode(  /* (o) Number of decoded samples */
+int WebRtcIlbcfix_InitDecode(  /* (o) Number of decoded samples */
     IlbcDecoder *iLBCdec_inst,  /* (i/o) Decoder instance */
     int16_t mode,  /* (i) frame size mode */
     int use_enhancer) {  /* (i) 1: use enhancer, 0: no enhancer */
   int i;
 
   iLBCdec_inst->mode = mode;
 
   /* Set all the variables that are dependent on the frame size mode */
   if (mode==30) {
     iLBCdec_inst->blockl = BLOCKL_30MS;
@@ skipping 50 matching lines @@
   iLBCdec_inst->use_enhancer = use_enhancer;
   WebRtcSpl_MemSetW16(iLBCdec_inst->enh_buf, 0, (ENH_BUFL+ENH_BUFL_FILTEROVERHEAD));
   for (i=0;i<ENH_NBLOCKS_TOT;i++) {
     iLBCdec_inst->enh_period[i]=160; /* Q(-4) */
   }
 
   iLBCdec_inst->prev_enh_pl = 0;
 
   return (iLBCdec_inst->blockl);
 }