Remove kDefaultScreencastMinBitrateKillSwitch.

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 <hta@webrtc.org>
Commit-Queue: Henrik Boström <hbos@webrtc.org>
Auto-Submit: Henrik Boström <hbos@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36831}
This commit is contained in:
Henrik Boström 2022-05-10 09:34:27 +02:00 committed by WebRTC LUCI CQ
parent 9e73e2e430
commit 6344bf10ac

View File

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