Delete WebRTC-LibaomAv1Encoder-AdaptiveMaxConsecDrops
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 <sprang@webrtc.org> Commit-Queue: Sergey Silkin <ssilkin@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43903}
This commit is contained in:
parent
fa7c5b6674
commit
0a70f47808
@ -101,9 +101,6 @@ ACTIVE_FIELD_TRIALS: FrozenSet[FieldTrial] = frozenset([
|
|||||||
FieldTrial('WebRTC-JitterEstimatorConfig',
|
FieldTrial('WebRTC-JitterEstimatorConfig',
|
||||||
42224404,
|
42224404,
|
||||||
date(2024, 4, 1)),
|
date(2024, 4, 1)),
|
||||||
FieldTrial('WebRTC-LibaomAv1Encoder-AdaptiveMaxConsecDrops',
|
|
||||||
351644568,
|
|
||||||
date(2025, 7, 1)),
|
|
||||||
FieldTrial('WebRTC-LibaomAv1Encoder-PostEncodeFrameDrop',
|
FieldTrial('WebRTC-LibaomAv1Encoder-PostEncodeFrameDrop',
|
||||||
351644568,
|
351644568,
|
||||||
date(2026, 1, 30)),
|
date(2026, 1, 30)),
|
||||||
|
|||||||
@ -135,9 +135,6 @@ class LibaomAv1Encoder final : public VideoEncoder {
|
|||||||
const LibaomAv1EncoderInfoSettings encoder_info_override_;
|
const LibaomAv1EncoderInfoSettings encoder_info_override_;
|
||||||
// TODO(webrtc:351644568): Remove this kill-switch after the feature is fully
|
// TODO(webrtc:351644568): Remove this kill-switch after the feature is fully
|
||||||
// deployed.
|
// 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_;
|
const bool post_encode_frame_drop_;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -179,8 +176,6 @@ LibaomAv1Encoder::LibaomAv1Encoder(const Environment& env,
|
|||||||
framerate_fps_(0),
|
framerate_fps_(0),
|
||||||
timestamp_(0),
|
timestamp_(0),
|
||||||
encoder_info_override_(env.field_trials()),
|
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(
|
post_encode_frame_drop_(!env.field_trials().IsDisabled(
|
||||||
"WebRTC-LibaomAv1Encoder-PostEncodeFrameDrop")) {}
|
"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_SMOOTH_INTERINTRA, 0);
|
||||||
SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_ENABLE_TX64, 0);
|
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_REFERENCE_FRAMES, 3);
|
||||||
|
SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_MAX_CONSEC_FRAME_DROP_MS_CBR, 250);
|
||||||
if (adaptive_max_consec_drops_) {
|
|
||||||
SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_MAX_CONSEC_FRAME_DROP_MS_CBR,
|
|
||||||
250);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (post_encode_frame_drop_) {
|
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);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user