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

AudioTransport: Remove PushCaptureData() method

Browse Source 
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 <henrika@webrtc.org>
Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22717}
This commit is contained in:
Magnus Jedvert
2018-04-03 12:58:12 +02:00
committed by Commit Bot
parent 0bdb5dd0a9
commit 7dfd5fc3df
4 changed files with 0 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/audio_device/audio_device_data_observer.cc
View File

@ -92,15 +92,6 @@ class ADMWrapper : public AudioDeviceModule, public AudioTransport {
return res; 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, void PullRenderData(int bits_per_sample,
int sample_rate, int sample_rate,
size_t number_of_channels, size_t number_of_channels,

15
modules/audio_device/include/audio_device_defines.h
View File

@ -55,21 +55,6 @@ class AudioTransport {
int64_t* elapsed_time_ms, int64_t* elapsed_time_ms,
int64_t* ntp_time_ms) = 0; // NOLINT 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. // Method to pull mixed render audio data from all active VoE channels.
// The data will not be passed as reference for audio processing internally. // The data will not be passed as reference for audio processing internally.
virtual void PullRenderData(int bits_per_sample, virtual void PullRenderData(int bits_per_sample,

8
modules/audio_device/include/mock_audio_transport.h
View File

@ -44,14 +44,6 @@ class MockAudioTransport : public AudioTransport {
int64_t* elapsed_time_ms, int64_t* elapsed_time_ms,
int64_t* ntp_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, MOCK_METHOD7(PullRenderData,
void(int bits_per_sample, void(int bits_per_sample,
int sample_rate, int sample_rate,

7
pc/test/fakeaudiocapturemodule_unittest.cc
View File

@ -61,13 +61,6 @@ class FakeAdmTest : public testing::Test,
return 0; 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, void PullRenderData(int bits_per_sample,
int sample_rate, int sample_rate,
size_t number_of_channels, size_t number_of_channels,