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

webrtc/modules/remote_bitrate_estimator/aimd_rate_control.cc

 /*
  *  Copyright (c) 2014 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 "webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h"
 
 #include <algorithm>
 #include <cassert>
 #include <cmath>
 
 #include "webrtc/base/checks.h"
+#include "webrtc/base/safe_minmax.h"
 
 #include "webrtc/modules/remote_bitrate_estimator/overuse_detector.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h"
 
 namespace webrtc {
 
 static const int64_t kDefaultRttMs = 200;
 static const int64_t kMaxFeedbackIntervalMs = 1000;
@@ skipping 203 matching lines @@
     new_bitrate_bps = std::max(current_bitrate_bps_, max_bitrate_bps);
   }
   new_bitrate_bps = std::max(new_bitrate_bps, min_configured_bitrate_bps_);
   return new_bitrate_bps;
 }
 
 uint32_t AimdRateControl::MultiplicativeRateIncrease(
     int64_t now_ms, int64_t last_ms, uint32_t current_bitrate_bps) const {
   double alpha = 1.08;
   if (last_ms > -1) {
-    int time_since_last_update_ms = std::min(static_cast<int>(now_ms - last_ms),
-                                             1000);
+    auto time_since_last_update_ms =
+        rtc::SafeMin<int64_t>(now_ms - last_ms, 1000);
     alpha = pow(alpha,  time_since_last_update_ms / 1000.0);
   }
   uint32_t multiplicative_increase_bps = std::max(
       current_bitrate_bps * (alpha - 1.0), 1000.0);
   return multiplicative_increase_bps;
 }
 
 uint32_t AimdRateControl::AdditiveRateIncrease(int64_t now_ms,
                                                int64_t last_ms) const {
   return static_cast<uint32_t>((now_ms - last_ms) *
@@ skipping 44 matching lines @@
     default:
       assert(false);
   }
 }
 
 void AimdRateControl::ChangeRegion(RateControlRegion region) {
   rate_control_region_ = region;
 }
 
 }  // namespace webrtc