From ecf312e60356dd4df999a0675e7d1cf85e0dd495 Mon Sep 17 00:00:00 2001 From: henrika Date: Tue, 29 Aug 2017 06:02:10 -0700 Subject: [PATCH] Removes unused WaveOut APIs from ADM. Will remove default implementations as well once landed and removed in Chrome as well. These two AudioDeviceModule APIs are removed: int32_t SetWaveOutVolume(uint16_t volumeLeft, uint16_t volumeRight) int32_t WaveOutVolume(uint16_t* volumeLeft, uint16_t* volumeRight) const BUG=webrtc:7306 Review-Url: https://codereview.webrtc.org/3006793002 Cr-Commit-Position: refs/heads/master@{#19581} --- .../android/audio_device_template.h | 12 ------- .../audio_device_data_observer.cc | 8 ----- .../audio_device/audio_device_generic.h | 6 ---- .../modules/audio_device/audio_device_impl.cc | 34 ------------------- .../modules/audio_device/audio_device_impl.h | 5 --- .../audio_device/dummy/audio_device_dummy.cc | 10 ------ .../audio_device/dummy/audio_device_dummy.h | 5 --- .../audio_device/dummy/file_audio_device.cc | 10 ------ .../audio_device/dummy/file_audio_device.h | 5 --- .../audio_device/include/audio_device.h | 7 ++-- .../audio_device/include/fake_audio_device.h | 8 ----- .../audio_device/include/mock_audio_device.h | 4 --- .../audio_device/ios/audio_device_ios.h | 3 -- .../ios/audio_device_not_implemented_ios.mm | 10 ------ .../linux/audio_device_alsa_linux.cc | 18 ---------- .../linux/audio_device_alsa_linux.h | 6 ---- .../linux/audio_device_pulse_linux.cc | 12 ------- .../linux/audio_device_pulse_linux.h | 6 ---- .../audio_device/mac/audio_device_mac.cc | 12 ------- .../audio_device/mac/audio_device_mac.h | 5 --- .../audio_device/win/audio_device_core_win.cc | 18 ---------- .../audio_device/win/audio_device_core_win.h | 4 --- webrtc/pc/test/fakeaudiocapturemodule.cc | 13 ------- webrtc/pc/test/fakeaudiocapturemodule.h | 5 --- 24 files changed, 4 insertions(+), 222 deletions(-) diff --git a/webrtc/modules/audio_device/android/audio_device_template.h b/webrtc/modules/audio_device/android/audio_device_template.h index 72e008c4e0..6b9cc0b561 100644 --- a/webrtc/modules/audio_device/android/audio_device_template.h +++ b/webrtc/modules/audio_device/android/audio_device_template.h @@ -231,18 +231,6 @@ class AudioDeviceTemplate : public AudioDeviceGeneric { return false; } - int32_t SetWaveOutVolume( - uint16_t volumeLeft, uint16_t volumeRight) override { - FATAL() << "Should never be called"; - return -1; - } - - int32_t WaveOutVolume( - uint16_t& volumeLeft, uint16_t& volumeRight) const override { - FATAL() << "Should never be called"; - return -1; - } - int32_t InitSpeaker() override { LOG(INFO) << __FUNCTION__; return 0; diff --git a/webrtc/modules/audio_device/audio_device_data_observer.cc b/webrtc/modules/audio_device/audio_device_data_observer.cc index 849f529adc..60ea1cdb92 100644 --- a/webrtc/modules/audio_device/audio_device_data_observer.cc +++ b/webrtc/modules/audio_device/audio_device_data_observer.cc @@ -179,14 +179,6 @@ class ADMWrapper : public AudioDeviceModule, public AudioTransport { bool Recording() const override { return impl_->Recording(); } int32_t SetAGC(bool enable) override { return impl_->SetAGC(enable); } bool AGC() const override { return impl_->AGC(); } - int32_t SetWaveOutVolume(uint16_t volume_left, - uint16_t volume_right) override { - return impl_->SetWaveOutVolume(volume_left, volume_right); - } - int32_t WaveOutVolume(uint16_t* volume_left, - uint16_t* volume_right) const override { - return impl_->WaveOutVolume(volume_left, volume_right); - } int32_t InitSpeaker() override { return impl_->InitSpeaker(); } bool SpeakerIsInitialized() const override { return impl_->SpeakerIsInitialized(); diff --git a/webrtc/modules/audio_device/audio_device_generic.h b/webrtc/modules/audio_device/audio_device_generic.h index 4807c63ab1..ca313273ea 100644 --- a/webrtc/modules/audio_device/audio_device_generic.h +++ b/webrtc/modules/audio_device/audio_device_generic.h @@ -75,12 +75,6 @@ class AudioDeviceGeneric { virtual int32_t SetAGC(bool enable) = 0; virtual bool AGC() const = 0; - // Volume control based on the Windows Wave API (Windows only) - virtual int32_t SetWaveOutVolume(uint16_t volumeLeft, - uint16_t volumeRight) = 0; - virtual int32_t WaveOutVolume(uint16_t& volumeLeft, - uint16_t& volumeRight) const = 0; - // Audio mixer initialization virtual int32_t InitSpeaker() = 0; virtual bool SpeakerIsInitialized() const = 0; diff --git a/webrtc/modules/audio_device/audio_device_impl.cc b/webrtc/modules/audio_device/audio_device_impl.cc index d7ab4092ee..bae4f6a4ef 100644 --- a/webrtc/modules/audio_device/audio_device_impl.cc +++ b/webrtc/modules/audio_device/audio_device_impl.cc @@ -575,40 +575,6 @@ int32_t AudioDeviceModuleImpl::SpeakerVolume(uint32_t* volume) const { return (0); } -// ---------------------------------------------------------------------------- -// SetWaveOutVolume -// ---------------------------------------------------------------------------- - -int32_t AudioDeviceModuleImpl::SetWaveOutVolume(uint16_t volumeLeft, - uint16_t volumeRight) { - LOG(INFO) << __FUNCTION__ << "(" << volumeLeft << ", " << volumeRight << ")"; - CHECK_INITIALIZED(); - return (_ptrAudioDevice->SetWaveOutVolume(volumeLeft, volumeRight)); -} - -// ---------------------------------------------------------------------------- -// WaveOutVolume -// ---------------------------------------------------------------------------- - -int32_t AudioDeviceModuleImpl::WaveOutVolume(uint16_t* volumeLeft, - uint16_t* volumeRight) const { - LOG(INFO) << __FUNCTION__; - CHECK_INITIALIZED(); - - uint16_t volLeft(0); - uint16_t volRight(0); - - if (_ptrAudioDevice->WaveOutVolume(volLeft, volRight) == -1) { - return -1; - } - - *volumeLeft = volLeft; - *volumeRight = volRight; - LOG(INFO) << "output: " << *volumeLeft << ", " << *volumeRight; - - return (0); -} - // ---------------------------------------------------------------------------- // SpeakerIsInitialized // ---------------------------------------------------------------------------- diff --git a/webrtc/modules/audio_device/audio_device_impl.h b/webrtc/modules/audio_device/audio_device_impl.h index 072039003e..9fdc93bd0c 100644 --- a/webrtc/modules/audio_device/audio_device_impl.h +++ b/webrtc/modules/audio_device/audio_device_impl.h @@ -98,11 +98,6 @@ class AudioDeviceModuleImpl : public AudioDeviceModule { int32_t SetAGC(bool enable) override; bool AGC() const override; - // Volume control based on the Windows Wave API (Windows only) - int32_t SetWaveOutVolume(uint16_t volumeLeft, uint16_t volumeRight) override; - int32_t WaveOutVolume(uint16_t* volumeLeft, - uint16_t* volumeRight) const override; - // Audio mixer initialization int32_t InitSpeaker() override; bool SpeakerIsInitialized() const override; diff --git a/webrtc/modules/audio_device/dummy/audio_device_dummy.cc b/webrtc/modules/audio_device/dummy/audio_device_dummy.cc index 558bd1b436..d954a274e9 100644 --- a/webrtc/modules/audio_device/dummy/audio_device_dummy.cc +++ b/webrtc/modules/audio_device/dummy/audio_device_dummy.cc @@ -83,16 +83,6 @@ int32_t AudioDeviceDummy::SetAGC(bool enable) { return -1; } bool AudioDeviceDummy::AGC() const { return false; } -int32_t AudioDeviceDummy::SetWaveOutVolume(uint16_t volumeLeft, - uint16_t volumeRight) { - return -1; -} - -int32_t AudioDeviceDummy::WaveOutVolume(uint16_t& volumeLeft, - uint16_t& volumeRight) const { - return -1; -} - int32_t AudioDeviceDummy::InitSpeaker() { return -1; } bool AudioDeviceDummy::SpeakerIsInitialized() const { return false; } diff --git a/webrtc/modules/audio_device/dummy/audio_device_dummy.h b/webrtc/modules/audio_device/dummy/audio_device_dummy.h index 72a0eb1ac9..fd9a915ac4 100644 --- a/webrtc/modules/audio_device/dummy/audio_device_dummy.h +++ b/webrtc/modules/audio_device/dummy/audio_device_dummy.h @@ -69,11 +69,6 @@ class AudioDeviceDummy : public AudioDeviceGeneric { int32_t SetAGC(bool enable) override; bool AGC() const override; - // Volume control based on the Windows Wave API (Windows only) - int32_t SetWaveOutVolume(uint16_t volumeLeft, uint16_t volumeRight) override; - int32_t WaveOutVolume(uint16_t& volumeLeft, - uint16_t& volumeRight) const override; - // Audio mixer initialization int32_t InitSpeaker() override; bool SpeakerIsInitialized() const override; diff --git a/webrtc/modules/audio_device/dummy/file_audio_device.cc b/webrtc/modules/audio_device/dummy/file_audio_device.cc index 14230edbfa..0d9885de7a 100644 --- a/webrtc/modules/audio_device/dummy/file_audio_device.cc +++ b/webrtc/modules/audio_device/dummy/file_audio_device.cc @@ -309,16 +309,6 @@ int32_t FileAudioDevice::SetAGC(bool enable) { return -1; } bool FileAudioDevice::AGC() const { return false; } -int32_t FileAudioDevice::SetWaveOutVolume(uint16_t volumeLeft, - uint16_t volumeRight) { - return -1; -} - -int32_t FileAudioDevice::WaveOutVolume(uint16_t& volumeLeft, - uint16_t& volumeRight) const { - return -1; -} - int32_t FileAudioDevice::InitSpeaker() { return -1; } bool FileAudioDevice::SpeakerIsInitialized() const { return false; } diff --git a/webrtc/modules/audio_device/dummy/file_audio_device.h b/webrtc/modules/audio_device/dummy/file_audio_device.h index 160ba1b2e0..63e7e79221 100644 --- a/webrtc/modules/audio_device/dummy/file_audio_device.h +++ b/webrtc/modules/audio_device/dummy/file_audio_device.h @@ -90,11 +90,6 @@ class FileAudioDevice : public AudioDeviceGeneric { int32_t SetAGC(bool enable) override; bool AGC() const override; - // Volume control based on the Windows Wave API (Windows only) - int32_t SetWaveOutVolume(uint16_t volumeLeft, uint16_t volumeRight) override; - int32_t WaveOutVolume(uint16_t& volumeLeft, - uint16_t& volumeRight) const override; - // Audio mixer initialization int32_t InitSpeaker() override; bool SpeakerIsInitialized() const override; diff --git a/webrtc/modules/audio_device/include/audio_device.h b/webrtc/modules/audio_device/include/audio_device.h index 8fdd21246e..a1276d9392 100644 --- a/webrtc/modules/audio_device/include/audio_device.h +++ b/webrtc/modules/audio_device/include/audio_device.h @@ -108,11 +108,12 @@ class AudioDeviceModule : public RefCountedModule { virtual int32_t SetAGC(bool enable) = 0; virtual bool AGC() const = 0; - // Volume control based on the Windows Wave API (Windows only) + // Deprecated. + // TODO(henrika): to be removed. virtual int32_t SetWaveOutVolume(uint16_t volumeLeft, - uint16_t volumeRight) = 0; + uint16_t volumeRight) { return -1; } virtual int32_t WaveOutVolume(uint16_t* volumeLeft, - uint16_t* volumeRight) const = 0; + uint16_t* volumeRight) const { return -1; } // Audio mixer initialization virtual int32_t InitSpeaker() = 0; diff --git a/webrtc/modules/audio_device/include/fake_audio_device.h b/webrtc/modules/audio_device/include/fake_audio_device.h index 1797dd5e8d..444b65c55d 100644 --- a/webrtc/modules/audio_device/include/fake_audio_device.h +++ b/webrtc/modules/audio_device/include/fake_audio_device.h @@ -83,14 +83,6 @@ class FakeAudioDeviceModule : public AudioDeviceModule { virtual int32_t StartRecording() { return 0; } virtual bool Recording() const { return false; } virtual bool AGC() const { return true; } - virtual int32_t SetWaveOutVolume(uint16_t volumeLeft, - uint16_t volumeRight) { - return 0; - } - virtual int32_t WaveOutVolume(uint16_t* volumeLeft, - uint16_t* volumeRight) const { - return 0; - } virtual bool SpeakerIsInitialized() const { return true; } virtual bool MicrophoneIsInitialized() const { return true; } virtual int32_t SpeakerVolumeIsAvailable(bool* available) { return 0; } diff --git a/webrtc/modules/audio_device/include/mock_audio_device.h b/webrtc/modules/audio_device/include/mock_audio_device.h index 2c44c65bc4..424e5d5570 100644 --- a/webrtc/modules/audio_device/include/mock_audio_device.h +++ b/webrtc/modules/audio_device/include/mock_audio_device.h @@ -63,10 +63,6 @@ class MockAudioDeviceModule : public AudioDeviceModule { MOCK_CONST_METHOD0(Recording, bool()); MOCK_METHOD1(SetAGC, int32_t(bool enable)); MOCK_CONST_METHOD0(AGC, bool()); - MOCK_METHOD2(SetWaveOutVolume, int32_t(uint16_t volumeLeft, - uint16_t volumeRight)); - MOCK_CONST_METHOD2(WaveOutVolume, int32_t(uint16_t* volumeLeft, - uint16_t* volumeRight)); MOCK_METHOD0(InitSpeaker, int32_t()); MOCK_CONST_METHOD0(SpeakerIsInitialized, bool()); MOCK_METHOD0(InitMicrophone, int32_t()); diff --git a/webrtc/modules/audio_device/ios/audio_device_ios.h b/webrtc/modules/audio_device/ios/audio_device_ios.h index 641aba0891..6ce2c699ab 100644 --- a/webrtc/modules/audio_device/ios/audio_device_ios.h +++ b/webrtc/modules/audio_device/ios/audio_device_ios.h @@ -116,9 +116,6 @@ class AudioDeviceIOS : public AudioDeviceGeneric, int32_t SetRecordingDevice(uint16_t index) override; int32_t SetRecordingDevice( AudioDeviceModule::WindowsDeviceType device) override; - int32_t SetWaveOutVolume(uint16_t volumeLeft, uint16_t volumeRight) override; - int32_t WaveOutVolume(uint16_t& volumeLeft, - uint16_t& volumeRight) const override; int32_t InitSpeaker() override; bool SpeakerIsInitialized() const override; int32_t InitMicrophone() override; diff --git a/webrtc/modules/audio_device/ios/audio_device_not_implemented_ios.mm b/webrtc/modules/audio_device/ios/audio_device_not_implemented_ios.mm index dec0a9a306..e975f4daa8 100644 --- a/webrtc/modules/audio_device/ios/audio_device_not_implemented_ios.mm +++ b/webrtc/modules/audio_device/ios/audio_device_not_implemented_ios.mm @@ -67,16 +67,6 @@ int32_t AudioDeviceIOS::SpeakerVolume(uint32_t& volume) const { return -1; } -int32_t AudioDeviceIOS::SetWaveOutVolume(uint16_t, uint16_t) { - RTC_NOTREACHED() << "Not implemented"; - return -1; -} - -int32_t AudioDeviceIOS::WaveOutVolume(uint16_t&, uint16_t&) const { - RTC_NOTREACHED() << "Not implemented"; - return -1; -} - int32_t AudioDeviceIOS::MaxSpeakerVolume(uint32_t& maxVolume) const { RTC_NOTREACHED() << "Not implemented"; return -1; diff --git a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc b/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc index ffa7dc5fdf..cd13466698 100644 --- a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc +++ b/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc @@ -321,24 +321,6 @@ int32_t AudioDeviceLinuxALSA::SpeakerVolume(uint32_t& volume) const return 0; } - -int32_t AudioDeviceLinuxALSA::SetWaveOutVolume(uint16_t volumeLeft, - uint16_t volumeRight) -{ - - LOG(LS_WARNING) << "API call not supported on this platform"; - return -1; -} - -int32_t AudioDeviceLinuxALSA::WaveOutVolume( - uint16_t& /*volumeLeft*/, - uint16_t& /*volumeRight*/) const -{ - - LOG(LS_WARNING) << "API call not supported on this platform"; - return -1; -} - int32_t AudioDeviceLinuxALSA::MaxSpeakerVolume( uint32_t& maxVolume) const { diff --git a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.h b/webrtc/modules/audio_device/linux/audio_device_alsa_linux.h index 7e07ed82d6..f7fb9a90ad 100644 --- a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.h +++ b/webrtc/modules/audio_device/linux/audio_device_alsa_linux.h @@ -83,12 +83,6 @@ public: int32_t SetAGC(bool enable) override; bool AGC() const override; - // Volume control based on the Windows Wave API (Windows only) - int32_t SetWaveOutVolume(uint16_t volumeLeft, - uint16_t volumeRight) override; - int32_t WaveOutVolume(uint16_t& volumeLeft, - uint16_t& volumeRight) const override; - // Audio mixer initialization int32_t InitSpeaker() override; bool SpeakerIsInitialized() const override; diff --git a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc b/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc index 187a4ce65a..8760980543 100644 --- a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc +++ b/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc @@ -372,18 +372,6 @@ int32_t AudioDeviceLinuxPulse::SpeakerVolume(uint32_t& volume) const { return 0; } -int32_t AudioDeviceLinuxPulse::SetWaveOutVolume(uint16_t volumeLeft, - uint16_t volumeRight) { - LOG(LS_WARNING) << "API call not supported on this platform"; - return -1; -} - -int32_t AudioDeviceLinuxPulse::WaveOutVolume(uint16_t& /*volumeLeft*/, - uint16_t& /*volumeRight*/) const { - LOG(LS_WARNING) << "API call not supported on this platform"; - return -1; -} - int32_t AudioDeviceLinuxPulse::MaxSpeakerVolume(uint32_t& maxVolume) const { RTC_DCHECK(thread_checker_.CalledOnValidThread()); uint32_t maxVol(0); diff --git a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h b/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h index b69533e3b2..00ed5477ba 100644 --- a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h +++ b/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h @@ -145,12 +145,6 @@ public: int32_t SetAGC(bool enable) override; bool AGC() const override; - // Volume control based on the Windows Wave API (Windows only) - int32_t SetWaveOutVolume(uint16_t volumeLeft, - uint16_t volumeRight) override; - int32_t WaveOutVolume(uint16_t& volumeLeft, - uint16_t& volumeRight) const override; - // Audio mixer initialization int32_t InitSpeaker() override; bool SpeakerIsInitialized() const override; diff --git a/webrtc/modules/audio_device/mac/audio_device_mac.cc b/webrtc/modules/audio_device/mac/audio_device_mac.cc index 59906a8745..2b48930fbc 100644 --- a/webrtc/modules/audio_device/mac/audio_device_mac.cc +++ b/webrtc/modules/audio_device/mac/audio_device_mac.cc @@ -548,18 +548,6 @@ int32_t AudioDeviceMac::SpeakerVolume(uint32_t& volume) const { return 0; } -int32_t AudioDeviceMac::SetWaveOutVolume(uint16_t volumeLeft, - uint16_t volumeRight) { - LOG(LS_WARNING) << "API call not supported on this platform"; - return -1; -} - -int32_t AudioDeviceMac::WaveOutVolume(uint16_t& /*volumeLeft*/, - uint16_t& /*volumeRight*/) const { - LOG(LS_WARNING) << "API call not supported on this platform"; - return -1; -} - int32_t AudioDeviceMac::MaxSpeakerVolume(uint32_t& maxVolume) const { uint32_t maxVol(0); diff --git a/webrtc/modules/audio_device/mac/audio_device_mac.h b/webrtc/modules/audio_device/mac/audio_device_mac.h index 66903823dd..c8a4b20007 100644 --- a/webrtc/modules/audio_device/mac/audio_device_mac.h +++ b/webrtc/modules/audio_device/mac/audio_device_mac.h @@ -111,11 +111,6 @@ class AudioDeviceMac : public AudioDeviceGeneric { virtual int32_t SetAGC(bool enable); virtual bool AGC() const; - // Volume control based on the Windows Wave API (Windows only) - virtual int32_t SetWaveOutVolume(uint16_t volumeLeft, uint16_t volumeRight); - virtual int32_t WaveOutVolume(uint16_t& volumeLeft, - uint16_t& volumeRight) const; - // Audio mixer initialization virtual int32_t InitSpeaker(); virtual bool SpeakerIsInitialized() const; diff --git a/webrtc/modules/audio_device/win/audio_device_core_win.cc b/webrtc/modules/audio_device/win/audio_device_core_win.cc index 783e9898de..c77eacc774 100644 --- a/webrtc/modules/audio_device/win/audio_device_core_win.cc +++ b/webrtc/modules/audio_device/win/audio_device_core_win.cc @@ -1044,24 +1044,6 @@ Exit: return -1; } -// ---------------------------------------------------------------------------- -// SetWaveOutVolume -// ---------------------------------------------------------------------------- - -int32_t AudioDeviceWindowsCore::SetWaveOutVolume(uint16_t volumeLeft, uint16_t volumeRight) -{ - return -1; -} - -// ---------------------------------------------------------------------------- -// WaveOutVolume -// ---------------------------------------------------------------------------- - -int32_t AudioDeviceWindowsCore::WaveOutVolume(uint16_t& volumeLeft, uint16_t& volumeRight) const -{ - return -1; -} - // ---------------------------------------------------------------------------- // MaxSpeakerVolume // diff --git a/webrtc/modules/audio_device/win/audio_device_core_win.h b/webrtc/modules/audio_device/win/audio_device_core_win.h index 24eca550b1..b95da226ff 100644 --- a/webrtc/modules/audio_device/win/audio_device_core_win.h +++ b/webrtc/modules/audio_device/win/audio_device_core_win.h @@ -133,10 +133,6 @@ public: virtual int32_t SetAGC(bool enable); virtual bool AGC() const; - // Volume control based on the Windows Wave API (Windows only) - virtual int32_t SetWaveOutVolume(uint16_t volumeLeft, uint16_t volumeRight); - virtual int32_t WaveOutVolume(uint16_t& volumeLeft, uint16_t& volumeRight) const; - // Audio mixer initialization virtual int32_t InitSpeaker(); virtual bool SpeakerIsInitialized() const; diff --git a/webrtc/pc/test/fakeaudiocapturemodule.cc b/webrtc/pc/test/fakeaudiocapturemodule.cc index 5812d3900f..c1ac489b19 100644 --- a/webrtc/pc/test/fakeaudiocapturemodule.cc +++ b/webrtc/pc/test/fakeaudiocapturemodule.cc @@ -276,19 +276,6 @@ bool FakeAudioCaptureModule::AGC() const { return 0; } -int32_t FakeAudioCaptureModule::SetWaveOutVolume(uint16_t /*volume_left*/, - uint16_t /*volume_right*/) { - RTC_NOTREACHED(); - return 0; -} - -int32_t FakeAudioCaptureModule::WaveOutVolume( - uint16_t* /*volume_left*/, - uint16_t* /*volume_right*/) const { - RTC_NOTREACHED(); - return 0; -} - int32_t FakeAudioCaptureModule::InitSpeaker() { // No speaker, just playing from file. Return success. return 0; diff --git a/webrtc/pc/test/fakeaudiocapturemodule.h b/webrtc/pc/test/fakeaudiocapturemodule.h index f01b3e8e5b..1440821281 100644 --- a/webrtc/pc/test/fakeaudiocapturemodule.h +++ b/webrtc/pc/test/fakeaudiocapturemodule.h @@ -104,11 +104,6 @@ class FakeAudioCaptureModule int32_t SetAGC(bool enable) override; bool AGC() const override; - int32_t SetWaveOutVolume(uint16_t volume_left, - uint16_t volume_right) override; - int32_t WaveOutVolume(uint16_t* volume_left, - uint16_t* volume_right) const override; - int32_t InitSpeaker() override; bool SpeakerIsInitialized() const override; int32_t InitMicrophone() override;