Revert "Upconvert various types to int."

webrtc/modules/audio_coding/codecs/ilbc/ilbc.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 70 matching lines @@
 int16_t WebRtcIlbcfix_EncoderInit(IlbcEncoderInstance* iLBCenc_inst,
                                   int16_t mode) {
   if ((mode==20)||(mode==30)) {
     WebRtcIlbcfix_InitEncode((IlbcEncoder*) iLBCenc_inst, mode);
     return(0);
   } else {
     return(-1);
   }
 }
 
-int WebRtcIlbcfix_Encode(IlbcEncoderInstance* iLBCenc_inst,
-                         const int16_t* speechIn,
-                         int16_t len,
-                         uint8_t* encoded) {
+int16_t WebRtcIlbcfix_Encode(IlbcEncoderInstance* iLBCenc_inst,
+                             const int16_t* speechIn,
+                             int16_t len,
+                             uint8_t* encoded) {
   int16_t pos = 0;
   int16_t encpos = 0;
 
   if ((len != ((IlbcEncoder*)iLBCenc_inst)->blockl) &&
 #ifdef SPLIT_10MS
       (len != 80) &&
 #endif
       (len != 2*((IlbcEncoder*)iLBCenc_inst)->blockl) &&
       (len != 3*((IlbcEncoder*)iLBCenc_inst)->blockl))
   {
@@ skipping 29 matching lines @@
 int16_t WebRtcIlbcfix_DecoderInit20Ms(IlbcDecoderInstance *iLBCdec_inst) {
   WebRtcIlbcfix_InitDecode((IlbcDecoder*) iLBCdec_inst, 20, 1);
   return(0);
 }
 int16_t WebRtcIlbcfix_Decoderinit30Ms(IlbcDecoderInstance *iLBCdec_inst) {
   WebRtcIlbcfix_InitDecode((IlbcDecoder*) iLBCdec_inst, 30, 1);
   return(0);
 }
 
 
-int WebRtcIlbcfix_Decode(IlbcDecoderInstance* iLBCdec_inst,
-                         const uint8_t* encoded,
-                         int16_t len,
-                         int16_t* decoded,
-                         int16_t* speechType)
+int16_t WebRtcIlbcfix_Decode(IlbcDecoderInstance* iLBCdec_inst,
+                             const uint8_t* encoded,
+                             int16_t len,
+                             int16_t* decoded,
+                             int16_t* speechType)
 {
   int i=0;
   /* Allow for automatic switching between the frame sizes
      (although you do get some discontinuity) */
   if ((len==((IlbcDecoder*)iLBCdec_inst)->no_of_bytes)||
       (len==2*((IlbcDecoder*)iLBCdec_inst)->no_of_bytes)||
       (len==3*((IlbcDecoder*)iLBCdec_inst)->no_of_bytes)) {
     /* ok, do nothing */
   } else {
     /* Test if the mode has changed */
@@ skipping 28 matching lines @@
         (const uint16_t*)&encoded
             [2 * i * ((IlbcDecoder*)iLBCdec_inst)->no_of_words],
         (IlbcDecoder*)iLBCdec_inst, 1);
     i++;
   }
   /* iLBC does not support VAD/CNG yet */
   *speechType=1;
   return(i*((IlbcDecoder*)iLBCdec_inst)->blockl);
 }
 
-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)
 {
   int i=0;
   if ((len==((IlbcDecoder*)iLBCdec_inst)->no_of_bytes)||
       (len==2*((IlbcDecoder*)iLBCdec_inst)->no_of_bytes)||
       (len==3*((IlbcDecoder*)iLBCdec_inst)->no_of_bytes)) {
     /* ok, do nothing */
   } else {
     return(-1);
   }
 
   while ((i*((IlbcDecoder*)iLBCdec_inst)->no_of_bytes)<len) {
     WebRtcIlbcfix_DecodeImpl(
         &decoded[i * ((IlbcDecoder*)iLBCdec_inst)->blockl],
         (const uint16_t*)&encoded
             [2 * i * ((IlbcDecoder*)iLBCdec_inst)->no_of_words],
         (IlbcDecoder*)iLBCdec_inst, 1);
     i++;
   }
   /* iLBC does not support VAD/CNG yet */
   *speechType=1;
   return(i*((IlbcDecoder*)iLBCdec_inst)->blockl);
 }
 
-int WebRtcIlbcfix_Decode30Ms(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 i=0;
   if ((len==((IlbcDecoder*)iLBCdec_inst)->no_of_bytes)||
       (len==2*((IlbcDecoder*)iLBCdec_inst)->no_of_bytes)||
       (len==3*((IlbcDecoder*)iLBCdec_inst)->no_of_bytes)) {
     /* ok, do nothing */
   } else {
     return(-1);
   }
 
@@ skipping 35 matching lines @@
   WebRtcSpl_MemSetW16(((IlbcDecoder*)iLBCdec_inst)->enh_buf, 0, ENH_BUFL);
   ((IlbcDecoder*)iLBCdec_inst)->prev_enh_pl = 2;
 
   return (0);
 }
 
 void WebRtcIlbcfix_version(char *version)
 {
   strcpy((char*)version, "1.1.1");
 }