diff --git a/webrtc/modules/audio_processing/echo_cancellation_impl.h b/webrtc/modules/audio_processing/echo_cancellation_impl.h index 2b57ebb508..3ab0ce2668 100644 --- a/webrtc/modules/audio_processing/echo_cancellation_impl.h +++ b/webrtc/modules/audio_processing/echo_cancellation_impl.h @@ -15,30 +15,6 @@ namespace webrtc { -// Use to enable the delay correction feature. This now engages an extended -// filter mode in the AEC, along with robustness measures around the reported -// system delays. It comes with a significant increase in AEC complexity, but is -// much more robust to unreliable reported delays. -// -// Detailed changes to the algorithm: -// - The filter length is changed from 48 to 128 ms. This comes with tuning of -// several parameters: i) filter adaptation stepsize and error threshold; -// ii) non-linear processing smoothing and overdrive. -// - Option to ignore the reported delays on platforms which we deem -// sufficiently unreliable. See WEBRTC_UNTRUSTED_DELAY in echo_cancellation.c. -// - Faster startup times by removing the excessive "startup phase" processing -// of reported delays. -// - Much more conservative adjustments to the far-end read pointer. We smooth -// the delay difference more heavily, and back off from the difference more. -// Adjustments force a readaptation of the filter, so they should be avoided -// except when really necessary. -struct DelayCorrection { - DelayCorrection() : enabled(false) {} - DelayCorrection(bool enabled) : enabled(enabled) {} - - bool enabled; -}; - class AudioProcessingImpl; class AudioBuffer; diff --git a/webrtc/modules/audio_processing/echo_cancellation_impl_unittest.cc b/webrtc/modules/audio_processing/echo_cancellation_impl_unittest.cc index 16ecf02e4b..f9bc3213ff 100644 --- a/webrtc/modules/audio_processing/echo_cancellation_impl_unittest.cc +++ b/webrtc/modules/audio_processing/echo_cancellation_impl_unittest.cc @@ -12,7 +12,6 @@ extern "C" { #include "webrtc/modules/audio_processing/aec/aec_core.h" } -#include "webrtc/modules/audio_processing/echo_cancellation_impl.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" diff --git a/webrtc/modules/audio_processing/include/audio_processing.h b/webrtc/modules/audio_processing/include/audio_processing.h index b01cbb32fb..1babe43a11 100644 --- a/webrtc/modules/audio_processing/include/audio_processing.h +++ b/webrtc/modules/audio_processing/include/audio_processing.h @@ -30,6 +30,30 @@ class LevelEstimator; class NoiseSuppression; class VoiceDetection; +// Use to enable the delay correction feature. This now engages an extended +// filter mode in the AEC, along with robustness measures around the reported +// system delays. It comes with a significant increase in AEC complexity, but is +// much more robust to unreliable reported delays. +// +// Detailed changes to the algorithm: +// - The filter length is changed from 48 to 128 ms. This comes with tuning of +// several parameters: i) filter adaptation stepsize and error threshold; +// ii) non-linear processing smoothing and overdrive. +// - Option to ignore the reported delays on platforms which we deem +// sufficiently unreliable. See WEBRTC_UNTRUSTED_DELAY in echo_cancellation.c. +// - Faster startup times by removing the excessive "startup phase" processing +// of reported delays. +// - Much more conservative adjustments to the far-end read pointer. We smooth +// the delay difference more heavily, and back off from the difference more. +// Adjustments force a readaptation of the filter, so they should be avoided +// except when really necessary. +struct DelayCorrection { + DelayCorrection() : enabled(false) {} + DelayCorrection(bool enabled) : enabled(enabled) {} + + bool enabled; +}; + // The Audio Processing Module (APM) provides a collection of voice processing // components designed for real-time communications software. //