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

webrtc/modules/audio_coding/codecs/ilbc/interface/ilbc.h

 /*
  *  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 117 matching lines @@
    *      - speechIn          : Input speech vector
    *      - len               : Samples in speechIn (160, 240, 320 or 480)
    *
    * Output:
    *  - encoded               : The encoded data vector
    *
    * Return value             : >0 - Length (in bytes) of coded data
    *                            -1 - Error
    */
 
-  int16_t WebRtcIlbcfix_Encode(IlbcEncoderInstance *iLBCenc_inst,
-                               const int16_t *speechIn,
-                               int16_t len,
-                               uint8_t* encoded);
+  int WebRtcIlbcfix_Encode(IlbcEncoderInstance *iLBCenc_inst,
+                           const int16_t *speechIn,
+                           int16_t len,
+                           uint8_t* encoded);
 
   /****************************************************************************
    * WebRtcIlbcfix_DecoderInit(...)
    *
    * This function initializes a iLBC instance with either 20 or 30 ms frames
    * Alternatively the WebRtcIlbcfix_DecoderInit_XXms can be used. Then it's
    * not needed to specify the frame length with a variable.
    *
    * Input:
    *      - IlbcDecoderInstance : iLBC decoder instance
@@ skipping 21 matching lines @@
    *      - len               : Bytes in encoded vector
    *
    * Output:
    *      - decoded           : The decoded vector
    *      - speechType        : 1 normal, 2 CNG
    *
    * Return value             : >0 - Samples in decoded vector
    *                            -1 - Error
    */
 
-  int16_t WebRtcIlbcfix_Decode(IlbcDecoderInstance* iLBCdec_inst,
+  int WebRtcIlbcfix_Decode(IlbcDecoderInstance* iLBCdec_inst,
+                           const uint8_t* encoded,
+                           int16_t len,
+                           int16_t* decoded,
+                           int16_t* speechType);
+  int WebRtcIlbcfix_Decode20Ms(IlbcDecoderInstance* iLBCdec_inst,
                                const uint8_t* encoded,
                                int16_t len,
                                int16_t* decoded,
                                int16_t* speechType);
-  int16_t WebRtcIlbcfix_Decode20Ms(IlbcDecoderInstance* iLBCdec_inst,
-                                   const uint8_t* encoded,
-                                   int16_t len,
-                                   int16_t* decoded,
-                                   int16_t* speechType);
-  int16_t WebRtcIlbcfix_Decode30Ms(IlbcDecoderInstance* iLBCdec_inst,
-                                   const uint8_t* encoded,
-                                   int16_t len,
-                                   int16_t* decoded,
-                                   int16_t* speechType);
+  int WebRtcIlbcfix_Decode30Ms(IlbcDecoderInstance* iLBCdec_inst,
+                               const uint8_t* encoded,
+                               int16_t len,
+                               int16_t* decoded,
+                               int16_t* speechType);
 
   /****************************************************************************
    * WebRtcIlbcfix_DecodePlc(...)
    *
    * This function conducts PLC for iLBC frame(s). Output speech length
    * will be a multiple of 160 or 240 samples.
    *
    * Input:
    *      - iLBCdec_inst      : iLBC instance, i.e. the user that should perform
    *                            a PLC
@@ skipping 41 matching lines @@
    *      - version           : Version number of iLBC (maximum 20 char)
    */
 
   void WebRtcIlbcfix_version(char *version);
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif