Reland "Upconvert various types to int.", misc. codecs portion.

webrtc/modules/audio_coding/codecs/cng/webrtc_cng.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 18 matching lines @@
   int16_t dec_order;
   int16_t dec_target_scale_factor;  /* Q29 */
   int16_t dec_used_scale_factor;  /* Q29 */
   int16_t target_scale_factor;  /* Q13 */
   int16_t errorcode;
   int16_t initflag;
 } WebRtcCngDecoder;
 
 typedef struct WebRtcCngEncoder_ {
   int16_t enc_nrOfCoefs;
-  uint16_t enc_sampfreq;
+  int enc_sampfreq;
   int16_t enc_interval;
   int16_t enc_msSinceSID;
   int32_t enc_Energy;
   int16_t enc_reflCoefs[WEBRTC_CNG_MAX_LPC_ORDER + 1];
   int32_t enc_corrVector[WEBRTC_CNG_MAX_LPC_ORDER + 1];
   uint32_t enc_seed;
   int16_t errorcode;
   int16_t initflag;
 } WebRtcCngEncoder;
 
@@ skipping 85 matching lines @@
  *    - fs            : 8000 for narrowband and 16000 for wideband
  *    - interval      : generate SID data every interval ms
  *    - quality       : TBD
  *
  * Output:
  *    - cng_inst      : Initialized instance
  *
  * Return value       :  0 - Ok
  *                      -1 - Error
  */
-int16_t WebRtcCng_InitEnc(CNG_enc_inst* cng_inst, uint16_t fs, int16_t interval,
-                          int16_t quality) {
+int WebRtcCng_InitEnc(CNG_enc_inst* cng_inst, int fs, int16_t interval,
+                      int16_t quality) {
   int i;
   WebRtcCngEncoder* inst = (WebRtcCngEncoder*) cng_inst;
   memset(inst, 0, sizeof(WebRtcCngEncoder));
 
   /* Check LPC order */
   if (quality > WEBRTC_CNG_MAX_LPC_ORDER || quality <= 0) {
     inst->errorcode = CNG_DISALLOWED_LPC_ORDER;
     return -1;
   }
 
@@ skipping 63 matching lines @@
  *
  * Input:
  *    - cng_inst      : Pointer to created instance
  *    - speech        : Signal (noise) to be analyzed
  *    - nrOfSamples   : Size of speech vector
  *    - bytesOut      : Nr of bytes to transmit, might be 0
  *
  * Return value       :  0 - Ok
  *                      -1 - Error
  */
-int16_t WebRtcCng_Encode(CNG_enc_inst* cng_inst, int16_t* speech,
-                         int16_t nrOfSamples, uint8_t* SIDdata,
-                         int16_t* bytesOut, int16_t forceSID) {
+int WebRtcCng_Encode(CNG_enc_inst* cng_inst, int16_t* speech,
+                     int16_t nrOfSamples, uint8_t* SIDdata,
+                     int16_t* bytesOut, int16_t forceSID) {
   WebRtcCngEncoder* inst = (WebRtcCngEncoder*) cng_inst;
 
   int16_t arCoefs[WEBRTC_CNG_MAX_LPC_ORDER + 1];
   int32_t corrVector[WEBRTC_CNG_MAX_LPC_ORDER + 1];
   int16_t refCs[WEBRTC_CNG_MAX_LPC_ORDER + 1];
   int16_t hanningW[WEBRTC_CNG_MAX_OUTSIZE_ORDER];
   int16_t ReflBeta = 19661;  /* 0.6 in q15. */
   int16_t ReflBetaComp = 13107;  /* 0.4 in q15. */
   int32_t outEnergy;
   int outShifts;
@@ skipping 138 matching lines @@
     } else {
       for (i = 0; i < inst->enc_nrOfCoefs; i++) {
         /* Q15 to Q7 with rounding. */
         SIDdata[i + 1] = (127 + ((inst->enc_reflCoefs[i] + 128) >> 8));
       }
     }
 
     inst->enc_msSinceSID = 0;
     *bytesOut = inst->enc_nrOfCoefs + 1;
 
-    inst->enc_msSinceSID += (1000 * nrOfSamples) / inst->enc_sampfreq;
+    inst->enc_msSinceSID +=
+        (int16_t)((1000 * nrOfSamples) / inst->enc_sampfreq);
     return inst->enc_nrOfCoefs + 1;
   } else {
-    inst->enc_msSinceSID += (1000 * nrOfSamples) / inst->enc_sampfreq;
+    inst->enc_msSinceSID +=
+        (int16_t)((1000 * nrOfSamples) / inst->enc_sampfreq);
     *bytesOut = 0;
     return 0;
   }
 }
 
 /****************************************************************************
  * WebRtcCng_UpdateSid(...)
  *
  * These functions updates the CN state, when a new SID packet arrives
  *
@@ skipping 188 matching lines @@
   /* Typecast pointer to real structure. */
   WebRtcCngEncoder* inst = (WebRtcCngEncoder*) cng_inst;
   return inst->errorcode;
 }
 
 int16_t WebRtcCng_GetErrorCodeDec(CNG_dec_inst* cng_inst) {
   /* Typecast pointer to real structure. */
   WebRtcCngDecoder* inst = (WebRtcCngDecoder*) cng_inst;
   return inst->errorcode;
 }