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

webrtc/modules/audio_coding/codecs/isac/fix/test/kenny.cc

 /*
  *  Copyright (c) 2012 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 84 matching lines @@
 int main(int argc, char* argv[])
 {
 
   char inname[100], outname[100],  outbitsname[100], bottleneck_file[100];
   FILE *inp, *outp, *f_bn, *outbits;
   int endfile;
 
   int i, errtype, h = 0, k, packetLossPercent = 0;
   int16_t CodingMode;
   int16_t bottleneck;
-  int16_t framesize = 30;           /* ms */
+  int framesize = 30;           /* ms */
   int cur_framesmpls, err = 0, lostPackets = 0;
 
   /* Runtime statistics */
   double starttime, runtime, length_file;
 
   int16_t stream_len = 0;
-  int16_t framecnt, declen = 0;
+  int16_t framecnt;
+  int declen = 0;
   int16_t shortdata[FRAMESAMPLES_10ms];
   int16_t decoded[MAX_FRAMESAMPLES];
   uint16_t streamdata[500];
   int16_t speechType[1];
   int16_t prevFrameSize = 1;
   int16_t rateBPS = 0;
   int16_t fixedFL = 0;
   int16_t payloadSize = 0;
   int32_t payloadRate = 0;
   int setControlBWE = 0;
@@ skipping 637 matching lines @@
           }
           prevFrameSize = declen/480;
 
         } else {
 #ifdef WEBRTC_ISAC_FIX_NB_CALLS_ENABLED
           declen = WebRtcIsacfix_DecodeNb( ISAC_main_inst, streamdata,
                                            stream_len, decoded, speechType );
 #else
           declen = -1;
 #endif
-          prevFrameSize = declen/240;
+          prevFrameSize = static_cast<int16_t>(declen / 240);
         }
       }
 
       if (declen <= 0) {
         /* exit if returned with error */
         errtype=WebRtcIsacfix_GetErrorCode(ISAC_main_inst);
         printf("\nError in decoder: %d.\n", errtype);
       }
 
       /* Write decoded speech frame to file */
@@ skipping 46 matching lines @@
   fclose(inp);
   fclose(outp);
   fclose(outbits);
 
   if ( testCE == 1) {
     WebRtcIsacfix_FreeInternal(ISAC_main_inst);
   }
   WebRtcIsacfix_Free(ISAC_main_inst);
   return 0;
 }