Commit 51b13ab5 authored by henrika's avatar henrika Committed by Commit Bot

Removes unused APIs in WebRTC's audio device module (ADM).

Goal is to match recent changes in third_party/webrtc/modules/audio_device/include/audio_device.h
where two unused APIs have been removed. This CL ensures that these methods are removed in Chrome
as well so I can then delete the signatures totally in third party (WebRTC).

Similar changes have been done in https://chromium-review.googlesource.com/c/chromium/src/+/657399

TBR=sergeyu

Bug: webrtc:7306
Change-Id: Ie63ca4db09911601b1cc606c9b5bd47b59add612
Reviewed-on: https://chromium-review.googlesource.com/725737
Commit-Queue: Henrik Andreasson <henrika@chromium.org>
Reviewed-by: default avatarHenrik Andreasson <henrika@chromium.org>
Reviewed-by: default avatarMax Morin <maxmorin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#510047}
parent 71f2a24e
......@@ -351,15 +351,6 @@ int32_t WebRtcAudioDeviceImpl::PlayoutDelay(uint16_t* delay_ms) const {
return 0;
}
int32_t WebRtcAudioDeviceImpl::RecordingDelay(uint16_t* delay_ms) const {
DCHECK(signaling_thread_checker_.CalledOnValidThread());
// There is no way to report a correct delay value to WebRTC since there
// might be multiple ProcessedLocalAudioSource instances.
NOTREACHED();
return -1;
}
int32_t WebRtcAudioDeviceImpl::RecordingSampleRate(
uint32_t* sample_rate) const {
DCHECK(signaling_thread_checker_.CalledOnValidThread());
......
......@@ -300,7 +300,6 @@ class CONTENT_EXPORT WebRtcAudioDeviceImpl : public WebRtcAudioDeviceNotImpl,
int32_t StereoPlayoutIsAvailable(bool* available) const override;
int32_t StereoRecordingIsAvailable(bool* available) const override;
int32_t PlayoutDelay(uint16_t* delay_ms) const override;
int32_t RecordingDelay(uint16_t* delay_ms) const override;
int32_t RecordingSampleRate(uint32_t* sample_rate) const override;
int32_t PlayoutSampleRate(uint32_t* sample_rate) const override;
......
......@@ -13,11 +13,6 @@ int32_t WebRtcAudioDeviceNotImpl::ActiveAudioLayer(
return 0;
}
webrtc::AudioDeviceModule::ErrorCode
WebRtcAudioDeviceNotImpl::LastError() const {
return AudioDeviceModule::kAdmErrNone;
}
int16_t WebRtcAudioDeviceNotImpl::PlayoutDevices() {
return 0;
}
......
......@@ -31,7 +31,6 @@ class CONTENT_EXPORT WebRtcAudioDeviceNotImpl
// implementation in WebRtcAudioDeviceImpl when needed.
int32_t ActiveAudioLayer(AudioLayer* audio_layer) const override;
webrtc::AudioDeviceModule::ErrorCode LastError() const override;
int16_t PlayoutDevices() override;
int16_t RecordingDevices() override;
int32_t PlayoutDeviceName(uint16_t index,
......
......@@ -50,10 +50,6 @@ int32_t WebrtcAudioModule::ActiveAudioLayer(AudioLayer* audio_layer) const {
return -1;
}
WebrtcAudioModule::ErrorCode WebrtcAudioModule::LastError() const {
return kAdmErrNone;
}
int32_t WebrtcAudioModule::RegisterAudioCallback(
webrtc::AudioTransport* audio_transport) {
base::AutoLock lock(lock_);
......@@ -330,11 +326,6 @@ int32_t WebrtcAudioModule::PlayoutDelay(uint16_t* delay_ms) const {
return 0;
}
int32_t WebrtcAudioModule::RecordingDelay(uint16_t* delay_ms) const {
NOTREACHED();
return -1;
}
int32_t WebrtcAudioModule::SetRecordingSampleRate(
const uint32_t samples_per_sec) {
NOTREACHED();
......
......@@ -33,7 +33,6 @@ class WebrtcAudioModule : public webrtc::AudioDeviceModule {
// webrtc::AudioDeviceModule implementation.
int32_t ActiveAudioLayer(AudioLayer* audio_layer) const override;
ErrorCode LastError() const override;
int32_t RegisterAudioCallback(
webrtc::AudioTransport* audio_callback) override;
int32_t Init() override;
......@@ -94,7 +93,6 @@ class WebrtcAudioModule : public webrtc::AudioDeviceModule {
int32_t SetRecordingChannel(const ChannelType channel) override;
int32_t RecordingChannel(ChannelType* channel) const override;
int32_t PlayoutDelay(uint16_t* delay_ms) const override;
int32_t RecordingDelay(uint16_t* delay_ms) const override;
int32_t SetRecordingSampleRate(const uint32_t samples_per_sec) override;
int32_t RecordingSampleRate(uint32_t* samples_per_sec) const override;
int32_t SetPlayoutSampleRate(const uint32_t samples_per_sec) override;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment