Revert "Upconvert various types to int."

webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h

 /*
  *  Copyright (c) 2014 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 166 matching lines @@
   // in fact it outputs 32000 Hz. This is the iSAC fullband mode.
   if (sample_rate_hz == 48000)
     sample_rate_hz = 32000;
   CHECK(sample_rate_hz == 16000 || sample_rate_hz == 32000)
       << "Unsupported sample rate " << sample_rate_hz;
   if (sample_rate_hz != decoder_sample_rate_hz_) {
     CHECK_EQ(0, T::SetDecSampRate(isac_state_, sample_rate_hz));
     decoder_sample_rate_hz_ = sample_rate_hz;
   }
   int16_t temp_type = 1;  // Default is speech.
-  int ret =
+  int16_t ret =
       T::DecodeInternal(isac_state_, encoded, static_cast<int16_t>(encoded_len),
                         decoded, &temp_type);
   *speech_type = ConvertSpeechType(temp_type);
   return ret;
 }
 
 template <typename T>
 bool AudioEncoderDecoderIsacT<T>::HasDecodePlc() const {
   return false;
 }
@@ skipping 24 matching lines @@
 
 template <typename T>
 int AudioEncoderDecoderIsacT<T>::ErrorCode() {
   CriticalSectionScoped cs(state_lock_.get());
   return T::GetErrorCode(isac_state_);
 }
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_ENCODER_ISAC_T_IMPL_H_