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

webrtc/modules/audio_coding/codecs/isac/fix/source/arith_routines_logist.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 208 matching lines @@
  *      - envQ8             : side info vector defining the width of the pdf
  *                            in Q8
  *      - lenData           : data vector length
  *
  * Input/Output:
  *      - dataQ7            : input: dither vector, output: data vector
  *
  * Return value             : number of bytes in the stream so far
  *                            -1 if error detected
  */
-int16_t WebRtcIsacfix_DecLogisticMulti2(int16_t *dataQ7,
-                                        Bitstr_dec *streamData,
-                                        const int32_t *envQ8,
-                                        const int16_t lenData)
+int WebRtcIsacfix_DecLogisticMulti2(int16_t *dataQ7,
+                                    Bitstr_dec *streamData,
+                                    const int32_t *envQ8,
+                                    const int16_t lenData)
 {
   uint32_t    W_lower;
   uint32_t    W_upper;
   uint32_t    W_tmp;
   uint16_t    W_upper_LSB;
   uint16_t    W_upper_MSB;
   uint32_t    streamVal;
   uint16_t    cdfTmp;
   int32_t     res;
   int32_t     inSqrt;
@@ skipping 161 matching lines @@
   streamData->stream_index = streamPtr + offset - streamData->stream;
   streamData->W_upper = W_upper;
   streamData->streamval = streamVal;
 
   /* find number of bytes in original stream (determined by current interval width) */
   if ( W_upper > 0x01FFFFFF )
     return (streamData->stream_index*2 - 3 + !streamData->full);
   else
     return (streamData->stream_index*2 - 2 + !streamData->full);
 }