From 7fe3a48ee70ef1bbfa50ae4b66aa6cc62edfac4b Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Wed, 10 Apr 2024 17:41:42 +0200 Subject: [PATCH] Delete expired field trial WebRTC-Video-RequestedResolutionOverrideOutputFormatRequest MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:14451 Change-Id: Ic8287e5b97a335a8ce828df13b95b69c505a8de4 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/346640 Reviewed-by: Jonas Oreland Reviewed-by: Erik Språng Commit-Queue: Danil Chapovalov Cr-Commit-Position: refs/heads/main@{#42054} --- experiments/field_trials.py | 3 --- media/base/video_adapter.cc | 6 ------ 2 files changed, 9 deletions(-) diff --git a/experiments/field_trials.py b/experiments/field_trials.py index 0bef7ef896..58f6a47cea 100755 --- a/experiments/field_trials.py +++ b/experiments/field_trials.py @@ -141,9 +141,6 @@ ACTIVE_FIELD_TRIALS: FrozenSet[FieldTrial] = frozenset([ FieldTrial('WebRTC-Video-EncoderFallbackSettings', 'webrtc:6634', date(2024, 4, 1)), - FieldTrial('WebRTC-Video-RequestedResolutionOverrideOutputFormatRequest', - 'webrtc:14451', - date(2024, 4, 1)), FieldTrial('WebRTC-Video-SimulcastIndependentFrameIds', 'webrtc:15875', date(2024, 12, 1)), diff --git a/media/base/video_adapter.cc b/media/base/video_adapter.cc index daac8cf856..a8731af9f5 100644 --- a/media/base/video_adapter.cc +++ b/media/base/video_adapter.cc @@ -358,12 +358,6 @@ void VideoAdapter::OnSinkWants(const rtc::VideoSinkWants& sink_wants) { // that are NOT using requested_resolution (aka newapi), then override // calls to OnOutputFormatRequest and use values from requested_resolution // instead (combined with qualityscaling based on pixel counts above). - if (webrtc::field_trial::IsDisabled( - "WebRTC-Video-RequestedResolutionOverrideOutputFormatRequest")) { - // kill-switch... - return; - } - if (!sink_wants.requested_resolution) { if (stashed_output_format_request_) { // because current active_output_format_request is based on