From 6344bf10acc19d28eea67ddad93cb90b7c3e9697 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Bostr=C3=B6m?= Date: Tue, 10 May 2022 09:34:27 +0200 Subject: [PATCH] Remove kDefaultScreencastMinBitrateKillSwitch. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The killswitch is no longer needed, because the googScreencastMinBitrate has been successfully removed from the web platform. The native RTCConfiguration::screencast_min_bitrate is still available though because there are other downstream users than Chrome. Bug: chromium:1315155 Change-Id: I2145f9014dbe57bb50e61f1faeacd533d76acb29 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/261725 Commit-Queue: Harald Alvestrand Commit-Queue: Henrik Boström Auto-Submit: Henrik Boström Reviewed-by: Harald Alvestrand Cr-Commit-Position: refs/heads/main@{#36831} --- pc/sdp_offer_answer.cc | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pc/sdp_offer_answer.cc b/pc/sdp_offer_answer.cc index 1d34081bce..141d3fe79e 100644 --- a/pc/sdp_offer_answer.cc +++ b/pc/sdp_offer_answer.cc @@ -88,9 +88,6 @@ namespace webrtc { namespace { -constexpr const char* kDefaultScreencastMinBitrateKillSwitch = - "WebRTC-DefaultScreencastMinBitrateKillSwitch"; - typedef webrtc::PeerConnectionInterface::RTCOfferAnswerOptions RTCOfferAnswerOptions; @@ -1198,14 +1195,10 @@ void SdpOfferAnswerHandler::Initialize( PeerConnectionDependencies& dependencies, ConnectionContext* context) { RTC_DCHECK_RUN_ON(signaling_thread()); + // 100 kbps is used by default, but can be overriden by a non-standard + // RTCConfiguration value (not available on Web). video_options_.screencast_min_bitrate_kbps = - configuration.screencast_min_bitrate; - // Use 100 kbps as the default minimum screencast bitrate unless this path is - // kill-switched. - if (!video_options_.screencast_min_bitrate_kbps.has_value() && - !pc_->trials().IsEnabled(kDefaultScreencastMinBitrateKillSwitch)) { - video_options_.screencast_min_bitrate_kbps = 100; - } + configuration.screencast_min_bitrate.value_or(100); audio_options_.combined_audio_video_bwe = configuration.combined_audio_video_bwe;