From 0dbee62eb9d2a66ff0e9132f292410653b4b99cc Mon Sep 17 00:00:00 2001 From: Per Kjellander Date: Wed, 9 Nov 2022 14:03:16 +0100 Subject: [PATCH] Remove unused RateControlSettings::TriggerProbeOnMaxAllocatedBitrateChange MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The flag has been default true for a long period of time.(longer than https://webrtc-review.googlesource.com/c/src/+/148581) Reference to it was removed in https://webrtc-review.googlesource.com/c/src/+/282860 Bug: webrtc:14392 Change-Id: I08aab062acc27d39b41c9d96571ed2ce058f2eec Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/282862 Reviewed-by: Erik Språng Commit-Queue: Per Kjellander Cr-Commit-Position: refs/heads/main@{#38599} --- rtc_base/experiments/rate_control_settings.cc | 5 ----- rtc_base/experiments/rate_control_settings.h | 2 -- rtc_base/experiments/rate_control_settings_unittest.cc | 10 ---------- 3 files changed, 17 deletions(-) diff --git a/rtc_base/experiments/rate_control_settings.cc b/rtc_base/experiments/rate_control_settings.cc index ea5f90ab39..84e7b1bcc1 100644 --- a/rtc_base/experiments/rate_control_settings.cc +++ b/rtc_base/experiments/rate_control_settings.cc @@ -68,7 +68,6 @@ std::unique_ptr VideoRateControlConfig::Parser() { "vp8_min_pixels", &vp8_min_pixels, // "trust_vp8", &trust_vp8, // "trust_vp9", &trust_vp9, // - "probe_max_allocation", &probe_max_allocation, // "bitrate_adjuster", &bitrate_adjuster, // "adjuster_use_headroom", &adjuster_use_headroom, // "vp8_s0_boost", &vp8_s0_boost, // @@ -173,10 +172,6 @@ bool RateControlSettings::Vp8BaseHeavyTl3RateAllocation() const { return video_config_.vp8_base_heavy_tl3_alloc; } -bool RateControlSettings::TriggerProbeOnMaxAllocatedBitrateChange() const { - return video_config_.probe_max_allocation; -} - bool RateControlSettings::UseEncoderBitrateAdjuster() const { return video_config_.bitrate_adjuster; } diff --git a/rtc_base/experiments/rate_control_settings.h b/rtc_base/experiments/rate_control_settings.h index 6aff70a686..05e942d39f 100644 --- a/rtc_base/experiments/rate_control_settings.h +++ b/rtc_base/experiments/rate_control_settings.h @@ -38,7 +38,6 @@ struct VideoRateControlConfig { absl::optional vp8_min_pixels; bool trust_vp8 = true; bool trust_vp9 = true; - bool probe_max_allocation = true; bool bitrate_adjuster = true; bool adjuster_use_headroom = true; bool vp8_s0_boost = false; @@ -79,7 +78,6 @@ class RateControlSettings final { bool Vp8BaseHeavyTl3RateAllocation() const; - bool TriggerProbeOnMaxAllocatedBitrateChange() const; bool UseEncoderBitrateAdjuster() const; bool BitrateAdjusterCanUseNetworkHeadroom() const; diff --git a/rtc_base/experiments/rate_control_settings_unittest.cc b/rtc_base/experiments/rate_control_settings_unittest.cc index 79f19e15b5..91ebf531bd 100644 --- a/rtc_base/experiments/rate_control_settings_unittest.cc +++ b/rtc_base/experiments/rate_control_settings_unittest.cc @@ -172,16 +172,6 @@ TEST(RateControlSettingsTest, EXPECT_FALSE(settings_after.Vp8BaseHeavyTl3RateAllocation()); } -TEST(RateControlSettingsTest, TriggerProbeOnMaxAllocatedBitrateChange) { - EXPECT_TRUE(RateControlSettings::ParseFromFieldTrials() - .TriggerProbeOnMaxAllocatedBitrateChange()); - - test::ScopedFieldTrials field_trials( - "WebRTC-VideoRateControl/probe_max_allocation:0/"); - EXPECT_FALSE(RateControlSettings::ParseFromFieldTrials() - .TriggerProbeOnMaxAllocatedBitrateChange()); -} - TEST(RateControlSettingsTest, UseEncoderBitrateAdjuster) { // Should be on by default. EXPECT_TRUE(