Delete expired field trial WebRTC-Video-RequestedResolutionOverrideOutputFormatRequest
Bug: webrtc:14451
Change-Id: Ic8287e5b97a335a8ce828df13b95b69c505a8de4
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/346640
Reviewed-by: Jonas Oreland <jonaso@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42054}
diff --git a/experiments/field_trials.py b/experiments/field_trials.py
index 0bef7ef..58f6a47 100755
--- a/experiments/field_trials.py
+++ b/experiments/field_trials.py
@@ -141,9 +141,6 @@
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 daac8cf..a8731af 100644
--- a/media/base/video_adapter.cc
+++ b/media/base/video_adapter.cc
@@ -358,12 +358,6 @@
// 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
