commit cf2b38232292a903fc1ff34f4bafe278610a7322
author Karl Wiberg <kwiberg@webrtc.org> Wed Feb 05 20:55:09 2020
committer Commit Bot <commit-bot@chromium.org> Wed Feb 05 21:17:19 2020
tree 44849893932ddb7e5bd579e5323a7587974cd17d
parent 703a5d76d9ba8e7984509cc7bf70fb4ed84ef6be

Send bandwidth updates to all codecs, not just Opus

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}

media/engine/webrtc_voice_engine.cc

diff --git a/media/engine/webrtc_voice_engine.cc b/media/engine/webrtc_voice_engine.cc
index 59ac1ee..2fe2563 100644
--- a/media/engine/webrtc_voice_engine.cc
+++ b/media/engine/webrtc_voice_engine.cc
@@ -962,31 +962,25 @@
 
   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;
     }
   }