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 85084c873d..9e47a06f7c 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 @@ AudioNetworkAdaptorImpl::AudioNetworkAdaptorImpl( 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 @@ AudioEncoderRuntimeConfig AudioNetworkAdaptorImpl::GetEncoderRuntimeConfig() { } 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()); diff --git a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h index d3ecce0cae..4c1c19b7ea 100644 --- a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h +++ b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h @@ -83,12 +83,6 @@ class AudioNetworkAdaptorImpl final : public AudioNetworkAdaptor { ANAStats stats_; - const bool enable_bitrate_adaptation_; - const bool enable_dtx_adaptation_; - const bool enable_fec_adaptation_; - const bool enable_channel_adaptation_; - const bool enable_frame_length_adaptation_; - RTC_DISALLOW_COPY_AND_ASSIGN(AudioNetworkAdaptorImpl); };