Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(239)

Side by Side Diff: webrtc/modules/audio_processing/aec/echo_cancellation.c

Issue 1166463006: Revert r9378 "Rename APM Config DelayCorrection to ExtendedFilter" (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 msInSndCardBuf = 0; 366 msInSndCardBuf = 0;
367 aecpc->lastError = AEC_BAD_PARAMETER_WARNING; 367 aecpc->lastError = AEC_BAD_PARAMETER_WARNING;
368 retVal = -1; 368 retVal = -1;
369 } else if (msInSndCardBuf > kMaxTrustedDelayMs) { 369 } else if (msInSndCardBuf > kMaxTrustedDelayMs) {
370 // The clamping is now done in ProcessExtended/Normal(). 370 // The clamping is now done in ProcessExtended/Normal().
371 aecpc->lastError = AEC_BAD_PARAMETER_WARNING; 371 aecpc->lastError = AEC_BAD_PARAMETER_WARNING;
372 retVal = -1; 372 retVal = -1;
373 } 373 }
374 374
375 // This returns the value of aec->extended_filter_enabled. 375 // This returns the value of aec->extended_filter_enabled.
376 if (WebRtcAec_extended_filter_enabled(aecpc->aec)) { 376 if (WebRtcAec_delay_correction_enabled(aecpc->aec)) {
377 ProcessExtended(aecpc, 377 ProcessExtended(aecpc,
378 nearend, 378 nearend,
379 num_bands, 379 num_bands,
380 out, 380 out,
381 nrOfSamples, 381 nrOfSamples,
382 msInSndCardBuf, 382 msInSndCardBuf,
383 skew); 383 skew);
384 } else { 384 } else {
385 if (ProcessNormal(aecpc, 385 if (ProcessNormal(aecpc,
386 nearend, 386 nearend,
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
921 } 921 }
922 } else { 922 } else {
923 self->timeForDelayChange = 0; 923 self->timeForDelayChange = 0;
924 } 924 }
925 self->lastDelayDiff = delay_difference; 925 self->lastDelayDiff = delay_difference;
926 926
927 if (self->timeForDelayChange > 25) { 927 if (self->timeForDelayChange > 25) {
928 self->knownDelay = WEBRTC_SPL_MAX((int)self->filtDelay - 256, 0); 928 self->knownDelay = WEBRTC_SPL_MAX((int)self->filtDelay - 256, 0);
929 } 929 }
930 } 930 }
OLDNEW
« no previous file with comments | « webrtc/modules/audio_processing/aec/aec_core.c ('k') | webrtc/modules/audio_processing/echo_cancellation_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698