diff options
| author | Bjorn Volcker <bjornv@chromium.org> | 2015-06-16 23:09:45 +0200 |
|---|---|---|
| committer | Bjorn Volcker <bjornv@chromium.org> | 2015-06-16 21:09:51 +0000 |
| commit | 01c9b012e9171c813ace9e405c32fc75f4262bf6 (patch) | |
| tree | d9bab32026d2e62e97e71b56b08443781691787b /webrtc/modules/audio_processing/aec/echo_cancellation.c | |
| parent | 9002cc426dab7a576f5247f45ba888cd081a39f0 (diff) | |
| download | webrtc-01c9b012e9171c813ace9e405c32fc75f4262bf6.tar.gz | |
Revert "audio_processing/aec: make delay estimator aware of starving farend buffer"
The code only affects DA-AEC, but since DA-AEC is the default AEC if run on Android tests failed. Reverting to fix that test.
This reverts commit 9002cc426dab7a576f5247f45ba888cd081a39f0.
BUG=
TBR=henrik.lundin@webrtc.org
Review URL: https://codereview.webrtc.org/1183243003.
Cr-Commit-Position: refs/heads/master@{#9453}
Diffstat (limited to 'webrtc/modules/audio_processing/aec/echo_cancellation.c')
| -rw-r--r-- | webrtc/modules/audio_processing/aec/echo_cancellation.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/webrtc/modules/audio_processing/aec/echo_cancellation.c b/webrtc/modules/audio_processing/aec/echo_cancellation.c index 106233d682..a39fd2c9d5 100644 --- a/webrtc/modules/audio_processing/aec/echo_cancellation.c +++ b/webrtc/modules/audio_processing/aec/echo_cancellation.c @@ -718,7 +718,9 @@ static int ProcessNormal(Aec* aecpc, } } else { // AEC is enabled. - EstBufDelayNormal(aecpc); + if (WebRtcAec_reported_delay_enabled(aecpc->aec)) { + EstBufDelayNormal(aecpc); + } // Call the AEC. // TODO(bjornv): Re-structure such that we don't have to pass @@ -793,7 +795,9 @@ static void ProcessExtended(Aec* self, self->startup_phase = 0; } - EstBufDelayExtended(self); + if (WebRtcAec_reported_delay_enabled(self->aec)) { + EstBufDelayExtended(self); + } { // |delay_diff_offset| gives us the option to manually rewind the delay on |