Added support in the AEC for refined filter adaptation.

webrtc/modules/audio_processing/aec/aec_core_internal.h

 /*
  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 17 matching lines @@
 static const int kNormalNumPartitions = 12;
 
 // Delay estimator constants, used for logging and delay compensation if
 // if reported delays are disabled.
 enum { kLookaheadBlocks = 15 };
 enum {
   // 500 ms for 16 kHz which is equivalent with the limit of reported delays.
   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();
 
   BlockMeanCalculator framelevel;
   BlockMeanCalculator averagelevel;
   float minlevel;
 } PowerLevel;
 
 class DivergentFilterFraction {
  public:
@@ skipping 66 matching lines @@
   short stNearState, echoState;
   short divergeState;
 
   int xfBufBlockPos;
 
   RingBuffer* far_time_buf;
 
   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;
 
   PowerLevel farlevel;
   PowerLevel nearlevel;
   PowerLevel linoutlevel;
   PowerLevel nlpoutlevel;
 
   int metricsMode;
   int stateCounter;
@@ skipping 26 matching lines @@
   float delay_quality_threshold;
   int frame_count;
 
   // 0 = delay agnostic mode (signal based delay correction) disabled.
   // Otherwise enabled.
   int delay_agnostic_enabled;
   // 1 = extended filter mode enabled, 0 = disabled.
   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;
 
   // Flag that extreme filter divergence has been detected by the Echo
   // Suppressor.
   int extreme_filter_divergence;
 
 #ifdef WEBRTC_AEC_DEBUG_DUMP
   // Sequence number of this AEC instance, so that different instances can
@@ skipping 12 matching lines @@
 #endif
 };
 
 typedef void (*WebRtcAecFilterFar)(
     int num_partitions,
     int x_fft_buf_block_pos,
     float x_fft_buf[2][kExtendedNumPartitions * PART_LEN1],
     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;
 typedef void (*WebRtcAecFilterAdaptation)(
     int num_partitions,
     int x_fft_buf_block_pos,
     float x_fft_buf[2][kExtendedNumPartitions * PART_LEN1],
     float e_fft[2][PART_LEN1],
     float h_fft_buf[2][kExtendedNumPartitions * PART_LEN1]);
 extern WebRtcAecFilterAdaptation WebRtcAec_FilterAdaptation;
@@ skipping 26 matching lines @@
 typedef void (*WebRtcAecStoreAsComplex)(const float* data,
                                         float data_complex[2][PART_LEN1]);
 extern WebRtcAecStoreAsComplex WebRtcAec_StoreAsComplex;
 
 typedef void (*WebRtcAecWindowData)(float* x_windowed, const float* x);
 extern WebRtcAecWindowData WebRtcAec_WindowData;
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_PROCESSING_AEC_AEC_CORE_INTERNAL_H_