diff --git a/modules/audio_device/audio_device_data_observer.cc b/modules/audio_device/audio_device_data_observer.cc index bcec3d5574..723d1c8bbd 100644 --- a/modules/audio_device/audio_device_data_observer.cc +++ b/modules/audio_device/audio_device_data_observer.cc @@ -92,15 +92,6 @@ class ADMWrapper : public AudioDeviceModule, public AudioTransport { return res; } - void PushCaptureData(int voe_channel, - const void* audio_data, - int bits_per_sample, - int sample_rate, - size_t number_of_channels, - size_t number_of_frames) override { - RTC_NOTREACHED(); - } - void PullRenderData(int bits_per_sample, int sample_rate, size_t number_of_channels, diff --git a/modules/audio_device/include/audio_device_defines.h b/modules/audio_device/include/audio_device_defines.h index 0495442ebe..1674ad803d 100644 --- a/modules/audio_device/include/audio_device_defines.h +++ b/modules/audio_device/include/audio_device_defines.h @@ -55,21 +55,6 @@ class AudioTransport { int64_t* elapsed_time_ms, int64_t* ntp_time_ms) = 0; // NOLINT - // Method to push the captured audio data to the specific VoE channel. - // The data will not undergo audio processing. - // |voe_channel| is the id of the VoE channel which is the sink to the - // capture data. - // TODO(bugs.webrtc.org/8659): Remove this method once clients updated. - RTC_DEPRECATED virtual void PushCaptureData( - int voe_channel, - const void* audio_data, - int bits_per_sample, - int sample_rate, - size_t number_of_channels, - size_t number_of_frames) { - RTC_NOTREACHED(); - } - // Method to pull mixed render audio data from all active VoE channels. // The data will not be passed as reference for audio processing internally. virtual void PullRenderData(int bits_per_sample, diff --git a/modules/audio_device/include/mock_audio_transport.h b/modules/audio_device/include/mock_audio_transport.h index baa0227b39..ebdfbc7015 100644 --- a/modules/audio_device/include/mock_audio_transport.h +++ b/modules/audio_device/include/mock_audio_transport.h @@ -44,14 +44,6 @@ class MockAudioTransport : public AudioTransport { int64_t* elapsed_time_ms, int64_t* ntp_time_ms)); - MOCK_METHOD6(PushCaptureData, - void(int voe_channel, - const void* audio_data, - int bits_per_sample, - int sample_rate, - size_t number_of_channels, - size_t number_of_frames)); - MOCK_METHOD7(PullRenderData, void(int bits_per_sample, int sample_rate, diff --git a/pc/test/fakeaudiocapturemodule_unittest.cc b/pc/test/fakeaudiocapturemodule_unittest.cc index 0e7574f4c6..28d6b282a3 100644 --- a/pc/test/fakeaudiocapturemodule_unittest.cc +++ b/pc/test/fakeaudiocapturemodule_unittest.cc @@ -61,13 +61,6 @@ class FakeAdmTest : public testing::Test, return 0; } - void PushCaptureData(int voe_channel, - const void* audio_data, - int bits_per_sample, - int sample_rate, - size_t number_of_channels, - size_t number_of_frames) override {} - void PullRenderData(int bits_per_sample, int sample_rate, size_t number_of_channels,