Index: webrtc/modules/audio_processing/echo_cancellation_impl.cc |
diff --git a/webrtc/modules/audio_processing/echo_cancellation_impl.cc b/webrtc/modules/audio_processing/echo_cancellation_impl.cc |
index f6a0bcde7acc801c7014e5f73bce9be8e8f61d5b..25cb8c02283230855536fbcdb987baf383475d84 100644 |
--- a/webrtc/modules/audio_processing/echo_cancellation_impl.cc |
+++ b/webrtc/modules/audio_processing/echo_cancellation_impl.cc |
@@ -341,14 +341,9 @@ bool EchoCancellationImpl::is_delay_agnostic_enabled() const { |
return delay_agnostic_enabled_; |
} |
-bool EchoCancellationImpl::is_aec3_enabled() const { |
- rtc::CritScope cs(crit_capture_); |
- return aec3_enabled_; |
-} |
- |
std::string EchoCancellationImpl::GetExperimentsDescription() { |
rtc::CritScope cs(crit_capture_); |
- std::string description = (aec3_enabled_ ? "AEC3;" : ""); |
+ std::string description = ""; |
aleloi
2016/12/09 13:30:04
Maybe change body to ternary operator one-liner?
peah-webrtc
2016/12/12 19:46:46
Good point!
Done.
|
if (refined_adaptive_filter_enabled_) { |
description += "RefinedAdaptiveFilter;"; |
} |
@@ -473,7 +468,6 @@ void EchoCancellationImpl::SetExtraOptions(const webrtc::Config& config) { |
delay_agnostic_enabled_ = config.Get<DelayAgnostic>().enabled; |
refined_adaptive_filter_enabled_ = |
config.Get<RefinedAdaptiveFilter>().enabled; |
- aec3_enabled_ = config.Get<EchoCanceller3>().enabled; |
} |
Configure(); |
} |
@@ -493,8 +487,6 @@ int EchoCancellationImpl::Configure() { |
extended_filter_enabled_ ? 1 : 0); |
WebRtcAec_enable_delay_agnostic(WebRtcAec_aec_core(canceller->state()), |
delay_agnostic_enabled_ ? 1 : 0); |
- WebRtcAec_enable_aec3(WebRtcAec_aec_core(canceller->state()), |
- aec3_enabled_ ? 1 : 0); |
aleloi
2016/12/09 13:30:04
The member aec3_enabled_ is not used any longer, s
peah-webrtc
2016/12/12 19:46:46
Done.
|
WebRtcAec_enable_refined_adaptive_filter( |
WebRtcAec_aec_core(canceller->state()), |
refined_adaptive_filter_enabled_); |