From 0a70f478080b8ee08e7c588d6135af2d781c3df2 Mon Sep 17 00:00:00 2001 From: Sergey Silkin Date: Thu, 13 Feb 2025 17:55:57 +0100 Subject: [PATCH] Delete WebRTC-LibaomAv1Encoder-AdaptiveMaxConsecDrops MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was a killswitch for AV1E_SET_MAX_CONSEC_FRAME_DROP_MS_CBR. The feature has been enabled for over six months and has proven to be working. Bug: webrtc:351644568 Change-Id: Ifa02e72284c562298e3e5560dbc27f28a9e02819 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/375863 Reviewed-by: Erik Språng Commit-Queue: Sergey Silkin Cr-Commit-Position: refs/heads/main@{#43903} --- experiments/field_trials.py | 3 --- modules/video_coding/codecs/av1/libaom_av1_encoder.cc | 11 +---------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/experiments/field_trials.py b/experiments/field_trials.py index 5321c3fa7a..7278e956d5 100755 --- a/experiments/field_trials.py +++ b/experiments/field_trials.py @@ -101,9 +101,6 @@ ACTIVE_FIELD_TRIALS: FrozenSet[FieldTrial] = frozenset([ FieldTrial('WebRTC-JitterEstimatorConfig', 42224404, date(2024, 4, 1)), - FieldTrial('WebRTC-LibaomAv1Encoder-AdaptiveMaxConsecDrops', - 351644568, - date(2025, 7, 1)), FieldTrial('WebRTC-LibaomAv1Encoder-PostEncodeFrameDrop', 351644568, date(2026, 1, 30)), diff --git a/modules/video_coding/codecs/av1/libaom_av1_encoder.cc b/modules/video_coding/codecs/av1/libaom_av1_encoder.cc index 919c79a985..4b9479e320 100644 --- a/modules/video_coding/codecs/av1/libaom_av1_encoder.cc +++ b/modules/video_coding/codecs/av1/libaom_av1_encoder.cc @@ -135,9 +135,6 @@ class LibaomAv1Encoder final : public VideoEncoder { const LibaomAv1EncoderInfoSettings encoder_info_override_; // TODO(webrtc:351644568): Remove this kill-switch after the feature is fully // deployed. - const bool adaptive_max_consec_drops_; - // TODO(webrtc:351644568): Remove this kill-switch after the feature is fully - // deployed. const bool post_encode_frame_drop_; }; @@ -179,8 +176,6 @@ LibaomAv1Encoder::LibaomAv1Encoder(const Environment& env, framerate_fps_(0), timestamp_(0), encoder_info_override_(env.field_trials()), - adaptive_max_consec_drops_(!env.field_trials().IsDisabled( - "WebRTC-LibaomAv1Encoder-AdaptiveMaxConsecDrops")), post_encode_frame_drop_(!env.field_trials().IsDisabled( "WebRTC-LibaomAv1Encoder-PostEncodeFrameDrop")) {} @@ -335,11 +330,7 @@ int LibaomAv1Encoder::InitEncode(const VideoCodec* codec_settings, SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_ENABLE_SMOOTH_INTERINTRA, 0); SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_ENABLE_TX64, 0); SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_MAX_REFERENCE_FRAMES, 3); - - if (adaptive_max_consec_drops_) { - SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_MAX_CONSEC_FRAME_DROP_MS_CBR, - 250); - } + SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_MAX_CONSEC_FRAME_DROP_MS_CBR, 250); if (post_encode_frame_drop_) { SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_POSTENCODE_DROP_RTC, 1);