diff --git a/experiments/field_trials.py b/experiments/field_trials.py index 10c94e62ac..450e424e43 100755 --- a/experiments/field_trials.py +++ b/experiments/field_trials.py @@ -164,9 +164,6 @@ INDEFINITE = date(datetime.MAXYEAR, 1, 1) # POLICY_EXEMPT_FIELD_TRIALS_DIGEST. POLICY_EXEMPT_FIELD_TRIALS: FrozenSet[FieldTrial] = frozenset([ # keep-sorted start - FieldTrial('UseTwccPlrForAna', - 'webrtc:7058', - date(2024, 4, 1)), FieldTrial('WebRTC-AddNetworkCostToVpn', 'webrtc:13097', date(2024, 4, 1)), @@ -914,7 +911,7 @@ POLICY_EXEMPT_FIELD_TRIALS: FrozenSet[FieldTrial] = frozenset([ ]) # yapf: disable POLICY_EXEMPT_FIELD_TRIALS_DIGEST: str = \ - '023f4ce749a699f0ab811093b9f568d604da28a8' + '3026f839766eb90355893fa0f1af8e9bf0d0dca1' REGISTERED_FIELD_TRIALS: FrozenSet[FieldTrial] = ACTIVE_FIELD_TRIALS.union( POLICY_EXEMPT_FIELD_TRIALS) diff --git a/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.cc b/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.cc index c5e5fa76e3..2134dad3f2 100644 --- a/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.cc +++ b/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.cc @@ -14,27 +14,9 @@ #include #include "rtc_base/checks.h" -#include "system_wrappers/include/field_trial.h" namespace webrtc { -namespace { -class NullSmoothingFilter final : public SmoothingFilter { - public: - void AddSample(float sample) override { last_sample_ = sample; } - - absl::optional GetAverage() override { return last_sample_; } - - bool SetTimeConstantMs(int time_constant_ms) override { - RTC_DCHECK_NOTREACHED(); - return false; - } - - private: - absl::optional last_sample_; -}; -} // namespace - FecControllerPlrBased::Config::Config( bool initial_fec_enabled, const ThresholdCurve& fec_enabling_threshold, @@ -57,10 +39,7 @@ FecControllerPlrBased::FecControllerPlrBased( FecControllerPlrBased::FecControllerPlrBased(const Config& config) : FecControllerPlrBased( config, - webrtc::field_trial::FindFullName("UseTwccPlrForAna") == "Enabled" - ? std::unique_ptr(new NullSmoothingFilter()) - : std::unique_ptr( - new SmoothingFilterImpl(config.time_constant_ms))) {} + std::make_unique(config.time_constant_ms)) {} FecControllerPlrBased::~FecControllerPlrBased() = default;