Update audio code to use size_t more correctly,

webrtc/modules/audio_coding/neteq/preemptive_expand.cc

Index: webrtc/modules/audio_coding/neteq/preemptive_expand.cc
diff --git a/webrtc/modules/audio_coding/neteq/preemptive_expand.cc b/webrtc/modules/audio_coding/neteq/preemptive_expand.cc
index 6a3f8ecf1aa646e06be28c57b43709ab05d1d3e1..05bd1fec04722230b4a300d571081ee4dc036307 100644
--- a/webrtc/modules/audio_coding/neteq/preemptive_expand.cc
+++ b/webrtc/modules/audio_coding/neteq/preemptive_expand.cc
@@ -18,10 +18,10 @@ namespace webrtc {
 
 PreemptiveExpand::ReturnCodes PreemptiveExpand::Process(
     const int16_t* input,
-    int input_length,
-    int old_data_length,
+    size_t input_length,
+    size_t old_data_length,
     AudioMultiVector* output,
-    int16_t* length_change_samples) {
+    size_t* length_change_samples) {
   old_data_length_per_channel_ = old_data_length;
   // Input length must be (almost) 30 ms.
   // Also, the new part must be at least |overlap_samples_| elements.
@@ -41,7 +41,7 @@ PreemptiveExpand::ReturnCodes PreemptiveExpand::Process(
 
 void PreemptiveExpand::SetParametersForPassiveSpeech(size_t len,
                                                      int16_t* best_correlation,
-                                                     int* peak_index) const {
+                                                     size_t* peak_index) const {
   // When the signal does not contain any active speech, the correlation does
   // not matter. Simply set it to zero.
   *best_correlation = 0;
@@ -51,7 +51,7 @@ void PreemptiveExpand::SetParametersForPassiveSpeech(size_t len,
   // the new data.
   // but we must ensure that best_correlation is not larger than the new data.
   *peak_index = std::min(*peak_index,
-                         static_cast<int>(len - old_data_length_per_channel_));
+                         len - old_data_length_per_channel_);
 }
 
 PreemptiveExpand::ReturnCodes PreemptiveExpand::CheckCriteriaAndStretch(
@@ -64,8 +64,7 @@ PreemptiveExpand::ReturnCodes PreemptiveExpand::CheckCriteriaAndStretch(
     AudioMultiVector* output) const {
   // Pre-calculate common multiplication with |fs_mult_|.
   // 120 corresponds to 15 ms.
-  int fs_mult_120 = fs_mult_ * 120;
-  assert(old_data_length_per_channel_ >= 0);  // Make sure it's been set.
+  size_t fs_mult_120 = fs_mult_ * 120;

[hlundin-webrtc, 2015/08/10 11:30:01]

Keep the int.

[Peter Kasting, 2015/08/17 22:49:47]

This is an example of a place where I left |fs_mult_120| as size_t.  See how its
use below indicates that its units are the same as those for
|old_data_length_per_channel_| (which should definitely be a size_t).

[hlundin-webrtc, 2015/08/18 07:19:18]

Acknowledged.

   // Check for strong correlation (>0.9 in Q14) and at least 15 ms new data,
   // or passive speech.
   if (((best_correlation > kCorrelationThreshold) &&
@@ -107,7 +106,7 @@ PreemptiveExpand* PreemptiveExpandFactory::Create(
     int sample_rate_hz,
     size_t num_channels,
     const BackgroundNoise& background_noise,
-    int overlap_samples) const {
+    size_t overlap_samples) const {
   return new PreemptiveExpand(
       sample_rate_hz, num_channels, background_noise, overlap_samples);
 }