Removing ANA enabling field trials.
This is to let ANA config proto to fully control it.
Bug: b/119788974
Change-Id: Ib7842f784bdf879cb7d753c7077ce845f435a379
Reviewed-on: https://webrtc-review.googlesource.com/c/111741
Reviewed-by: Ivo Creusen <ivoc@webrtc.org>
Commit-Queue: Minyue Li <minyue@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25764}diff --git a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc
index 85084c8..9e47a06 100644
--- a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc
+++ b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc
@@ -46,17 +46,7 @@
kEventLogMinBitrateChangeBps,
kEventLogMinBitrateChangeFraction,
kEventLogMinPacketLossChangeFraction)
- : nullptr),
- enable_bitrate_adaptation_(
- webrtc::field_trial::IsEnabled("WebRTC-Audio-BitrateAdaptation")),
- enable_dtx_adaptation_(
- webrtc::field_trial::IsEnabled("WebRTC-Audio-DtxAdaptation")),
- enable_fec_adaptation_(
- webrtc::field_trial::IsEnabled("WebRTC-Audio-FecAdaptation")),
- enable_channel_adaptation_(
- webrtc::field_trial::IsEnabled("WebRTC-Audio-ChannelAdaptation")),
- enable_frame_length_adaptation_(webrtc::field_trial::IsEnabled(
- "WebRTC-Audio-FrameLengthAdaptation")) {
+ : nullptr) {
RTC_DCHECK(controller_manager_);
}
@@ -157,24 +147,6 @@
}
prev_config_ = config;
- // Prevent certain controllers from taking action (determined by field trials)
- if (!enable_bitrate_adaptation_ && config.bitrate_bps) {
- config.bitrate_bps.reset();
- }
- if (!enable_dtx_adaptation_ && config.enable_dtx) {
- config.enable_dtx.reset();
- }
- if (!enable_fec_adaptation_ && config.enable_fec) {
- config.enable_fec.reset();
- config.uplink_packet_loss_fraction.reset();
- }
- if (!enable_frame_length_adaptation_ && config.frame_length_ms) {
- config.frame_length_ms.reset();
- }
- if (!enable_channel_adaptation_ && config.num_channels) {
- config.num_channels.reset();
- }
-
if (debug_dump_writer_)
debug_dump_writer_->DumpEncoderRuntimeConfig(config, rtc::TimeMillis());