Add SafeClamp(), which accepts args of different types

webrtc/voice_engine/channel_proxy.cc

 /*
  *  Copyright (c) 2015 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/voice_engine/channel_proxy.h"
 
 #include <utility>
 
 #include "webrtc/api/call/audio_sink.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
+#include "webrtc/base/safe_minmax.h"
 #include "webrtc/call/rtp_transport_controller_send_interface.h"
 #include "webrtc/voice_engine/channel.h"
 
 namespace webrtc {
 namespace voe {
 ChannelProxy::ChannelProxy() : channel_owner_(nullptr) {}
 
 ChannelProxy::ChannelProxy(const ChannelOwner& channel_owner) :
     channel_owner_(channel_owner) {
   RTC_CHECK(channel_owner_.channel());
@@ skipping 255 matching lines @@
   unsigned int timestamp = 0;
   int error = channel()->GetPlayoutTimestamp(timestamp);
   RTC_DCHECK(!error || timestamp == 0);
   return timestamp;
 }
 
 void ChannelProxy::SetMinimumPlayoutDelay(int delay_ms) {
   RTC_DCHECK(module_process_thread_checker_.CalledOnValidThread());
   // Limit to range accepted by both VoE and ACM, so we're at least getting as
   // close as possible, instead of failing.
-  delay_ms = std::max(0, std::min(delay_ms, 10000));
+  delay_ms = rtc::SafeClamp(delay_ms, 0, 10000);
   int error = channel()->SetMinimumPlayoutDelay(delay_ms);
   if (0 != error) {
     LOG(LS_WARNING) << "Error setting minimum playout delay.";
   }
 }
 
 void ChannelProxy::SetRtcpRttStats(RtcpRttStats* rtcp_rtt_stats) {
   RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
   channel()->SetRtcpRttStats(rtcp_rtt_stats);
 }
@@ skipping 28 matching lines @@
   return channel()->GetSources();
 }
 
 Channel* ChannelProxy::channel() const {
   RTC_DCHECK(channel_owner_.channel());
   return channel_owner_.channel();
 }
 
 }  // namespace voe
 }  // namespace webrtc