mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-16 23:30:48 +01:00
6a05bb1b12
This CL adds code for doing signal-dependent downmixing before the delay estimation in the multichannel case. As part of the CL, the unittests of the render delay controller are corrected. However, as that caused some of them to fail, the CL (for now) as well disables the failing test. Bug: webrtc:11153,chromium:1029740, webrtc:11161 Change-Id: I0b765c28fa5e547aabd6dfbd24b626ff9a16346f Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/161045 Commit-Queue: Per Åhgren <peah@webrtc.org> Reviewed-by: Sam Zackrisson <saza@webrtc.org> Cr-Commit-Position: refs/heads/master@{#29980}
291 lines
11 KiB
C++
291 lines
11 KiB
C++
/*
|
|
* Copyright (c) 2018 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.
|
|
*/
|
|
#include "modules/audio_processing/aec3/block_processor.h"
|
|
|
|
#include <stddef.h>
|
|
|
|
#include <memory>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "absl/types/optional.h"
|
|
#include "api/audio/echo_canceller3_config.h"
|
|
#include "api/audio/echo_control.h"
|
|
#include "modules/audio_processing/aec3/aec3_common.h"
|
|
#include "modules/audio_processing/aec3/block_processor_metrics.h"
|
|
#include "modules/audio_processing/aec3/delay_estimate.h"
|
|
#include "modules/audio_processing/aec3/echo_path_variability.h"
|
|
#include "modules/audio_processing/aec3/echo_remover.h"
|
|
#include "modules/audio_processing/aec3/render_delay_buffer.h"
|
|
#include "modules/audio_processing/aec3/render_delay_controller.h"
|
|
#include "modules/audio_processing/logging/apm_data_dumper.h"
|
|
#include "rtc_base/atomic_ops.h"
|
|
#include "rtc_base/checks.h"
|
|
#include "rtc_base/logging.h"
|
|
|
|
namespace webrtc {
|
|
namespace {
|
|
|
|
enum class BlockProcessorApiCall { kCapture, kRender };
|
|
|
|
class BlockProcessorImpl final : public BlockProcessor {
|
|
public:
|
|
BlockProcessorImpl(const EchoCanceller3Config& config,
|
|
int sample_rate_hz,
|
|
size_t num_render_channels,
|
|
size_t num_capture_channels,
|
|
std::unique_ptr<RenderDelayBuffer> render_buffer,
|
|
std::unique_ptr<RenderDelayController> delay_controller,
|
|
std::unique_ptr<EchoRemover> echo_remover);
|
|
|
|
BlockProcessorImpl() = delete;
|
|
|
|
~BlockProcessorImpl() override;
|
|
|
|
void ProcessCapture(
|
|
bool echo_path_gain_change,
|
|
bool capture_signal_saturation,
|
|
std::vector<std::vector<std::vector<float>>>* linear_output,
|
|
std::vector<std::vector<std::vector<float>>>* capture_block) override;
|
|
|
|
void BufferRender(
|
|
const std::vector<std::vector<std::vector<float>>>& block) override;
|
|
|
|
void UpdateEchoLeakageStatus(bool leakage_detected) override;
|
|
|
|
void GetMetrics(EchoControl::Metrics* metrics) const override;
|
|
|
|
void SetAudioBufferDelay(int delay_ms) override;
|
|
|
|
private:
|
|
static int instance_count_;
|
|
std::unique_ptr<ApmDataDumper> data_dumper_;
|
|
const EchoCanceller3Config config_;
|
|
bool capture_properly_started_ = false;
|
|
bool render_properly_started_ = false;
|
|
const size_t sample_rate_hz_;
|
|
std::unique_ptr<RenderDelayBuffer> render_buffer_;
|
|
std::unique_ptr<RenderDelayController> delay_controller_;
|
|
std::unique_ptr<EchoRemover> echo_remover_;
|
|
BlockProcessorMetrics metrics_;
|
|
RenderDelayBuffer::BufferingEvent render_event_;
|
|
size_t capture_call_counter_ = 0;
|
|
absl::optional<DelayEstimate> estimated_delay_;
|
|
};
|
|
|
|
int BlockProcessorImpl::instance_count_ = 0;
|
|
|
|
BlockProcessorImpl::BlockProcessorImpl(
|
|
const EchoCanceller3Config& config,
|
|
int sample_rate_hz,
|
|
size_t num_render_channels,
|
|
size_t num_capture_channels,
|
|
std::unique_ptr<RenderDelayBuffer> render_buffer,
|
|
std::unique_ptr<RenderDelayController> delay_controller,
|
|
std::unique_ptr<EchoRemover> echo_remover)
|
|
: data_dumper_(
|
|
new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))),
|
|
config_(config),
|
|
sample_rate_hz_(sample_rate_hz),
|
|
render_buffer_(std::move(render_buffer)),
|
|
delay_controller_(std::move(delay_controller)),
|
|
echo_remover_(std::move(echo_remover)),
|
|
render_event_(RenderDelayBuffer::BufferingEvent::kNone) {
|
|
RTC_DCHECK(ValidFullBandRate(sample_rate_hz_));
|
|
}
|
|
|
|
BlockProcessorImpl::~BlockProcessorImpl() = default;
|
|
|
|
void BlockProcessorImpl::ProcessCapture(
|
|
bool echo_path_gain_change,
|
|
bool capture_signal_saturation,
|
|
std::vector<std::vector<std::vector<float>>>* linear_output,
|
|
std::vector<std::vector<std::vector<float>>>* capture_block) {
|
|
RTC_DCHECK(capture_block);
|
|
RTC_DCHECK_EQ(NumBandsForRate(sample_rate_hz_), capture_block->size());
|
|
RTC_DCHECK_EQ(kBlockSize, (*capture_block)[0][0].size());
|
|
|
|
capture_call_counter_++;
|
|
|
|
data_dumper_->DumpRaw("aec3_processblock_call_order",
|
|
static_cast<int>(BlockProcessorApiCall::kCapture));
|
|
data_dumper_->DumpWav("aec3_processblock_capture_input", kBlockSize,
|
|
&(*capture_block)[0][0][0], 16000, 1);
|
|
|
|
if (render_properly_started_) {
|
|
if (!capture_properly_started_) {
|
|
capture_properly_started_ = true;
|
|
render_buffer_->Reset();
|
|
if (delay_controller_)
|
|
delay_controller_->Reset(true);
|
|
}
|
|
} else {
|
|
// If no render data has yet arrived, do not process the capture signal.
|
|
return;
|
|
}
|
|
|
|
EchoPathVariability echo_path_variability(
|
|
echo_path_gain_change, EchoPathVariability::DelayAdjustment::kNone,
|
|
false);
|
|
|
|
if (render_event_ == RenderDelayBuffer::BufferingEvent::kRenderOverrun &&
|
|
render_properly_started_) {
|
|
echo_path_variability.delay_change =
|
|
EchoPathVariability::DelayAdjustment::kBufferFlush;
|
|
if (delay_controller_)
|
|
delay_controller_->Reset(true);
|
|
RTC_LOG(LS_WARNING) << "Reset due to render buffer overrun at block "
|
|
<< capture_call_counter_;
|
|
}
|
|
render_event_ = RenderDelayBuffer::BufferingEvent::kNone;
|
|
|
|
// Update the render buffers with any newly arrived render blocks and prepare
|
|
// the render buffers for reading the render data corresponding to the current
|
|
// capture block.
|
|
RenderDelayBuffer::BufferingEvent buffer_event =
|
|
render_buffer_->PrepareCaptureProcessing();
|
|
// Reset the delay controller at render buffer underrun.
|
|
if (buffer_event == RenderDelayBuffer::BufferingEvent::kRenderUnderrun) {
|
|
if (delay_controller_)
|
|
delay_controller_->Reset(false);
|
|
}
|
|
|
|
data_dumper_->DumpWav("aec3_processblock_capture_input2", kBlockSize,
|
|
&(*capture_block)[0][0][0], 16000, 1);
|
|
|
|
bool has_delay_estimator = !config_.delay.use_external_delay_estimator;
|
|
if (has_delay_estimator) {
|
|
RTC_DCHECK(delay_controller_);
|
|
// Compute and apply the render delay required to achieve proper signal
|
|
// alignment.
|
|
estimated_delay_ = delay_controller_->GetDelay(
|
|
render_buffer_->GetDownsampledRenderBuffer(), render_buffer_->Delay(),
|
|
(*capture_block)[0]);
|
|
|
|
if (estimated_delay_) {
|
|
bool delay_change =
|
|
render_buffer_->AlignFromDelay(estimated_delay_->delay);
|
|
if (delay_change) {
|
|
rtc::LoggingSeverity log_level =
|
|
config_.delay.log_warning_on_delay_changes ? rtc::LS_WARNING
|
|
: rtc::LS_INFO;
|
|
RTC_LOG_V(log_level) << "Delay changed to " << estimated_delay_->delay
|
|
<< " at block " << capture_call_counter_;
|
|
echo_path_variability.delay_change =
|
|
EchoPathVariability::DelayAdjustment::kNewDetectedDelay;
|
|
}
|
|
}
|
|
|
|
echo_path_variability.clock_drift = delay_controller_->HasClockdrift();
|
|
|
|
} else {
|
|
render_buffer_->AlignFromExternalDelay();
|
|
}
|
|
|
|
// Remove the echo from the capture signal.
|
|
if (has_delay_estimator || render_buffer_->HasReceivedBufferDelay()) {
|
|
echo_remover_->ProcessCapture(
|
|
echo_path_variability, capture_signal_saturation, estimated_delay_,
|
|
render_buffer_->GetRenderBuffer(), linear_output, capture_block);
|
|
}
|
|
|
|
// Update the metrics.
|
|
metrics_.UpdateCapture(false);
|
|
}
|
|
|
|
void BlockProcessorImpl::BufferRender(
|
|
const std::vector<std::vector<std::vector<float>>>& block) {
|
|
RTC_DCHECK_EQ(NumBandsForRate(sample_rate_hz_), block.size());
|
|
RTC_DCHECK_EQ(kBlockSize, block[0][0].size());
|
|
data_dumper_->DumpRaw("aec3_processblock_call_order",
|
|
static_cast<int>(BlockProcessorApiCall::kRender));
|
|
data_dumper_->DumpWav("aec3_processblock_render_input", kBlockSize,
|
|
&block[0][0][0], 16000, 1);
|
|
data_dumper_->DumpWav("aec3_processblock_render_input2", kBlockSize,
|
|
&block[0][0][0], 16000, 1);
|
|
|
|
render_event_ = render_buffer_->Insert(block);
|
|
|
|
metrics_.UpdateRender(render_event_ !=
|
|
RenderDelayBuffer::BufferingEvent::kNone);
|
|
|
|
render_properly_started_ = true;
|
|
if (delay_controller_)
|
|
delay_controller_->LogRenderCall();
|
|
}
|
|
|
|
void BlockProcessorImpl::UpdateEchoLeakageStatus(bool leakage_detected) {
|
|
echo_remover_->UpdateEchoLeakageStatus(leakage_detected);
|
|
}
|
|
|
|
void BlockProcessorImpl::GetMetrics(EchoControl::Metrics* metrics) const {
|
|
echo_remover_->GetMetrics(metrics);
|
|
constexpr int block_size_ms = 4;
|
|
absl::optional<size_t> delay = render_buffer_->Delay();
|
|
metrics->delay_ms = delay ? static_cast<int>(*delay) * block_size_ms : 0;
|
|
}
|
|
|
|
void BlockProcessorImpl::SetAudioBufferDelay(int delay_ms) {
|
|
render_buffer_->SetAudioBufferDelay(delay_ms);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
BlockProcessor* BlockProcessor::Create(const EchoCanceller3Config& config,
|
|
int sample_rate_hz,
|
|
size_t num_render_channels,
|
|
size_t num_capture_channels) {
|
|
std::unique_ptr<RenderDelayBuffer> render_buffer(
|
|
RenderDelayBuffer::Create(config, sample_rate_hz, num_render_channels));
|
|
std::unique_ptr<RenderDelayController> delay_controller;
|
|
if (!config.delay.use_external_delay_estimator) {
|
|
delay_controller.reset(RenderDelayController::Create(config, sample_rate_hz,
|
|
num_capture_channels));
|
|
}
|
|
std::unique_ptr<EchoRemover> echo_remover(EchoRemover::Create(
|
|
config, sample_rate_hz, num_render_channels, num_capture_channels));
|
|
return Create(config, sample_rate_hz, num_render_channels,
|
|
num_capture_channels, std::move(render_buffer),
|
|
std::move(delay_controller), std::move(echo_remover));
|
|
}
|
|
|
|
BlockProcessor* BlockProcessor::Create(
|
|
const EchoCanceller3Config& config,
|
|
int sample_rate_hz,
|
|
size_t num_render_channels,
|
|
size_t num_capture_channels,
|
|
std::unique_ptr<RenderDelayBuffer> render_buffer) {
|
|
std::unique_ptr<RenderDelayController> delay_controller;
|
|
if (!config.delay.use_external_delay_estimator) {
|
|
delay_controller.reset(RenderDelayController::Create(config, sample_rate_hz,
|
|
num_capture_channels));
|
|
}
|
|
std::unique_ptr<EchoRemover> echo_remover(EchoRemover::Create(
|
|
config, sample_rate_hz, num_render_channels, num_capture_channels));
|
|
return Create(config, sample_rate_hz, num_render_channels,
|
|
num_capture_channels, std::move(render_buffer),
|
|
std::move(delay_controller), std::move(echo_remover));
|
|
}
|
|
|
|
BlockProcessor* BlockProcessor::Create(
|
|
const EchoCanceller3Config& config,
|
|
int sample_rate_hz,
|
|
size_t num_render_channels,
|
|
size_t num_capture_channels,
|
|
std::unique_ptr<RenderDelayBuffer> render_buffer,
|
|
std::unique_ptr<RenderDelayController> delay_controller,
|
|
std::unique_ptr<EchoRemover> echo_remover) {
|
|
return new BlockProcessorImpl(config, sample_rate_hz, num_render_channels,
|
|
num_capture_channels, std::move(render_buffer),
|
|
std::move(delay_controller),
|
|
std::move(echo_remover));
|
|
}
|
|
|
|
} // namespace webrtc
|