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

webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.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 432 matching lines @@
   }
 }
 
 
 
 
 /*
  * function to decode the complex spectrum from the bitstream
  * returns the total number of bytes in the stream
  */
-int16_t WebRtcIsacfix_DecodeSpec(Bitstr_dec *streamdata,
-                                 int16_t *frQ7,
-                                 int16_t *fiQ7,
-                                 int16_t AvgPitchGain_Q12)
+int WebRtcIsacfix_DecodeSpec(Bitstr_dec *streamdata,
+                             int16_t *frQ7,
+                             int16_t *fiQ7,
+                             int16_t AvgPitchGain_Q12)
 {
   int16_t  data[FRAMESAMPLES];
   int32_t  invARSpec2_Q16[FRAMESAMPLES/4];
   int16_t  ARCoefQ12[AR_ORDER+1];
   int16_t  RCQ15[AR_ORDER];
   int16_t  gainQ10;
   int32_t  gain2_Q10;
-  int16_t  len;
+  int len;
   int          k;
 
   /* create dither signal */
   GenerateDitherQ7(data, streamdata->W_upper, FRAMESAMPLES, AvgPitchGain_Q12); /* Dither is output in vector 'Data' */
 
   /* decode model parameters */
   if (WebRtcIsacfix_DecodeRcCoef(streamdata, RCQ15) < 0)
     return -ISAC_RANGE_ERROR_DECODE_SPECTRUM;
 
 
@@ skipping 1550 matching lines @@
 
     index_gQQ[k] = pos2QQ + WebRtcIsacfix_kQuantMinGain[k]; //ATTN: ok?
     if (index_gQQ[k] < 0) {
       index_gQQ[k] = 0;
     }
     else if (index_gQQ[k] > WebRtcIsacfix_kMaxIndGain[k]) {
       index_gQQ[k] = WebRtcIsacfix_kMaxIndGain[k];
     }
   }
 }