Removed the file echo_cancellation_internal.h and moved the file content to echo_cancellation.h.

webrtc/modules/audio_processing/aec/echo_cancellation.h

 /*
  *  Copyright (c) 2012 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.
  */
 
 #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC_ECHO_CANCELLATION_H_
 #define WEBRTC_MODULES_AUDIO_PROCESSING_AEC_ECHO_CANCELLATION_H_
 
+#include <memory>
+
 #include <stddef.h>
 
+extern "C" {
+#include "webrtc/common_audio/ring_buffer.h"
+}
+#include "webrtc/modules/audio_processing/aec/aec_core.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
 
 // Errors
 #define AEC_UNSPECIFIED_ERROR 12000
 #define AEC_UNSUPPORTED_FUNCTION_ERROR 12001
 #define AEC_UNINITIALIZED_ERROR 12002
 #define AEC_NULL_POINTER_ERROR 12003
 #define AEC_BAD_PARAMETER_ERROR 12004
@@ skipping 23 matching lines @@
 typedef struct {
   AecLevel rerl;
   AecLevel erl;
   AecLevel erle;
   AecLevel aNlp;
   float divergent_filter_fraction;
 } AecMetrics;
 
 struct AecCore;
 
+class ApmDataDumper;
+
+typedef struct Aec {
+  std::unique_ptr<ApmDataDumper> data_dumper;
+
+  int delayCtr;
+  int sampFreq;
+  int splitSampFreq;
+  int scSampFreq;
+  float sampFactor;  // scSampRate / sampFreq
+  short skewMode;
+  int bufSizeStart;
+  int knownDelay;
+  int rate_factor;
+
+  short initFlag;  // indicates if AEC has been initialized
+
+  // Variables used for averaging far end buffer size
+  short counter;
+  int sum;
+  short firstVal;
+  short checkBufSizeCtr;
+
+  // Variables used for delay shifts
+  short msInSndCardBuf;
+  short filtDelay;  // Filtered delay estimate.
+  int timeForDelayChange;
+  int startup_phase;
+  int checkBuffSize;
+  short lastDelayDiff;
+
+  // Structures
+  void* resampler;
+
+  int skewFrCtr;
+  int resample;  // if the skew is small enough we don't resample
+  int highSkewCtr;
+  float skew;
+
+  RingBuffer* far_pre_buf;  // Time domain far-end pre-buffer.
+
+  int farend_started;
+
+  // Aec instance counter.
+  static int instance_count;
+  AecCore* aec;
+} Aec;
+
 /*
  * Allocates the memory needed by the AEC. The memory needs to be initialized
  * separately using the WebRtcAec_Init() function. Returns a pointer to the
  * object or NULL on error.
  */
 void* WebRtcAec_Create();
 
 /*
  * This function releases the memory allocated by WebRtcAec_Create().
  *
@@ skipping 164 matching lines @@
 //  - handle                    : Pointer to the AEC instance.
 //
 // Return value:
 //  - AecCore pointer           : NULL for error.
 //
 struct AecCore* WebRtcAec_aec_core(void* handle);
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_PROCESSING_AEC_ECHO_CANCELLATION_H_