Fix issue with conflicting behavior if setting a max BW with b=AS on both audio and video.

webrtc/media/engine/webrtcvoiceengine.cc

Index: webrtc/media/engine/webrtcvoiceengine.cc
diff --git a/webrtc/media/engine/webrtcvoiceengine.cc b/webrtc/media/engine/webrtcvoiceengine.cc
index d774f788b75cfc15bba3a04d26dde6a20a3a39c1..8e13a9ffd6361cca06a3a27a32f234345795854e 100644
--- a/webrtc/media/engine/webrtcvoiceengine.cc
+++ b/webrtc/media/engine/webrtcvoiceengine.cc
@@ -1667,14 +1667,6 @@ bool WebRtcVoiceMediaChannel::SetSendParameters(
     return false;
   }
 
-  if (params.max_bandwidth_bps >= 0) {
-    // Note that max_bandwidth_bps intentionally takes priority over the
-    // bitrate config for the codec.
-    bitrate_config_.max_bitrate_bps =
-        params.max_bandwidth_bps == 0 ? -1 : params.max_bandwidth_bps;
-  }
-  call_->SetBitrateConfig(bitrate_config_);
-
   if (!ValidateRtpExtensions(params.extensions)) {
     return false;
   }
@@ -1946,6 +1938,7 @@ bool WebRtcVoiceMediaChannel::SetSendCodecs(
   // parameters.
   // TODO(solenberg): Refactor this logic once we create AudioEncoders here.
   webrtc::AudioSendStream::Config::SendCodecSpec send_codec_spec;
+  webrtc::Call::Config::BitrateConfig bitrate_config;
   {
     send_codec_spec.nack_enabled = send_codec_spec_.nack_enabled;
 
@@ -1959,7 +1952,7 @@ bool WebRtcVoiceMediaChannel::SetSendCodecs(
 
     send_codec_spec.transport_cc_enabled = HasTransportCc(*codec);
     send_codec_spec.nack_enabled = HasNack(*codec);
-    bitrate_config_ = GetBitrateConfigForCodec(*codec);
+    bitrate_config = GetBitrateConfigForCodec(*codec);
 
     // For Opus as the send codec, we are to determine inband FEC, maximum
     // playback rate, and opus internal dtx.
@@ -2035,8 +2028,9 @@ bool WebRtcVoiceMediaChannel::SetSendCodecs(
   } else {
     // If the codec isn't changing, set the start bitrate to -1 which means
     // "unchanged" so that BWE isn't affected.
-    bitrate_config_.start_bitrate_bps = -1;
+    bitrate_config.start_bitrate_bps = -1;
   }
+  call_->SetBitrateConfig(bitrate_config);
 
   // Check if the transport cc feedback or NACK status has changed on the
   // preferred send codec, and in that case reconfigure all receive streams.