Remove the noise_suppression() pointer to submodule interface
Bug: webrtc:9878 Change-Id: I356afddb56cc1957e9d0415e2723f66e0e4ac522 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/137517 Reviewed-by: Niels Moller <nisse@webrtc.org> Reviewed-by: Ivo Creusen <ivoc@webrtc.org> Commit-Queue: Sam Zackrisson <saza@webrtc.org> Cr-Commit-Position: refs/heads/master@{#29499}
This commit is contained in:
@ -22,17 +22,6 @@
|
||||
namespace webrtc {
|
||||
|
||||
namespace test {
|
||||
class MockNoiseSuppression : public NoiseSuppression {
|
||||
public:
|
||||
virtual ~MockNoiseSuppression() {}
|
||||
MOCK_METHOD1(Enable, int(bool enable));
|
||||
MOCK_CONST_METHOD0(is_enabled, bool());
|
||||
MOCK_METHOD1(set_level, int(Level level));
|
||||
MOCK_CONST_METHOD0(level, Level());
|
||||
MOCK_CONST_METHOD0(speech_probability, float());
|
||||
MOCK_METHOD0(NoiseEstimate, std::vector<float>());
|
||||
};
|
||||
|
||||
class MockCustomProcessing : public CustomProcessing {
|
||||
public:
|
||||
virtual ~MockCustomProcessing() {}
|
||||
@ -65,8 +54,7 @@ class MockEchoControl : public EchoControl {
|
||||
|
||||
class MockAudioProcessing : public ::testing::NiceMock<AudioProcessing> {
|
||||
public:
|
||||
MockAudioProcessing()
|
||||
: noise_suppression_(new ::testing::NiceMock<MockNoiseSuppression>()) {}
|
||||
MockAudioProcessing() {}
|
||||
|
||||
virtual ~MockAudioProcessing() {}
|
||||
|
||||
@ -132,14 +120,8 @@ class MockAudioProcessing : public ::testing::NiceMock<AudioProcessing> {
|
||||
|
||||
MOCK_METHOD0(UpdateHistogramsOnCallEnd, void());
|
||||
MOCK_CONST_METHOD1(GetStatistics, AudioProcessingStats(bool));
|
||||
virtual MockNoiseSuppression* noise_suppression() const {
|
||||
return noise_suppression_.get();
|
||||
}
|
||||
|
||||
MOCK_CONST_METHOD0(GetConfig, AudioProcessing::Config());
|
||||
|
||||
private:
|
||||
std::unique_ptr<MockNoiseSuppression> noise_suppression_;
|
||||
};
|
||||
|
||||
} // namespace test
|
||||
|
||||
Reference in New Issue
Block a user