Revert "Upconvert various types to int."

webrtc/modules/audio_coding/codecs/opus/opus_fec_test.cc

 /*
  *  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 113 matching lines @@
       sampling_khz_(kOpusSamplingKhz),
       block_length_sample_(block_duration_ms_ * sampling_khz_),
       data_pointer_(0),
       max_bytes_(0),
       encoded_bytes_(0),
       opus_encoder_(NULL),
       opus_decoder_(NULL) {
 }
 
 void OpusFecTest::EncodeABlock() {
-  int value = WebRtcOpus_Encode(opus_encoder_,
-                                &in_data_[data_pointer_],
-                                block_length_sample_,
-                                max_bytes_, &bit_stream_[0]);
+  int16_t value = WebRtcOpus_Encode(opus_encoder_,
+                                    &in_data_[data_pointer_],
+                                    block_length_sample_,
+                                    max_bytes_, &bit_stream_[0]);
   EXPECT_GT(value, 0);
 
   encoded_bytes_ = value;
 }
 
 void OpusFecTest::DecodeABlock(bool lost_previous, bool lost_current) {
   int16_t audio_type;
-  int value_1 = 0, value_2 = 0;
+  int16_t value_1 = 0, value_2 = 0;
 
   if (lost_previous) {
     // Decode previous frame.
     if (!lost_current &&
         WebRtcOpus_PacketHasFec(&bit_stream_[0], encoded_bytes_) == 1) {
       value_1 = WebRtcOpus_DecodeFec(opus_decoder_, &bit_stream_[0],
                                      encoded_bytes_, &out_data_[0],
                                      &audio_type);
     } else {
       value_1 = WebRtcOpus_DecodePlc(opus_decoder_, &out_data_[0], 1);
@@ skipping 74 matching lines @@
      ::std::tr1::make_tuple(1, 32000, string("audio_coding/testfile32kHz"),
                             string("pcm")),
      ::std::tr1::make_tuple(2, 64000, string("audio_coding/teststereo32kHz"),
                             string("pcm"))};
 
 // 64 kbps, stereo
 INSTANTIATE_TEST_CASE_P(AllTest, OpusFecTest,
                         ::testing::ValuesIn(param_set));
 
 }  // namespace webrtc