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..9918bb473859349362db621ac8cc0ce603723bca 100644 |
--- a/webrtc/modules/audio_processing/echo_cancellation_impl.cc |
+++ b/webrtc/modules/audio_processing/echo_cancellation_impl.cc |
@@ -106,8 +106,7 @@ EchoCancellationImpl::EchoCancellationImpl(rtc::CriticalSection* crit_render, |
stream_has_echo_(false), |
delay_logging_enabled_(false), |
extended_filter_enabled_(false), |
- delay_agnostic_enabled_(false), |
- aec3_enabled_(false) { |
+ delay_agnostic_enabled_(false) { |
RTC_DCHECK(crit_render); |
RTC_DCHECK(crit_capture); |
} |
@@ -341,18 +340,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;" : ""); |
- if (refined_adaptive_filter_enabled_) { |
- description += "RefinedAdaptiveFilter;"; |
- } |
- return description; |
+ return refined_adaptive_filter_enabled_ ? "RefinedAdaptiveFilter;" : ""; |
} |
bool EchoCancellationImpl::is_refined_adaptive_filter_enabled() const { |
@@ -473,7 +463,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 +482,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); |
WebRtcAec_enable_refined_adaptive_filter( |
WebRtcAec_aec_core(canceller->state()), |
refined_adaptive_filter_enabled_); |