| 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 1f7b6b541fa9a27a07ac67d2c4e77e3a769dc695..6e08e9fe99085ddd724b307a34e77ce13a2fc35e 100644
|
| --- a/webrtc/modules/audio_processing/aec/aec_core_internal.h
|
| +++ b/webrtc/modules/audio_processing/aec/aec_core_internal.h
|
| @@ -11,12 +11,15 @@
|
| #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC_AEC_CORE_INTERNAL_H_
|
| #define WEBRTC_MODULES_AUDIO_PROCESSING_AEC_AEC_CORE_INTERNAL_H_
|
|
|
| +#include <memory>
|
| +
|
| 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"
|
|
|
| @@ -69,7 +72,10 @@ class DivergentFilterFraction {
|
| };
|
|
|
| struct AecCore {
|
| - AecCore();
|
| + explicit AecCore(int instance_index);
|
| + ~AecCore();
|
| +
|
| + std::unique_ptr<ApmDataDumper> data_dumper;
|
|
|
| int farBufWritePos, farBufReadPos;
|
|
|
| @@ -181,22 +187,6 @@ struct AecCore {
|
| // 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)(
|
|
|