mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-14 14:20:45 +01:00
235131303b
This Config configuration will eventually replace the AudioProcessing::noise_suppression() interface. This also introduces a proxy NoiseSuppression, returned by AudioProcessing::noise_suppression. Without this proxy, ApplyConfig could overwrite NS settings for clients who currently use noise_suppression(). For example, the following code will not preserve the noise suppression level: apm->noise_suppression()->set_level(NoiseSuppression::kHigh); auto cfg = apm->GetConfig(); apm->ApplyConfig(cfg); The NoiseSuppression instance returned by noise_suppression() has no way to update the config inside APM, so GetConfig() will return an out-of-date config which is then re-applied. This CL adds a proxy that makes this update, by forwarding Enable() and set_level() calls to ApplyConfig(). Drive-by change: AudioProcessing::Config substructs are reordered to mirror the capture processing pipeline. Tested: Ran ToT and this CL builds of audioproc_f and verified identical settings/aecdumps. Bug: webrtc:9947 Change-Id: I823eade894be115c254d656562564108b2b63b1f Reviewed-on: https://webrtc-review.googlesource.com/c/116521 Reviewed-by: Alex Loiko <aleloi@webrtc.org> Commit-Queue: Sam Zackrisson <saza@webrtc.org> Cr-Commit-Position: refs/heads/master@{#26248}
71 lines
2.1 KiB
C++
71 lines
2.1 KiB
C++
/*
|
|
* Copyright (c) 2019 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/noise_suppression_proxy.h"
|
|
|
|
namespace webrtc {
|
|
NoiseSuppressionProxy::NoiseSuppressionProxy(AudioProcessing* apm,
|
|
NoiseSuppression* ns)
|
|
: apm_(apm), ns_(ns) {}
|
|
|
|
NoiseSuppressionProxy::~NoiseSuppressionProxy() {}
|
|
|
|
int NoiseSuppressionProxy::Enable(bool enable) {
|
|
AudioProcessing::Config config = apm_->GetConfig();
|
|
if (config.noise_suppression.enabled != enable) {
|
|
config.noise_suppression.enabled = enable;
|
|
apm_->ApplyConfig(config);
|
|
}
|
|
return AudioProcessing::kNoError;
|
|
}
|
|
|
|
bool NoiseSuppressionProxy::is_enabled() const {
|
|
return ns_->is_enabled();
|
|
}
|
|
|
|
int NoiseSuppressionProxy::set_level(Level level) {
|
|
AudioProcessing::Config config = apm_->GetConfig();
|
|
using NsConfig = AudioProcessing::Config::NoiseSuppression;
|
|
NsConfig::Level new_level;
|
|
switch (level) {
|
|
case NoiseSuppression::kLow:
|
|
new_level = NsConfig::kLow;
|
|
break;
|
|
case NoiseSuppression::kModerate:
|
|
new_level = NsConfig::kModerate;
|
|
break;
|
|
case NoiseSuppression::kHigh:
|
|
new_level = NsConfig::kHigh;
|
|
break;
|
|
case NoiseSuppression::kVeryHigh:
|
|
new_level = NsConfig::kVeryHigh;
|
|
break;
|
|
default:
|
|
RTC_NOTREACHED();
|
|
}
|
|
if (config.noise_suppression.level != new_level) {
|
|
config.noise_suppression.level = new_level;
|
|
apm_->ApplyConfig(config);
|
|
}
|
|
return AudioProcessing::kNoError;
|
|
}
|
|
|
|
NoiseSuppression::Level NoiseSuppressionProxy::level() const {
|
|
return ns_->level();
|
|
}
|
|
|
|
float NoiseSuppressionProxy::speech_probability() const {
|
|
return ns_->speech_probability();
|
|
}
|
|
|
|
std::vector<float> NoiseSuppressionProxy::NoiseEstimate() {
|
|
return ns_->NoiseEstimate();
|
|
}
|
|
} // namespace webrtc
|