From 1cb54bee7ac24eb67ea8d751b1f87a5632abbe7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Bostr=C3=B6m?= Date: Wed, 14 Jun 2023 12:00:55 +0200 Subject: [PATCH] Delete unused killswitch flag related to scalability mode. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In M113 we made it possible to opt-in to spec-compliant VP9 using scalabilityMode and scaleResolutionDownBy. Since this would change behavior in some edge cases a kill-switch flag was also added. It turns out it was not needed (current Stable: M114) so we can remove the flag. Bug: webrtc:14884 Change-Id: Ie3006164c4d6e90acad1d1f4df2fe2b6e3cb2c35 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/308683 Commit-Queue: Henrik Boström Reviewed-by: Erik Språng Cr-Commit-Position: refs/heads/main@{#40277} --- media/engine/webrtc_video_engine.cc | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/media/engine/webrtc_video_engine.cc b/media/engine/webrtc_video_engine.cc index 1637451b53..72a0f039fa 100644 --- a/media/engine/webrtc_video_engine.cc +++ b/media/engine/webrtc_video_engine.cc @@ -2736,16 +2736,12 @@ WebRtcVideoSendChannel::WebRtcVideoSendStream::CreateVideoEncoderConfig( // `legacy_scalability_mode` and codec used. encoder_config.number_of_streams = parameters_.config.rtp.ssrcs.size(); bool legacy_scalability_mode = true; - // TODO(https://crbug.com/webrtc/14884): This is only used as a kill-switch - // in case of serious bugs - when this reaches Stable, delete the field trial. - if (!call_->trials().IsDisabled("WebRTC-AllowDisablingLegacyScalability")) { - for (const webrtc::RtpEncodingParameters& encoding : - rtp_parameters_.encodings) { - if (encoding.scalability_mode.has_value() && - encoding.scale_resolution_down_by.has_value()) { - legacy_scalability_mode = false; - break; - } + for (const webrtc::RtpEncodingParameters& encoding : + rtp_parameters_.encodings) { + if (encoding.scalability_mode.has_value() && + encoding.scale_resolution_down_by.has_value()) { + legacy_scalability_mode = false; + break; } } // Maybe limit the number of simulcast layers depending on