mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-15 06:40:43 +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}
45 lines
1.6 KiB
C++
45 lines
1.6 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.
|
|
*/
|
|
|
|
#ifndef MODULES_AUDIO_PROCESSING_NOISE_SUPPRESSION_PROXY_H_
|
|
#define MODULES_AUDIO_PROCESSING_NOISE_SUPPRESSION_PROXY_H_
|
|
|
|
#include <vector>
|
|
|
|
#include "modules/audio_processing/include/audio_processing.h"
|
|
#include "rtc_base/constructormagic.h"
|
|
|
|
namespace webrtc {
|
|
// This class ensures interoperability with the pointer-to-submodule interface
|
|
// AudioProcessing::noise_suppression() and AudioProcessing::ApplyConfig:
|
|
// Enable(..) and set_level(..) calls are applied via
|
|
// AudioProcessing::ApplyConfig, while all other function calls are forwarded
|
|
// directly to a wrapped NoiseSuppression instance.
|
|
class NoiseSuppressionProxy : public NoiseSuppression {
|
|
public:
|
|
NoiseSuppressionProxy(AudioProcessing* apm, NoiseSuppression* ns);
|
|
~NoiseSuppressionProxy() override;
|
|
|
|
// NoiseSuppression implementation.
|
|
int Enable(bool enable) override;
|
|
bool is_enabled() const override;
|
|
int set_level(Level level) override;
|
|
Level level() const override;
|
|
float speech_probability() const override;
|
|
std::vector<float> NoiseEstimate() override;
|
|
|
|
private:
|
|
AudioProcessing* apm_;
|
|
NoiseSuppression* ns_;
|
|
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(NoiseSuppressionProxy);
|
|
};
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_AUDIO_PROCESSING_NOISE_SUPPRESSION_PROXY_H_
|