Update audio code to use size_t more correctly, webrtc/modules/audio_processing/

webrtc/modules/audio_processing/test/audio_processing_unittest.cc

Index: webrtc/modules/audio_processing/test/audio_processing_unittest.cc
diff --git a/webrtc/modules/audio_processing/test/audio_processing_unittest.cc b/webrtc/modules/audio_processing/test/audio_processing_unittest.cc
index c7c45f7eeba0ab6d9dddaf53cad10c2a3b4b8630..3afe55f12a1e45695ac5e90c7d31a69f9933470d 100644
--- a/webrtc/modules/audio_processing/test/audio_processing_unittest.cc
+++ b/webrtc/modules/audio_processing/test/audio_processing_unittest.cc
@@ -124,21 +124,23 @@ void VerifyChannelsAreEqual(int16_t* stereo, int samples_per_channel) {
 }
 
 void SetFrameTo(AudioFrame* frame, int16_t value) {
-  for (int i = 0; i < frame->samples_per_channel_ * frame->num_channels_; ++i) {
+  for (size_t i = 0; i < frame->samples_per_channel_ * frame->num_channels_;
+       ++i) {
     frame->data_[i] = value;
   }
 }
 
 void SetFrameTo(AudioFrame* frame, int16_t left, int16_t right) {
   ASSERT_EQ(2, frame->num_channels_);
-  for (int i = 0; i < frame->samples_per_channel_ * 2; i += 2) {
+  for (size_t i = 0; i < frame->samples_per_channel_ * 2; i += 2) {
     frame->data_[i] = left;
     frame->data_[i + 1] = right;
   }
 }
 
 void ScaleFrame(AudioFrame* frame, float scale) {
-  for (int i = 0; i < frame->samples_per_channel_ * frame->num_channels_; ++i) {
+  for (size_t i = 0; i < frame->samples_per_channel_ * frame->num_channels_;
+       ++i) {
     frame->data_[i] = FloatS16ToS16(frame->data_[i] * scale);
   }
 }
@@ -657,13 +659,18 @@ void ApmTest::ProcessDelayVerificationTest(int delay_ms, int system_delay_ms,
   }
   // Calculate expected delay estimate and acceptable regions. Further,
   // limit them w.r.t. AEC delay estimation support.
-  const int samples_per_ms = std::min(16, frame_->samples_per_channel_ / 10);
+  const size_t samples_per_ms =
+      std::min(static_cast<size_t>(16), frame_->samples_per_channel_ / 10);
   int expected_median = std::min(std::max(delay_ms - system_delay_ms,
                                           delay_min), delay_max);
-  int expected_median_high = std::min(std::max(
-      expected_median + 96 / samples_per_ms, delay_min), delay_max);
-  int expected_median_low = std::min(std::max(
-      expected_median - 96 / samples_per_ms, delay_min), delay_max);
+  int expected_median_high = std::min(
+      std::max(expected_median + static_cast<int>(96 / samples_per_ms),
+               delay_min),
+      delay_max);
+  int expected_median_low = std::min(
+      std::max(expected_median - static_cast<int>(96 / samples_per_ms),
+               delay_min),
+      delay_max);
   // Verify delay metrics.
   int median;
   int std;
@@ -923,8 +930,8 @@ TEST_F(ApmTest, DISABLED_EchoCancellationReportsCorrectDelays) {
          2,
          false);
     // Sampling frequency dependent variables.
-    const int num_ms_per_block = std::max(4,
-                                          640 / frame_->samples_per_channel_);
+    const int num_ms_per_block =
+        std::max(4, static_cast<int>(640 / frame_->samples_per_channel_));
     const int delay_min_ms = -kLookaheadBlocks * num_ms_per_block;
     const int delay_max_ms = (kMaxDelayBlocks - 1) * num_ms_per_block;