Finalization of the first version of EchoCanceller 3

webrtc/modules/audio_processing/aec3/subtractor_output.h

+/*
+ *  Copyright (c) 2017 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_AEC3_SUBTRACTOR_OUTPUT_H_
+#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_OUTPUT_H_
+
+#include <array>
+
+#include "webrtc/modules/audio_processing/aec3/aec3_common.h"
+#include "webrtc/modules/audio_processing/aec3/fft_data.h"
+
+namespace webrtc {
+
+// Stores the values being returned from the echo subtractor.
+struct SubtractorOutput {

[hlundin-webrtc, 2017/02/22 21:17:29]

You could just as well include this as a struct inside the Subtractor class. Up
to you.

[peah-webrtc, 2017/02/22 23:51:40]

I don't think that works, since SubtractorOutput is used by
MainFilterUpdateGain. That would cause main_filter_update_gain.h to have to
include subtractor.h, which itself includes main_filter_update_gain.h which
means that there is a problem with a circular inclusion.

[hlundin-webrtc, 2017/02/23 07:42:09]

Acknowledged.

[peah-webrtc, 2017/02/23 11:18:33]

Acknowledged.

+  std::array<float, kBlockSize> e_main;
+  std::array<float, kBlockSize> e_shadow;
+  FftData E_main;
+  FftData E_shadow;
+  std::array<float, kFftLengthBy2Plus1> E2_main;
+  std::array<float, kFftLengthBy2Plus1> E2_shadow;
+
+  void Reset() {
+    e_main.fill(0.f);
+    e_shadow.fill(0.f);
+    E_main.re.fill(0.f);
+    E_main.im.fill(0.f);
+    E_shadow.re.fill(0.f);
+    E_shadow.im.fill(0.f);
+    E2_main.fill(0.f);
+    E2_shadow.fill(0.f);
+  }
+};
+
+}  // namespace webrtc
+
+#endif  // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_OUTPUT_H_