diff --git a/media/engine/webrtc_voice_engine.cc b/media/engine/webrtc_voice_engine.cc index 59ac1ee9cb..2fe25630c4 100644 --- a/media/engine/webrtc_voice_engine.cc +++ b/media/engine/webrtc_voice_engine.cc @@ -962,31 +962,25 @@ class WebRtcVoiceMediaChannel::WebRtcAudioSendStream void UpdateAllowedBitrateRange() { RTC_DCHECK(worker_thread_checker_.IsCurrent()); - const bool is_opus = - config_.send_codec_spec && - absl::EqualsIgnoreCase(config_.send_codec_spec->format.name, - kOpusCodecName); - if (is_opus) { - // The order of precedence, from lowest to highest is: - // - a reasonable default of 32kbps min/max - // - fixed target bitrate from codec spec - // - bitrate configured in the rtp_parameter encodings settings - const int kDefaultBitrateBps = 32000; - config_.min_bitrate_bps = kDefaultBitrateBps; - config_.max_bitrate_bps = kDefaultBitrateBps; + // The order of precedence, from lowest to highest is: + // - a reasonable default of 32kbps min/max + // - fixed target bitrate from codec spec + // - bitrate configured in the rtp_parameter encodings settings + const int kDefaultBitrateBps = 32000; + config_.min_bitrate_bps = kDefaultBitrateBps; + config_.max_bitrate_bps = kDefaultBitrateBps; - if (config_.send_codec_spec && - config_.send_codec_spec->target_bitrate_bps) { - config_.min_bitrate_bps = *config_.send_codec_spec->target_bitrate_bps; - config_.max_bitrate_bps = *config_.send_codec_spec->target_bitrate_bps; - } + if (config_.send_codec_spec && + config_.send_codec_spec->target_bitrate_bps) { + config_.min_bitrate_bps = *config_.send_codec_spec->target_bitrate_bps; + config_.max_bitrate_bps = *config_.send_codec_spec->target_bitrate_bps; + } - if (rtp_parameters_.encodings[0].min_bitrate_bps) { - config_.min_bitrate_bps = *rtp_parameters_.encodings[0].min_bitrate_bps; - } - if (rtp_parameters_.encodings[0].max_bitrate_bps) { - config_.max_bitrate_bps = *rtp_parameters_.encodings[0].max_bitrate_bps; - } + if (rtp_parameters_.encodings[0].min_bitrate_bps) { + config_.min_bitrate_bps = *rtp_parameters_.encodings[0].min_bitrate_bps; + } + if (rtp_parameters_.encodings[0].max_bitrate_bps) { + config_.max_bitrate_bps = *rtp_parameters_.encodings[0].max_bitrate_bps; } }