Delete WebRTC-LibaomAv1Encoder-PostEncodeFrameDrop Bug: webrtc:351644568 Change-Id: I299e45669b92334fe0c51de412041925420a9e0e Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/462065 Reviewed-by: Åsa Persson <asapersson@webrtc.org> Commit-Queue: Sergey Silkin <ssilkin@webrtc.org> Cr-Commit-Position: refs/heads/main@{#47379}
diff --git a/experiments/field_trials.py b/experiments/field_trials.py index 46df926..83d4b18 100755 --- a/experiments/field_trials.py +++ b/experiments/field_trials.py
@@ -140,9 +140,6 @@ FieldTrial('WebRTC-LibaomAv1Encoder-DropRepeatFramesOnEnhancementLayers', 445115234, date(2026, 3, 19)), - FieldTrial('WebRTC-LibaomAv1Encoder-PostEncodeFrameDrop', - 351644568, - date(2026, 1, 30)), FieldTrial('WebRTC-LibvpxVp8Encoder-AndroidSpecificThreadingSettings', 42226191, date(2024, 9, 1)),
diff --git a/modules/video_coding/codecs/av1/libaom_av1_encoder.cc b/modules/video_coding/codecs/av1/libaom_av1_encoder.cc index 1079cb8..dbfde9f 100644 --- a/modules/video_coding/codecs/av1/libaom_av1_encoder.cc +++ b/modules/video_coding/codecs/av1/libaom_av1_encoder.cc
@@ -218,9 +218,6 @@ int64_t timestamp_; const Environment& env_; const LibaomAv1EncoderInfoSettings encoder_info_override_; - // TODO(webrtc:351644568): Remove this kill-switch after the feature is fully - // deployed. - const bool post_encode_frame_drop_; // Determine whether the frame should be sampled for PSNR. // TODO(webrtc:388070060): Remove after rollout. @@ -276,8 +273,6 @@ timestamp_(0), env_(env), encoder_info_override_(env_.field_trials()), - post_encode_frame_drop_(!env_.field_trials().IsDisabled( - "WebRTC-LibaomAv1Encoder-PostEncodeFrameDrop")), psnr_experiment_(env.field_trials()), psnr_frame_sampler_(psnr_experiment_.SamplingInterval()), drop_repeat_frames_on_enhancement_layers_(env.field_trials().IsEnabled( @@ -438,10 +433,7 @@ SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_ENABLE_TX64, 0); SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_MAX_REFERENCE_FRAMES, 3); 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); - } + SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_POSTENCODE_DROP_RTC, 1); if (encoder_speed_experiment_.IsDynamicSpeedEnabled()) { LibaomSpeedConfigFactory speed_config_factory(