Index: webrtc/modules/audio_processing/aec/aec_core_internal.h |
diff --git a/webrtc/modules/audio_processing/aec/aec_core_internal.h b/webrtc/modules/audio_processing/aec/aec_core_internal.h |
index 05f5083c4ad919065048ec157456bfc6936c473a..1f7b6b541fa9a27a07ac67d2c4e77e3a769dc695 100644 |
--- a/webrtc/modules/audio_processing/aec/aec_core_internal.h |
+++ b/webrtc/modules/audio_processing/aec/aec_core_internal.h |
@@ -35,11 +35,6 @@ enum { |
kHistorySizeBlocks = 125 |
}; |
-// Extended filter adaptation parameters. |
-// TODO(ajm): No narrowband tuning yet. |
-static const float kExtendedMu = 0.4f; |
-static const float kExtendedErrorThreshold = 1.0e-6f; |
- |
typedef struct PowerLevel { |
PowerLevel(); |
@@ -126,12 +121,12 @@ struct AecCore { |
int system_delay; // Current system delay buffered in AEC. |
int mult; // sampling frequency multiple |
- int sampFreq; |
+ int sampFreq = 16000; |
size_t num_bands; |
uint32_t seed; |
- float normal_mu; // stepsize |
- float normal_error_threshold; // error threshold |
+ float filter_step_size; // stepsize |
+ float error_threshold; // error threshold |
int noiseEstCtr; |
@@ -178,6 +173,7 @@ struct AecCore { |
int extended_filter_enabled; |
// 1 = next generation aec mode enabled, 0 = disabled. |
int aec3_enabled; |
+ bool refined_adaptive_filter_enabled; |
// Runtime selection of number of filter partitions. |
int num_partitions; |
@@ -210,9 +206,8 @@ typedef void (*WebRtcAecFilterFar)( |
float h_fft_buf[2][kExtendedNumPartitions * PART_LEN1], |
float y_fft[2][PART_LEN1]); |
extern WebRtcAecFilterFar WebRtcAec_FilterFar; |
-typedef void (*WebRtcAecScaleErrorSignal)(int extended_filter_enabled, |
- float normal_mu, |
- float normal_error_threshold, |
+typedef void (*WebRtcAecScaleErrorSignal)(float mu, |
+ float error_threshold, |
float x_pow[PART_LEN1], |
float ef[2][PART_LEN1]); |
extern WebRtcAecScaleErrorSignal WebRtcAec_ScaleErrorSignal; |