Enable Echo Control at injection.

Echo Control is enabled in capture_nonlocked_ when injected.
Renamed echo_canceller3_enabled to echo_controller_enabled.

Bug: webrtc:8346
Change-Id: Icf441f07ce64719358841544da7579feeb7cfdbb
Reviewed-on: https://webrtc-review.googlesource.com/10808
Commit-Queue: Gustaf Ullberg <gustaf@webrtc.org>
Reviewed-by: Per Åhgren <peah@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20311}
This commit is contained in:
Gustaf Ullberg
2017-10-16 13:49:04 +02:00
committed by Commit Bot
parent 31fbb5425e
commit ce045acd94
3 changed files with 20 additions and 16 deletions

View File

@ -159,7 +159,7 @@ class AudioProcessingImpl : public AudioProcessing {
bool adaptive_gain_controller_enabled,
bool gain_controller2_enabled,
bool level_controller_enabled,
bool echo_canceller3_enabled,
bool echo_controller_enabled,
bool voice_activity_detector_enabled,
bool level_estimator_enabled,
bool transient_suppressor_enabled);
@ -181,7 +181,7 @@ class AudioProcessingImpl : public AudioProcessing {
bool adaptive_gain_controller_enabled_ = false;
bool gain_controller2_enabled_ = false;
bool level_controller_enabled_ = false;
bool echo_canceller3_enabled_ = false;
bool echo_controller_enabled_ = false;
bool level_estimator_enabled_ = false;
bool voice_activity_detector_enabled_ = false;
bool transient_suppressor_enabled_ = false;
@ -373,7 +373,7 @@ class AudioProcessingImpl : public AudioProcessing {
bool beamformer_enabled;
bool intelligibility_enabled;
bool level_controller_enabled = false;
bool echo_canceller3_enabled = false;
bool echo_controller_enabled = false;
} capture_nonlocked_;
struct ApmRenderState {