Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(86)

Unified Diff: webrtc/modules/audio_processing/aec3/echo_remover.cc

Issue 2611223003: Adding second layer of the echo canceller 3 functionality. (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/audio_processing/aec3/echo_remover.cc
diff --git a/webrtc/modules/audio_processing/aec3/echo_remover.cc b/webrtc/modules/audio_processing/aec3/echo_remover.cc
new file mode 100644
index 0000000000000000000000000000000000000000..6dc4373344af8479ca91ef8e6fe53ad67a146a5a
--- /dev/null
+++ b/webrtc/modules/audio_processing/aec3/echo_remover.cc
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
hlundin-webrtc 2017/01/18 13:08:49 2017
peah-webrtc 2017/01/19 15:33:05 Done.
+ *
+ * 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.
+ */
+#include "webrtc/modules/audio_processing/aec3/echo_remover.h"
+
+#include <algorithm>
+#include <vector>
+
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/optional.h"
+#include "webrtc/modules/audio_processing/aec3/aec3_constants.h"
+
+namespace webrtc {
+
+namespace {
+class EchoRemoverImpl final : public EchoRemover {
+ public:
+ EchoRemoverImpl(ApmDataDumper* data_dumper, int sample_rate_hz);
+ ~EchoRemoverImpl() override;
+
+ void ProcessBlock(const rtc::Optional<size_t>& echo_path_delay_samples,
+ const EchoPathVariability& echo_path_variability,
+ bool capture_signal_saturation,
+ const std::vector<std::vector<float>>& render,
+ std::vector<std::vector<float>>* capture) override;
+
+ void UpdateEchoLeakageStatus(bool leakage_detected) override;
+
+ private:
+ const int sample_rate_hz_;
+
+ RTC_DISALLOW_COPY_AND_ASSIGN(EchoRemoverImpl);
+};
+
+// TODO(peah): Add functionality.
+EchoRemoverImpl::EchoRemoverImpl(ApmDataDumper* data_dumper, int sample_rate_hz)
+ : sample_rate_hz_(sample_rate_hz) {
+ RTC_DCHECK(data_dumper);
+ RTC_DCHECK(sample_rate_hz == 8000 || sample_rate_hz == 16000 ||
+ sample_rate_hz == 32000 || sample_rate_hz == 48000);
+}
+
+EchoRemoverImpl::~EchoRemoverImpl() = default;
+
+// TODO(peah): Add functionality.
+void EchoRemoverImpl::ProcessBlock(
+ const rtc::Optional<size_t>& echo_path_delay_samples,
+ const EchoPathVariability& echo_path_variability,
+ bool capture_signal_saturation,
+ const std::vector<std::vector<float>>& render,
+ std::vector<std::vector<float>>* capture) {
+ RTC_DCHECK(capture);
+ RTC_DCHECK_EQ(render.size(), NumBandsForRate(sample_rate_hz_));
+ RTC_DCHECK_EQ(capture->size(), NumBandsForRate(sample_rate_hz_));
+ RTC_DCHECK_EQ(render[0].size(), kBlockSize);
+ RTC_DCHECK_EQ((*capture)[0].size(), kBlockSize);
+}
+
+// TODO(peah): Add functionality.
+void EchoRemoverImpl::UpdateEchoLeakageStatus(bool leakage_detected) {}
+
+} // namespace
+
+EchoRemover* EchoRemover::Create(ApmDataDumper* data_dumper,
+ int sample_rate_hz) {
+ return new EchoRemoverImpl(data_dumper, sample_rate_hz);
+}
+
+} // namespace webrtc

Powered by Google App Engine
This is Rietveld 408576698