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

webrtc/modules/audio_coding/neteq/expand.h

Index: webrtc/modules/audio_coding/neteq/expand.h
diff --git a/webrtc/modules/audio_coding/neteq/expand.h b/webrtc/modules/audio_coding/neteq/expand.h
index b015959e75829ebf278d217b51f0ca8d45cc1e2b..5fb117d519c684cf8ba8e978228b98ddc8da9c75 100644
--- a/webrtc/modules/audio_coding/neteq/expand.h
+++ b/webrtc/modules/audio_coding/neteq/expand.h
@@ -72,7 +72,7 @@ class Expand {
 
   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);
@@ -113,7 +113,7 @@ class Expand {
     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|
@@ -123,7 +123,7 @@ class Expand {
   void Correlation(const int16_t* input,
                    size_t input_length,
                    int16_t* output,
-                   int16_t* output_scale) const;
+                   int* output_scale) const;
 
   void UpdateLagIndex();