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

webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.c

 /*
  *  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 381 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)
 {
   ISACFIX_SubStruct *ISAC_inst;
-  int16_t stream_len;
+  int stream_len;
 
   /* typecast pointer to rela structure */
   ISAC_inst = (ISACFIX_SubStruct *)ISAC_main_inst;
 
 
   /* check if encoder initiated */
   if ((ISAC_inst->initflag & 2) != 2) {
     ISAC_inst->errorcode = ISAC_ENCODER_NOT_INITIATED;
     return (-1);
   }
 
   stream_len = WebRtcIsacfix_EncodeImpl((int16_t*)speechIn,
                                         &ISAC_inst->ISACenc_obj,
                                         &ISAC_inst->bwestimator_obj,
                                         ISAC_inst->CodingMode);
   if (stream_len<0) {
-    ISAC_inst->errorcode = - stream_len;
+    ISAC_inst->errorcode = -(int16_t)stream_len;
     return -1;
   }
 
   write_be16(ISAC_inst->ISACenc_obj.bitstr_obj.stream, (size_t)stream_len,
              encoded);
   return stream_len;
 
 }
 
 
@@ skipping 325 matching lines @@
  *      - 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)
 {
   ISACFIX_SubStruct *ISAC_inst;
   /* number of samples (480 or 960), output from decoder */
   /* that were actually used in the encoder/decoder (determined on the fly) */
   int16_t     number_of_samples;
-  int16_t declen = 0;
+  int declen = 0;
 
   /* typecast pointer to real structure */
   ISAC_inst = (ISACFIX_SubStruct *)ISAC_main_inst;
 
   /* check if decoder initiated */
   if ((ISAC_inst->initflag & 1) != 1) {
     ISAC_inst->errorcode = ISAC_DECODER_NOT_INITIATED;
     return (-1);
   }
 
@@ skipping 12 matching lines @@
 
   read_be16(encoded, len, ISAC_inst->ISACdec_obj.bitstr_obj.stream);
 
   /* added for NetEq purposes (VAD/DTX related) */
   *speechType=1;
 
   declen = WebRtcIsacfix_DecodeImpl(decoded,&ISAC_inst->ISACdec_obj, &number_of_samples);
 
   if (declen < 0) {
     /* Some error inside the decoder */
-    ISAC_inst->errorcode = -declen;
+    ISAC_inst->errorcode = -(int16_t)declen;
     memset(decoded, 0, sizeof(int16_t) * MAX_FRAMESAMPLES);
     return -1;
   }
 
   /* error check */
 
   if (declen & 0x0001) {
     if (len != declen && len != declen + (((ISAC_inst->ISACdec_obj.bitstr_obj).stream[declen>>1]) & 0x00FF) ) {
       ISAC_inst->errorcode = ISAC_LENGTH_MISMATCH;
       memset(decoded, 0, sizeof(int16_t) * number_of_samples);
@@ skipping 29 matching lines @@
  *      - 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)
 {
   ISACFIX_SubStruct *ISAC_inst;
   /* twice the number of samples (480 or 960), output from decoder */
   /* that were actually used in the encoder/decoder (determined on the fly) */
   int16_t     number_of_samples;
-  int16_t declen = 0;
+  int declen = 0;
   int16_t dummy[FRAMESAMPLES/2];
 
 
   /* typecast pointer to real structure */
   ISAC_inst = (ISACFIX_SubStruct *)ISAC_main_inst;
 
   /* check if decoder initiated */
   if ((ISAC_inst->initflag & 1) != 1) {
     ISAC_inst->errorcode = ISAC_DECODER_NOT_INITIATED;
     return (-1);
@@ skipping 13 matching lines @@
 
   read_be16(encoded, len, ISAC_inst->ISACdec_obj.bitstr_obj.stream);
 
   /* added for NetEq purposes (VAD/DTX related) */
   *speechType=1;
 
   declen = WebRtcIsacfix_DecodeImpl(decoded,&ISAC_inst->ISACdec_obj, &number_of_samples);
 
   if (declen < 0) {
     /* Some error inside the decoder */
-    ISAC_inst->errorcode = -declen;
+    ISAC_inst->errorcode = -(int16_t)declen;
     memset(decoded, 0, sizeof(int16_t) * FRAMESAMPLES);
     return -1;
   }
 
   /* error check */
 
   if (declen & 0x0001) {
     if (len != declen && len != declen + (((ISAC_inst->ISACdec_obj.bitstr_obj).stream[declen>>1]) & 0x00FF) ) {
       ISAC_inst->errorcode = ISAC_LENGTH_MISMATCH;
       memset(decoded, 0, sizeof(int16_t) * number_of_samples);
@@ skipping 150 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)
 {
   ISACFIX_SubStruct *ISAC_inst;
   /* typecast pointer to real structure */
   ISAC_inst = (ISACFIX_SubStruct *)ISAC_main_inst;
 
   if (ISAC_inst->CodingMode == 0)
   {
     /* in adaptive mode */
     ISAC_inst->errorcode = ISAC_MODE_MISMATCH;
     return -1;
   }
 
 
   if (rate >= 10000 && rate <= 32000)
     ISAC_inst->ISACenc_obj.BottleNeck = rate;
   else {
     ISAC_inst->errorcode = ISAC_DISALLOWED_BOTTLENECK;
     return -1;
   }
 
 
 
   if (framesize  == 30 || framesize == 60)
-    ISAC_inst->ISACenc_obj.new_framelength = (FS/1000) * framesize;
+    ISAC_inst->ISACenc_obj.new_framelength = (int16_t)((FS/1000) * framesize);
   else {
     ISAC_inst->errorcode = ISAC_DISALLOWED_FRAME_LENGTH;
     return -1;
   }
 
   return 0;
 }
 
 
 /****************************************************************************
@@ skipping 14 matching lines @@
  *      - 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)
 {
   ISACFIX_SubStruct *ISAC_inst;
   /* Typecast pointer to real structure */
   ISAC_inst = (ISACFIX_SubStruct *)ISAC_main_inst;
 
   /* check if encoder initiated */
   if ((ISAC_inst->initflag & 2) != 2) {
     ISAC_inst->errorcode = ISAC_ENCODER_NOT_INITIATED;
     return (-1);
@@ skipping 13 matching lines @@
   /* if rateBPS is 0, keep the default initial bottleneck value (15000) */
   if ((rateBPS >= 10000) && (rateBPS <= 32000)) {
     ISAC_inst->bwestimator_obj.sendBwAvg = (((uint32_t)rateBPS) << 7);
   } else if (rateBPS != 0) {
     ISAC_inst->errorcode = ISAC_DISALLOWED_BOTTLENECK;
     return -1;
   }
 
   /* Set initial framesize. If enforceFrameSize is set the frame size will not change */
   if ((frameSizeMs  == 30) || (frameSizeMs == 60)) {
-    ISAC_inst->ISACenc_obj.new_framelength = (FS/1000) * frameSizeMs;
+    ISAC_inst->ISACenc_obj.new_framelength = (int16_t)((FS/1000) * frameSizeMs);
   } else {
     ISAC_inst->errorcode = ISAC_DISALLOWED_FRAME_LENGTH;
     return -1;
   }
 
   return 0;
 }
 
 
 
@@ skipping 336 matching lines @@
  *
  * Output:
  *      - version  : Pointer to character string
  *
  */
 
 void WebRtcIsacfix_version(char *version)
 {
   strcpy(version, "3.6.0");
 }