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

webrtc/modules/audio_coding/neteq/expand.h

 /*
  *  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 54 matching lines @@
   int16_t max_lag() const { return max_lag_; }
 
  protected:
   static const int kMaxConsecutiveExpands = 200;
   void GenerateRandomVector(int16_t seed_increment,
                             size_t length,
                             int16_t* random_vector);
 
   void GenerateBackgroundNoise(int16_t* random_vector,
                                size_t channel,
-                               int16_t mute_slope,
+                               int mute_slope,
                                bool too_many_expands,
                                size_t num_noise_samples,
                                int16_t* buffer);
 
   // Initializes member variables at the beginning of an expand period.
   void InitializeForAnExpandPeriod();
 
   bool TooManyExpands();
 
   // Analyzes the signal history in |sync_buffer_|, and set up all parameters
@@ skipping 20 matching lines @@
     int16_t mute_factor;
     int16_t ar_filter[kUnvoicedLpcOrder + 1];
     int16_t ar_filter_state[kUnvoicedLpcOrder];
     int16_t ar_gain;
     int16_t ar_gain_scale;
     int16_t voice_mix_factor; /* Q14 */
     int16_t current_voice_mix_factor; /* Q14 */
     AudioVector expand_vector0;
     AudioVector expand_vector1;
     bool onset;
-    int16_t mute_slope; /* Q20 */
+    int mute_slope; /* Q20 */
   };
 
   // Calculate the auto-correlation of |input|, with length |input_length|
   // samples. The correlation is calculated from a downsampled version of
   // |input|, and is written to |output|. The scale factor is written to
   // |output_scale|.
   void Correlation(const int16_t* input,
                    size_t input_length,
                    int16_t* output,
-                   int16_t* output_scale) const;
+                   int* output_scale) const;
 
   void UpdateLagIndex();
 
   BackgroundNoise* background_noise_;
   const size_t overlap_length_;
   int16_t max_lag_;
   size_t expand_lags_[kNumLags];
   int lag_index_direction_;
   int current_lag_index_;
   bool stop_muting_;
   rtc::scoped_ptr<ChannelParameters[]> channel_parameters_;
 
   DISALLOW_COPY_AND_ASSIGN(Expand);
 };
 
 struct ExpandFactory {
   ExpandFactory() {}
   virtual ~ExpandFactory() {}
 
   virtual Expand* Create(BackgroundNoise* background_noise,
                          SyncBuffer* sync_buffer,
                          RandomVector* random_vector,
                          int fs,
                          size_t num_channels) const;
 };
 
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_EXPAND_H_