zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removing ANA enabling field trials.

Browse Source 
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}
This commit is contained in:
Minyue Li
2018-11-21 21:39:54 +01:00
committed by Commit Bot
parent 2c977b4cc5
commit f40150d874
2 changed files with 1 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc
View File

@ -46,17 +46,7 @@ AudioNetworkAdaptorImpl::AudioNetworkAdaptorImpl(
kEventLogMinBitrateChangeBps, kEventLogMinBitrateChangeBps,
kEventLogMinBitrateChangeFraction, kEventLogMinBitrateChangeFraction,
kEventLogMinPacketLossChangeFraction) kEventLogMinPacketLossChangeFraction)
: nullptr), : 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")) {
RTC_DCHECK(controller_manager_); RTC_DCHECK(controller_manager_);
} }
@ -157,24 +147,6 @@ AudioEncoderRuntimeConfig AudioNetworkAdaptorImpl::GetEncoderRuntimeConfig() {
} }
prev_config_ = config; 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_) if (debug_dump_writer_)
debug_dump_writer_->DumpEncoderRuntimeConfig(config, rtc::TimeMillis()); debug_dump_writer_->DumpEncoderRuntimeConfig(config, rtc::TimeMillis());

6
modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h
View File

@ -83,12 +83,6 @@ class AudioNetworkAdaptorImpl final : public AudioNetworkAdaptor {
ANAStats stats_; 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); RTC_DISALLOW_COPY_AND_ASSIGN(AudioNetworkAdaptorImpl);
}; };