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

Ensure that AEC3 is not run in tandem with AEC2

Browse Source 
AEC3 and AEC2 are separate submodules in APM. This CL ensures that AEC3
deactivates AEC2 if both are active at the same time.

BUG=webrtc:6018

Review-Url: https://codereview.webrtc.org/2675863004
Cr-Commit-Position: refs/heads/master@{#16443}
This commit is contained in:
peah
2017-02-06 03:39:42 -08:00
committed by Commit bot
parent 237e1bbf76
commit 61202ac2ea
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/modules/audio_processing/audio_processing_impl.cc
View File

@ -1187,11 +1187,11 @@ int AudioProcessingImpl::ProcessCaptureStreamLocked() {
if (private_submodules_->echo_canceller3) {
private_submodules_->echo_canceller3->ProcessCapture(capture_buffer, false);
} else {
RETURN_ON_ERR(public_submodules_->echo_cancellation->ProcessCaptureAudio(
capture_buffer, stream_delay_ms()));
}
RETURN_ON_ERR(public_submodules_->echo_cancellation->ProcessCaptureAudio(
capture_buffer, stream_delay_ms()));
if (public_submodules_->echo_control_mobile->is_enabled() &&
public_submodules_->noise_suppression->is_enabled()) {
capture_buffer->CopyLowPassToReference();