This CL adds support for multiple channels in the reverb modelling. As a side effect, it also partly adds multi-channel supports for the sections of the code. Beyond adding the multi-channel support, a bug is fixed as part of this CL. Since the bug fix affects the bitexactness, as a safety precaution the CL includes the ability to override the bugfix. Apart from the contributions from the bugfix, the changes have been verified to be bitexact for a large set of mono recordings. Bug: webrtc:10913 Change-Id: I1f307b532be85ef4182f8db41384f44d40a25219 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/156382 Commit-Queue: Per Åhgren <peah@webrtc.org> Reviewed-by: Sam Zackrisson <saza@webrtc.org> Cr-Commit-Position: refs/heads/master@{#29456}
94 lines
3.5 KiB
C++
94 lines
3.5 KiB
C++
/*
|
|
* 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 MODULES_AUDIO_PROCESSING_AEC3_ERLE_ESTIMATOR_H_
|
|
#define MODULES_AUDIO_PROCESSING_AEC3_ERLE_ESTIMATOR_H_
|
|
|
|
#include <stddef.h>
|
|
|
|
#include <array>
|
|
#include <memory>
|
|
|
|
#include "absl/types/optional.h"
|
|
#include "api/array_view.h"
|
|
#include "api/audio/echo_canceller3_config.h"
|
|
#include "modules/audio_processing/aec3/aec3_common.h"
|
|
#include "modules/audio_processing/aec3/fullband_erle_estimator.h"
|
|
#include "modules/audio_processing/aec3/render_buffer.h"
|
|
#include "modules/audio_processing/aec3/signal_dependent_erle_estimator.h"
|
|
#include "modules/audio_processing/aec3/subband_erle_estimator.h"
|
|
#include "modules/audio_processing/logging/apm_data_dumper.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// Estimates the echo return loss enhancement. One estimate is done per subband
|
|
// and another one is done using the aggreation of energy over all the subbands.
|
|
class ErleEstimator {
|
|
public:
|
|
ErleEstimator(size_t startup_phase_length_blocks_,
|
|
const EchoCanceller3Config& config,
|
|
size_t num_capture_channels);
|
|
~ErleEstimator();
|
|
|
|
// Resets the fullband ERLE estimator and the subbands ERLE estimators.
|
|
void Reset(bool delay_change);
|
|
|
|
// Updates the ERLE estimates.
|
|
void Update(const RenderBuffer& render_buffer,
|
|
const std::vector<std::array<float, kFftLengthBy2Plus1>>&
|
|
filter_frequency_response,
|
|
rtc::ArrayView<const float> reverb_render_spectrum,
|
|
rtc::ArrayView<const float> capture_spectrum,
|
|
rtc::ArrayView<const float> subtractor_spectrum,
|
|
bool converged_filter,
|
|
bool onset_detection);
|
|
|
|
// Returns the most recent subband ERLE estimates.
|
|
rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> Erle() const {
|
|
return use_signal_dependent_erle_ ? signal_dependent_erle_estimator_.Erle()
|
|
: subband_erle_estimator_.Erle();
|
|
}
|
|
|
|
// Returns the subband ERLE that are estimated during onsets. Used
|
|
// for logging/testing.
|
|
rtc::ArrayView<const float> ErleOnsets() const {
|
|
return subband_erle_estimator_.ErleOnsets();
|
|
}
|
|
|
|
// Returns the fullband ERLE estimate.
|
|
float FullbandErleLog2() const {
|
|
return fullband_erle_estimator_.FullbandErleLog2();
|
|
}
|
|
|
|
// Returns an estimation of the current linear filter quality based on the
|
|
// current and past fullband ERLE estimates. The returned value is a float
|
|
// vector with content between 0 and 1 where 1 indicates that, at this current
|
|
// time instant, the linear filter is reaching its maximum subtraction
|
|
// performance.
|
|
rtc::ArrayView<const absl::optional<float>> GetInstLinearQualityEstimates()
|
|
const {
|
|
return fullband_erle_estimator_.GetInstLinearQualityEstimates();
|
|
}
|
|
|
|
void Dump(const std::unique_ptr<ApmDataDumper>& data_dumper) const;
|
|
|
|
private:
|
|
const size_t startup_phase_length_blocks__;
|
|
const bool use_signal_dependent_erle_;
|
|
FullBandErleEstimator fullband_erle_estimator_;
|
|
SubbandErleEstimator subband_erle_estimator_;
|
|
SignalDependentErleEstimator signal_dependent_erle_estimator_;
|
|
size_t blocks_since_reset_ = 0;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_AUDIO_PROCESSING_AEC3_ERLE_ESTIMATOR_H_
|