Delete deprecated AEC interfaces
They've been officially deprecated since September 4, 2018.
PSA: https://groups.google.com/forum/#!topic/discuss-webrtc/r_9n-PRUIX4
Bug: webrtc:9535
Change-Id: I294e22ae874b1edd81a0a0347755d82c5ebc61e0
Reviewed-on: https://webrtc-review.googlesource.com/c/103444
Reviewed-by: Gustaf Ullberg <gustaf@webrtc.org>
Commit-Queue: Sam Zackrisson <saza@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24971}diff --git a/modules/audio_processing/include/mock_audio_processing.h b/modules/audio_processing/include/mock_audio_processing.h
index 2864e48..4a1fe62 100644
--- a/modules/audio_processing/include/mock_audio_processing.h
+++ b/modules/audio_processing/include/mock_audio_processing.h
@@ -21,43 +21,6 @@
namespace webrtc {
namespace test {
-
-class MockEchoCancellation : public EchoCancellation {
- public:
- virtual ~MockEchoCancellation() {}
- MOCK_METHOD1(Enable, int(bool enable));
- MOCK_CONST_METHOD0(is_enabled, bool());
- MOCK_METHOD1(enable_drift_compensation, int(bool enable));
- MOCK_CONST_METHOD0(is_drift_compensation_enabled, bool());
- MOCK_METHOD1(set_stream_drift_samples, void(int drift));
- MOCK_CONST_METHOD0(stream_drift_samples, int());
- MOCK_METHOD1(set_suppression_level, int(SuppressionLevel level));
- MOCK_CONST_METHOD0(suppression_level, SuppressionLevel());
- MOCK_CONST_METHOD0(stream_has_echo, bool());
- MOCK_METHOD1(enable_metrics, int(bool enable));
- MOCK_CONST_METHOD0(are_metrics_enabled, bool());
- MOCK_METHOD1(GetMetrics, int(Metrics* metrics));
- MOCK_METHOD1(enable_delay_logging, int(bool enable));
- MOCK_CONST_METHOD0(is_delay_logging_enabled, bool());
- MOCK_METHOD2(GetDelayMetrics, int(int* median, int* std));
- MOCK_METHOD3(GetDelayMetrics,
- int(int* median, int* std, float* fraction_poor_delays));
- MOCK_CONST_METHOD0(aec_core, struct AecCore*());
-};
-
-class MockEchoControlMobile : public EchoControlMobile {
- public:
- virtual ~MockEchoControlMobile() {}
- MOCK_METHOD1(Enable, int(bool enable));
- MOCK_CONST_METHOD0(is_enabled, bool());
- MOCK_METHOD1(set_routing_mode, int(RoutingMode mode));
- MOCK_CONST_METHOD0(routing_mode, RoutingMode());
- MOCK_METHOD1(enable_comfort_noise, int(bool enable));
- MOCK_CONST_METHOD0(is_comfort_noise_enabled, bool());
- MOCK_METHOD2(SetEchoPath, int(const void* echo_path, size_t size_bytes));
- MOCK_CONST_METHOD2(GetEchoPath, int(void* echo_path, size_t size_bytes));
-};
-
class MockGainControl : public GainControl {
public:
virtual ~MockGainControl() {}
@@ -150,9 +113,7 @@
class MockAudioProcessing : public testing::NiceMock<AudioProcessing> {
public:
MockAudioProcessing()
- : echo_cancellation_(new testing::NiceMock<MockEchoCancellation>()),
- echo_control_mobile_(new testing::NiceMock<MockEchoControlMobile>()),
- gain_control_(new testing::NiceMock<MockGainControl>()),
+ : gain_control_(new testing::NiceMock<MockGainControl>()),
high_pass_filter_(new testing::NiceMock<MockHighPassFilter>()),
level_estimator_(new testing::NiceMock<MockLevelEstimator>()),
noise_suppression_(new testing::NiceMock<MockNoiseSuppression>()),
@@ -221,12 +182,6 @@
MOCK_METHOD0(UpdateHistogramsOnCallEnd, void());
MOCK_CONST_METHOD0(GetStatistics, AudioProcessingStatistics());
MOCK_CONST_METHOD1(GetStatistics, AudioProcessingStats(bool));
- virtual MockEchoCancellation* echo_cancellation() const {
- return echo_cancellation_.get();
- }
- virtual MockEchoControlMobile* echo_control_mobile() const {
- return echo_control_mobile_.get();
- }
virtual MockGainControl* gain_control() const { return gain_control_.get(); }
virtual MockHighPassFilter* high_pass_filter() const {
return high_pass_filter_.get();
@@ -244,8 +199,6 @@
MOCK_CONST_METHOD0(GetConfig, AudioProcessing::Config());
private:
- std::unique_ptr<MockEchoCancellation> echo_cancellation_;
- std::unique_ptr<MockEchoControlMobile> echo_control_mobile_;
std::unique_ptr<MockGainControl> gain_control_;
std::unique_ptr<MockHighPassFilter> high_pass_filter_;
std::unique_ptr<MockLevelEstimator> level_estimator_;