Reland "Upconvert various types to int.", neteq portion.

webrtc/modules/audio_coding/neteq/merge.cc

 /*
  *  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 296 matching lines @@
   }
 }
 
 int16_t Merge::CorrelateAndPeakSearch(int16_t expanded_max, int16_t input_max,
                                       int start_position, int input_length,
                                       int expand_period) const {
   // Calculate correlation without any normalization.
   const int max_corr_length = kMaxCorrelationLength;
   int stop_position_downsamp =
       std::min(max_corr_length, expand_->max_lag() / (fs_mult_ * 2) + 1);
-  int16_t correlation_shift = 0;
+  int correlation_shift = 0;
   if (expanded_max * input_max > 26843546) {
     correlation_shift = 3;
   }
 
   int32_t correlation[kMaxCorrelationLength];
   WebRtcSpl_CrossCorrelation(correlation, input_downsampled_,
                              expanded_downsampled_, kInputDownsampLength,
                              stop_position_downsamp, correlation_shift, 1);
 
   // Normalize correlation to 14 bits and copy to a 16-bit array.
   const int pad_length = static_cast<int>(expand_->overlap_length() - 1);
   const int correlation_buffer_size = 2 * pad_length + kMaxCorrelationLength;
   rtc::scoped_ptr<int16_t[]> correlation16(
       new int16_t[correlation_buffer_size]);
   memset(correlation16.get(), 0, correlation_buffer_size * sizeof(int16_t));
   int16_t* correlation_ptr = &correlation16[pad_length];
   int32_t max_correlation = WebRtcSpl_MaxAbsValueW32(correlation,
                                                      stop_position_downsamp);
-  int16_t norm_shift = std::max(0, 17 - WebRtcSpl_NormW32(max_correlation));
+  int norm_shift = std::max(0, 17 - WebRtcSpl_NormW32(max_correlation));
   WebRtcSpl_VectorBitShiftW32ToW16(correlation_ptr, stop_position_downsamp,
                                    correlation, norm_shift);
 
   // Calculate allowed starting point for peak finding.
   // The peak location bestIndex must fulfill two criteria:
   // (1) w16_bestIndex + input_length <
   //     timestamps_per_call_ + expand_->overlap_length();
   // (2) w16_bestIndex + input_length < start_position.
   int start_index = timestamps_per_call_ +
       static_cast<int>(expand_->overlap_length());
@@ skipping 28 matching lines @@
   }
   return best_correlation_index;
 }
 
 int Merge::RequiredFutureSamples() {
   return static_cast<int>(fs_hz_ / 100 * num_channels_);  // 10 ms.
 }
 
 
 }  // namespace webrtc