admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Send bandwidth updates to all codecs, not just Opus

Browse Source 
Bug: webrtc:11332
Change-Id: If341918f650c07633da5d1f3d091d6f7710015bc
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168048
Commit-Queue: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Sam Zackrisson <saza@webrtc.org>
Reviewed-by: Oskar Sundbom <ossu@webrtc.org>
Reviewed-by: Minyue Li <minyue@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30462}
This commit is contained in:
Karl Wiberg 2020-02-05 21:55:09 +01:00 committed by Commit Bot
parent 703a5d76d9
commit cf2b382322
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
media/engine/webrtc_voice_engine.cc
View File

@ -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;
}
}