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

webrtc/modules/audio_coding/codecs/isac/fix/interface/isacfix.h

 /*
  *  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 110 matching lines @@
    *
    * Output:
    *      - encoded           : the encoded data vector
    *
    * Return value             : >0 - Length (in bytes) of coded data
    *                             0 - The buffer didn't reach the chosen framesize
    *                                 so it keeps buffering speech samples.
    *                            -1 - Error
    */
 
-  int16_t WebRtcIsacfix_Encode(ISACFIX_MainStruct *ISAC_main_inst,
-                               const int16_t *speechIn,
-                               uint8_t* encoded);
+  int WebRtcIsacfix_Encode(ISACFIX_MainStruct *ISAC_main_inst,
+                           const int16_t *speechIn,
+                           uint8_t* encoded);
 
 
 
   /****************************************************************************
    * WebRtcIsacfix_EncodeNb(...)
    *
    * This function encodes 10ms narrow band (8 kHz sampling) frame(s) and inserts
    * it into a package. Input speech length has to be 80 samples (10ms). The encoder
    * interpolates into wide-band (16 kHz sampling) buffers those
    * 10ms frames until it reaches the chosen Framesize (480 or 960 wide-band samples
@@ skipping 100 matching lines @@
    *      - encoded           : encoded ISAC frame(s)
    *      - len               : bytes in encoded vector
    *
    * Output:
    *      - decoded           : The decoded vector
    *
    * Return value             : >0 - number of samples in decoded vector
    *                            -1 - Error
    */
 
-  int16_t WebRtcIsacfix_Decode(ISACFIX_MainStruct *ISAC_main_inst,
-                               const uint8_t* encoded,
-                               int16_t len,
-                               int16_t *decoded,
-                               int16_t *speechType);
+  int WebRtcIsacfix_Decode(ISACFIX_MainStruct *ISAC_main_inst,
+                           const uint8_t* encoded,
+                           int16_t len,
+                           int16_t *decoded,
+                           int16_t *speechType);
 
 
   /****************************************************************************
    * WebRtcIsacfix_DecodeNb(...)
    *
    * This function decodes a ISAC frame in narrow-band (8 kHz sampling).
    * Output speech length will be a multiple of 240 samples: 240 or 480 samples,
    * depending on the framesize (30 or 60 ms).
    *
    * The function is enabled if WEBRTC_ISAC_FIX_NB_CALLS_ENABLED is defined
    *
    * Input:
    *      - ISAC_main_inst    : ISAC instance.
    *      - encoded           : encoded ISAC frame(s)
    *      - len               : bytes in encoded vector
    *
    * Output:
    *      - decoded           : The decoded vector
    *
    * Return value             : >0 - number of samples in decoded vector
    *                            -1 - Error
    */
 
 #ifdef WEBRTC_ISAC_FIX_NB_CALLS_ENABLED
-  int16_t WebRtcIsacfix_DecodeNb(ISACFIX_MainStruct *ISAC_main_inst,
-                                 const uint16_t *encoded,
-                                 int16_t len,
-                                 int16_t *decoded,
-                                 int16_t *speechType);
+  int WebRtcIsacfix_DecodeNb(ISACFIX_MainStruct *ISAC_main_inst,
+                             const uint16_t *encoded,
+                             int16_t len,
+                             int16_t *decoded,
+                             int16_t *speechType);
 #endif //  WEBRTC_ISAC_FIX_NB_CALLS_ENABLED
 
 
   /****************************************************************************
    * WebRtcIsacfix_DecodePlcNb(...)
    *
    * This function conducts PLC for ISAC frame(s) in narrow-band (8kHz sampling).
    * Output speech length  will be "240*noOfLostFrames" samples
    * that equevalent of "30*noOfLostFrames" millisecond.
    *
@@ skipping 73 matching lines @@
    *      - ISAC_main_inst    : ISAC instance.
    *      - rate              : limit on the short-term average bit rate,
    *                            in bits/second (between 10000 and 32000)
    *      - framesize         : number of milliseconds per frame (30 or 60)
    *
    * Return value             : 0  - ok
    *                           -1 - Error
    */
 
   int16_t WebRtcIsacfix_Control(ISACFIX_MainStruct *ISAC_main_inst,
-                                int16_t          rate,
-                                int16_t          framesize);
+                                int16_t rate,
+                                int framesize);
 
 
 
   /****************************************************************************
    * WebRtcIsacfix_ControlBwe(...)
    *
    * This function sets the initial values of bottleneck and frame-size if
    * iSAC is used in channel-adaptive mode. Through this API, users can
    * enforce a frame-size for all values of bottleneck. Then iSAC will not
    * automatically change the frame-size.
    *
    *
    * Input:
    *      - ISAC_main_inst    : ISAC instance.
    *      - rateBPS           : initial value of bottleneck in bits/second
    *                            10000 <= rateBPS <= 32000 is accepted
    *      - frameSizeMs       : number of milliseconds per frame (30 or 60)
    *      - enforceFrameSize  : 1 to enforce the given frame-size through out
    *                            the adaptation process, 0 to let iSAC change
    *                            the frame-size if required.
    *
    * Return value             : 0  - ok
    *                           -1 - Error
    */
 
   int16_t WebRtcIsacfix_ControlBwe(ISACFIX_MainStruct *ISAC_main_inst,
                                    int16_t rateBPS,
-                                   int16_t frameSizeMs,
+                                   int frameSizeMs,
                                    int16_t enforceFrameSize);
 
 
 
   /****************************************************************************
    * WebRtcIsacfix_version(...)
    *
    * This function returns the version number.
    *
    * Output:
@@ skipping 206 matching lines @@
   int16_t WebRtcIsacfix_GetNewFrameLen(ISACFIX_MainStruct *ISAC_main_inst);
 
 
 #if defined(__cplusplus)
 }
 #endif
 
 
 
 #endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_INTERFACE_ISACFIX_H_ */