From 7dfd5fc3df1ff8de34b052d9daac85f915c902c7 Mon Sep 17 00:00:00 2001 From: Magnus Jedvert Date: Tue, 3 Apr 2018 12:58:12 +0200 Subject: [PATCH] AudioTransport: Remove PushCaptureData() method This CL removes PushCaptureData(), which is unused. The reason I'm removing it is since this method is cauing chromium-style violations for all files that includes modules/audio_device/include/audio_device_defines.h, and it's annoying to suppress it everywhere. Bug: webrtc:8659 Change-Id: I9133d05259075d8e8ec89b764be934f37b5fa77e Reviewed-on: https://webrtc-review.googlesource.com/66404 Reviewed-by: Henrik Andreassson Commit-Queue: Magnus Jedvert Cr-Commit-Position: refs/heads/master@{#22717} --- .../audio_device/audio_device_data_observer.cc | 9 --------- .../audio_device/include/audio_device_defines.h | 15 --------------- .../audio_device/include/mock_audio_transport.h | 8 -------- pc/test/fakeaudiocapturemodule_unittest.cc | 7 ------- 4 files changed, 39 deletions(-) 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,