Index: webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc |
diff --git a/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc b/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc |
index 64df6791db6f03b676b7e2965cfd54360a3a6568..be32aef152e80e05feed810d415f5718ca04a869 100644 |
--- a/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc |
+++ b/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc |
@@ -20,6 +20,7 @@ |
#include "webrtc/base/numerics/exp_filter.h" |
#include "webrtc/base/protobuf_utils.h" |
#include "webrtc/base/safe_conversions.h" |
+#include "webrtc/base/safe_minmax.h" |
#include "webrtc/base/string_to_number.h" |
#include "webrtc/base/timeutils.h" |
#include "webrtc/common_types.h" |
@@ -690,8 +691,8 @@ void AudioEncoderOpus::SetProjectedPacketLossRate(float fraction) { |
} |
void AudioEncoderOpus::SetTargetBitrate(int bits_per_second) { |
- config_.bitrate_bps = rtc::Optional<int>(std::max( |
- std::min(bits_per_second, kOpusMaxBitrateBps), kOpusMinBitrateBps)); |
+ config_.bitrate_bps = rtc::Optional<int>(rtc::SafeClamp<int>( |
+ bits_per_second, kOpusMinBitrateBps, kOpusMaxBitrateBps)); |
RTC_DCHECK(config_.IsOk()); |
RTC_CHECK_EQ(0, WebRtcOpus_SetBitRate(inst_, config_.GetBitrateBps())); |
const auto new_complexity = config_.GetNewComplexity(); |