Add SafeMin() and SafeMax(), which accept args of different types

webrtc/modules/audio_processing/audio_processing_unittest.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.
  */
 
 #include <math.h>
 #include <stdio.h>
 
 #include <algorithm>
 #include <limits>
 #include <memory>
 #include <queue>
 
 #include "webrtc/base/arraysize.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/gtest_prod_util.h"
 #include "webrtc/base/ignore_wundef.h"
 #include "webrtc/base/protobuf_utils.h"
+#include "webrtc/base/safe_minmax.h"
 #include "webrtc/common_audio/include/audio_util.h"
 #include "webrtc/common_audio/resampler/include/push_resampler.h"
 #include "webrtc/common_audio/resampler/push_sinc_resampler.h"
 #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
 #include "webrtc/modules/audio_processing/audio_processing_impl.h"
 #include "webrtc/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h"
 #include "webrtc/modules/audio_processing/common.h"
 #include "webrtc/modules/audio_processing/include/audio_processing.h"
 #include "webrtc/modules/audio_processing/level_controller/level_controller_constants.h"
 #include "webrtc/modules/audio_processing/test/protobuf_utils.h"
@@ skipping 637 matching lines @@
 
   rewind(near_file_);
   while (!frame_queue.empty()) {
     AudioFrame* frame = frame_queue.front();
     frame_queue.pop();
     delete frame;
   }
   // Calculate expected delay estimate and acceptable regions. Further,
   // limit them w.r.t. AEC delay estimation support.
   const size_t samples_per_ms =
-      std::min(static_cast<size_t>(16), frame_->samples_per_channel_ / 10);
+      rtc::SafeMin<size_t>(16u, 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 + 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);
@@ skipping 2185 matching lines @@
   // TODO(peah): Remove the testing for
   // apm->capture_nonlocked_.level_controller_enabled once the value in config_
   // is instead used to activate the level controller.
   EXPECT_FALSE(apm->capture_nonlocked_.level_controller_enabled);
   EXPECT_NEAR(kTargetLcPeakLeveldBFS,
               apm->config_.level_controller.initial_peak_level_dbfs,
               std::numeric_limits<float>::epsilon());
 }
 
 }  // namespace webrtc