Revert "Upconvert various types to int."

webrtc/modules/audio_coding/codecs/ilbc/test/iLBC_testLib.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 23 matching lines @@
 *
 *  Usage:
 *               exefile_name.exe <infile> <bytefile> <outfile>
 *
 *---------------------------------------------------------------*/
 
 int main(int argc, char* argv[])
 {
   FILE *ifileid,*efileid,*ofileid, *chfileid;
   short encoded_data[55], data[240], speechType;
-  int len;
-  short mode, pli;
+  short len, mode, pli;
   int blockcount = 0;
 
   IlbcEncoderInstance *Enc_Inst;
   IlbcDecoderInstance *Dec_Inst;
 #ifdef JUNK_DATA
   int i;
   FILE *seedfile;
   unsigned int random_seed = (unsigned int) time(NULL);//1196764538
 #endif
 
@@ skipping 115 matching lines @@
           fprintf(stderr, "Error. Channel file too short\n");
           exit(0);
         }
       } else {
         pli=1;
       }
 
       /* decoding */
       fprintf(stderr, "--- Decoding block %i --- ",blockcount);
       if (pli==1) {
-        len=WebRtcIlbcfix_Decode(Dec_Inst, encoded_data, (int16_t)len, data,
+        len=WebRtcIlbcfix_Decode(Dec_Inst, encoded_data, len, data,
                                  &speechType);
         if (len < 0) {
           fprintf(stderr, "Error decoding\n");
           exit(0);
         }
       } else {
         len=WebRtcIlbcfix_DecodePlc(Dec_Inst, data, 1);
       }
       fprintf(stderr, "\r");
 
@@ skipping 16 matching lines @@
   WebRtcIlbcfix_EncoderFree(Enc_Inst);
   WebRtcIlbcfix_DecoderFree(Dec_Inst);
 
   /* close files */
   fclose(ifileid);
   fclose(efileid);
   fclose(ofileid);
 
   return 0;
 }