Replaced the data logging functionality in the AEC with a generic logging functionality

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.
  */
 
 #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC_AEC_CORE_INTERNAL_H_
 #define WEBRTC_MODULES_AUDIO_PROCESSING_AEC_AEC_CORE_INTERNAL_H_
 
 extern "C" {
 #include "webrtc/common_audio/ring_buffer.h"
 }
 #include "webrtc/common_audio/wav_file.h"
 #include "webrtc/modules/audio_processing/aec/aec_common.h"
 #include "webrtc/modules/audio_processing/aec/aec_core.h"
+#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h"
 #include "webrtc/modules/audio_processing/utility/block_mean_calculator.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
 
 // Number of partitions for the extended filter mode. The first one is an enum
 // to be used in array declarations, as it represents the maximum filter length.
 enum { kExtendedNumPartitions = 32 };
 static const int kNormalNumPartitions = 12;
 
@@ skipping 37 matching lines @@
   void Clear();
 
   size_t count_;
   size_t occurrence_;
   float fraction_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(DivergentFilterFraction);
 };
 
 struct AecCore {
-  AecCore();
+  explicit AecCore(int instance_index);
+
+  ApmDataDumper data_dumper;
 
   int farBufWritePos, farBufReadPos;
 
   int knownDelay;
   int inSamples, outSamples;
   int delayEstCtr;
 
   RingBuffer* nearFrBuf;
   RingBuffer* outFrBuf;
 
@@ skipping 90 matching lines @@
   int extended_filter_enabled;
   // 1 = next generation aec mode enabled, 0 = disabled.
   int aec3_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
-  // choose different dump file names.
-  int instance_index;
-
-  // Number of times we've restarted dumping; used to pick new dump file names
-  // each time.
-  int debug_dump_count;
-
-  rtc_WavWriter* farFile;
-  rtc_WavWriter* nearFile;
-  rtc_WavWriter* outFile;
-  rtc_WavWriter* outLinearFile;
-  FILE* e_fft_file;
-#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,
@@ skipping 38 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_