zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make GetConfig() part of the AudioProcessing interface

Browse Source 
BUG=chromium:708475
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_chromium_rel_ng

Review-Url: https://codereview.webrtc.org/2802603003
Cr-Commit-Position: refs/heads/master@{#17540}
This commit is contained in:
henrik.lundin
2017-04-05 05:48:24 -07:00
committed by Commit bot
parent 368f5cf27e
commit adf0635ed5
4 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/modules/audio_processing/audio_processing_impl.h
View File

@ -134,9 +134,9 @@ class AudioProcessingImpl : public AudioProcessing {
NoiseSuppression* noise_suppression() const override; NoiseSuppression* noise_suppression() const override;
VoiceDetection* voice_detection() const override; VoiceDetection* voice_detection() const override;
// TODO(peah): Remove these two methods once the new API allows that. // TODO(peah): Remove MutateConfig once the new API allows that.
void MutateConfig(rtc::FunctionView<void(AudioProcessing::Config*)> mutator); void MutateConfig(rtc::FunctionView<void(AudioProcessing::Config*)> mutator);
AudioProcessing::Config GetConfig() const; AudioProcessing::Config GetConfig() const override;
protected: protected:
// Overridden in a mock. // Overridden in a mock.

3
webrtc/modules/audio_processing/include/audio_processing.cc
View File

@ -31,5 +31,8 @@ Beamforming::Beamforming(bool enabled,
Beamforming::~Beamforming() {} Beamforming::~Beamforming() {}
AudioProcessing::Config AudioProcessing::GetConfig() const {
return AudioProcessing::Config();
}
} // namespace webrtc } // namespace webrtc

5
webrtc/modules/audio_processing/include/audio_processing.h
View File

@ -559,6 +559,11 @@ class AudioProcessing {
virtual NoiseSuppression* noise_suppression() const = 0; virtual NoiseSuppression* noise_suppression() const = 0;
virtual VoiceDetection* voice_detection() const = 0; virtual VoiceDetection* voice_detection() const = 0;
// Returns the last applied configuration.
// TODO(henrik.lundin) Make this method pure virtual when downstream
// dependencies have been fixed.
virtual AudioProcessing::Config GetConfig() const;
enum Error { enum Error {
// Fatal errors. // Fatal errors.
kNoError = 0, kNoError = 0,

2
webrtc/modules/audio_processing/include/mock_audio_processing.h
View File

@ -206,6 +206,8 @@ class MockAudioProcessing : public AudioProcessing {
return voice_detection_.get(); return voice_detection_.get();
} }
MOCK_CONST_METHOD0(GetConfig, AudioProcessing::Config());
private: private:
std::unique_ptr<MockEchoCancellation> echo_cancellation_; std::unique_ptr<MockEchoCancellation> echo_cancellation_;
std::unique_ptr<MockEchoControlMobile> echo_control_mobile_; std::unique_ptr<MockEchoControlMobile> echo_control_mobile_;