Revert "Upconvert various types to int."

webrtc/modules/audio_coding/codecs/isac/main/source/isac.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 476 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
  */
-int WebRtcIsac_Encode(ISACStruct* ISAC_main_inst,
-                      const int16_t* speechIn,
-                      uint8_t* encoded) {
+int16_t WebRtcIsac_Encode(ISACStruct* ISAC_main_inst,
+                          const int16_t* speechIn,
+                          uint8_t* encoded) {
   float inFrame[FRAMESAMPLES_10ms];
   int16_t speechInLB[FRAMESAMPLES_10ms];
   int16_t speechInUB[FRAMESAMPLES_10ms];
-  int streamLenLB = 0;
-  int streamLenUB = 0;
-  int streamLen = 0;
+  int16_t streamLenLB = 0;
+  int16_t streamLenUB = 0;
+  int16_t streamLen = 0;
   int16_t k = 0;
   int garbageLen = 0;
   int32_t bottleneck = 0;
   int16_t bottleneckIdx = 0;
   int16_t jitterInfo = 0;
 
   ISACMainStruct* instISAC = (ISACMainStruct*)ISAC_main_inst;
   ISACLBStruct* instLB = &(instISAC->instLB);
   ISACUBStruct* instUB = &(instISAC->instUB);
   const int16_t* speech_in_ptr = speechIn;
@@ skipping 78 matching lines @@
     }
 
     /* Add some noise to avoid denormal numbers. */
     inFrame[0] += (float)1.23455334e-3;
     inFrame[1] -= (float)2.04324239e-3;
     inFrame[2] += (float)1.90854954e-3;
     inFrame[9] += (float)1.84854878e-3;
 
     /* Tell to upper-band the number of bytes used so far.
      * This is for payload limitation. */
-    instUB->ISACencUB_obj.numBytesUsed =
-        (int16_t)(streamLenLB + 1 + LEN_CHECK_SUM_WORD8);
+    instUB->ISACencUB_obj.numBytesUsed = streamLenLB + 1 +
+                                         LEN_CHECK_SUM_WORD8;
     /* Encode upper-band. */
     switch (instISAC->bandwidthKHz) {
       case isac12kHz: {
         streamLenUB = WebRtcIsac_EncodeUb12(inFrame, &instUB->ISACencUB_obj,
                                             jitterInfo);
         break;
       }
       case isac16kHz: {
         streamLenUB = WebRtcIsac_EncodeUb16(inFrame, &instUB->ISACencUB_obj,
                                             jitterInfo);
@@ skipping 422 matching lines @@
                                      arr_ts, instISAC->encoderSamplingRateKHz,
                                      instISAC->decoderSamplingRateKHz);
   if (err < 0) {
     /* Return error code if something went wrong. */
     instISAC->errorCode = -err;
     return -1;
   }
   return 0;
 }
 
-static int Decode(ISACStruct* ISAC_main_inst,
-                  const uint8_t* encoded,
-                  int16_t lenEncodedBytes,
-                  int16_t* decoded,
-                  int16_t* speechType,
-                  int16_t isRCUPayload) {
+static int16_t Decode(ISACStruct* ISAC_main_inst,
+                      const uint8_t* encoded,
+                      int16_t lenEncodedBytes,
+                      int16_t* decoded,
+                      int16_t* speechType,
+                      int16_t isRCUPayload) {
   /* Number of samples (480 or 960), output from decoder
      that were actually used in the encoder/decoder
      (determined on the fly). */
   int16_t numSamplesLB;
   int16_t numSamplesUB;
   int16_t speechIdx;
   float outFrame[MAX_FRAMESAMPLES];
   int16_t outFrameLB[MAX_FRAMESAMPLES];
   int16_t outFrameUB[MAX_FRAMESAMPLES];
-  int numDecodedBytesLB;
-  int numDecodedBytesUB;
+  int16_t numDecodedBytesLB;
+  int16_t numDecodedBytesUB;
   int16_t lenEncodedLBBytes;
   int16_t validChecksum = 1;
   int16_t k;
   uint16_t numLayer;
   int16_t totSizeBytes;
   int16_t err;
 
   ISACMainStruct* instISAC = (ISACMainStruct*)ISAC_main_inst;
   ISACUBDecStruct* decInstUB = &(instISAC->instUB.ISACdecUB_obj);
   ISACLBDecStruct* decInstLB = &(instISAC->instLB.ISACdecLB_obj);
@@ skipping 268 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
  */
 
-int WebRtcIsac_Decode(ISACStruct* ISAC_main_inst,
-                      const uint8_t* encoded,
-                      int16_t lenEncodedBytes,
-                      int16_t* decoded,
-                      int16_t* speechType) {
+int16_t WebRtcIsac_Decode(ISACStruct* ISAC_main_inst,
+                          const uint8_t* encoded,
+                          int16_t lenEncodedBytes,
+                          int16_t* decoded,
+                          int16_t* speechType) {
   int16_t isRCUPayload = 0;
   return Decode(ISAC_main_inst, encoded, lenEncodedBytes, decoded,
                 speechType, isRCUPayload);
 }
 
 /****************************************************************************
  * WebRtcIsac_DecodeRcu(...)
  *
  * This function decodes a redundant (RCU) iSAC frame. Function is called in
  * NetEq with a stored RCU payload in case of packet loss. Output speech length
  * will be a multiple of 480 samples: 480 or 960 samples,
  * depending on the framesize (30 or 60 ms).
  *
  * Input:
  *      - ISAC_main_inst     : ISAC instance.
  *      - encoded            : encoded ISAC RCU frame(s)
  *      - len                : bytes in encoded vector
  *
  * Output:
  *      - decoded            : The decoded vector
  *
  * Return value              : >0 - number of samples in decoded vector
  *                             -1 - Error
  */
 
 
 
-int WebRtcIsac_DecodeRcu(ISACStruct* ISAC_main_inst,
-                         const uint8_t* encoded,
-                         int16_t lenEncodedBytes,
-                         int16_t* decoded,
-                         int16_t* speechType) {
+int16_t WebRtcIsac_DecodeRcu(ISACStruct* ISAC_main_inst,
+                             const uint8_t* encoded,
+                             int16_t lenEncodedBytes,
+                             int16_t* decoded,
+                             int16_t* speechType) {
   int16_t isRCUPayload = 1;
   return Decode(ISAC_main_inst, encoded, lenEncodedBytes, decoded,
                 speechType, isRCUPayload);
 }
 
 
 /****************************************************************************
  * WebRtcIsac_DecodePlc(...)
  *
  * This function conducts PLC for ISAC frame(s). Output speech length
@@ skipping 78 matching lines @@
   if ((rate >= 10000) && (rate <= 32000)) {
     instISAC->ISACencUB_obj.bottleneck = rate;
   } else {
     return -ISAC_DISALLOWED_BOTTLENECK;
   }
   return 0;
 }
 
 int16_t WebRtcIsac_Control(ISACStruct* ISAC_main_inst,
                            int32_t bottleneckBPS,
-                           int frameSize) {
+                           int16_t frameSize) {
   ISACMainStruct* instISAC = (ISACMainStruct*)ISAC_main_inst;
   int16_t status;
   double rateLB;
   double rateUB;
   enum ISACBandwidth bandwidthKHz;
 
   if (instISAC->codingMode == 0) {
     /* In adaptive mode. */
     instISAC->errorCode = ISAC_MODE_MISMATCH;
     return -1;
@@ skipping 20 matching lines @@
   }
 
   if ((instISAC->encoderSamplingRateKHz == kIsacSuperWideband) &&
       (frameSize != 30) &&
       (bandwidthKHz != isac8kHz)) {
     /* Cannot have 60 ms in super-wideband. */
     instISAC->errorCode = ISAC_DISALLOWED_FRAME_LENGTH;
     return -1;
   }
 
-  status = ControlLb(&instISAC->instLB, rateLB, (int16_t)frameSize);
+  status = ControlLb(&instISAC->instLB, rateLB, frameSize);
   if (status < 0) {
     instISAC->errorCode = -status;
     return -1;
   }
   if (bandwidthKHz != isac8kHz) {
     status = ControlUb(&(instISAC->instUB), rateUB);
     if (status < 0) {
       instISAC->errorCode = -status;
       return -1;
     }
@@ skipping 47 matching lines @@
  *        - 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 WebRtcIsac_ControlBwe(ISACStruct* ISAC_main_inst,
                               int32_t bottleneckBPS,
-                              int frameSizeMs,
+                              int16_t frameSizeMs,
                               int16_t enforceFrameSize) {
   ISACMainStruct* instISAC = (ISACMainStruct*)ISAC_main_inst;
   enum ISACBandwidth bandwidth;
 
    /* Check if encoder initiated */
   if ((instISAC->initFlag & BIT_MASK_ENC_INIT) !=
       BIT_MASK_ENC_INIT) {
     instISAC->errorCode = ISAC_ENCODER_NOT_INITIATED;
     return -1;
   }
@@ skipping 26 matching lines @@
       return -1;
     }
     instISAC->bwestimator_obj.send_bw_avg = (float)bottleneckBPS;
     instISAC->bandwidthKHz = bandwidth;
   }
 
   /* Set the initial frame-size. If 'enforceFrameSize' is set, the frame-size
    *  will not change */
   if (frameSizeMs != 0) {
     if ((frameSizeMs  == 30) || (frameSizeMs == 60)) {
-      instISAC->instLB.ISACencLB_obj.new_framelength =
-          (int16_t)((FS / 1000) * frameSizeMs);
+      instISAC->instLB.ISACencLB_obj.new_framelength = (FS / 1000) *
+          frameSizeMs;
     } else {
       instISAC->errorCode = ISAC_DISALLOWED_FRAME_LENGTH;
       return -1;
     }
   }
   return 0;
 }
 
 
 /****************************************************************************
@@ skipping 712 matching lines @@
  *        - ISAC_main_inst    : iSAC instance
  *
  * Return value               : sampling rate in Hertz. Decoder output is
  *                              sampled at this rate.
  *
  */
 uint16_t WebRtcIsac_DecSampRate(ISACStruct* ISAC_main_inst) {
   ISACMainStruct* instISAC = (ISACMainStruct*)ISAC_main_inst;
   return instISAC->decoderSamplingRateKHz == kIsacWideband ? 16000 : 32000;
 }