diff --git a/modules/audio_device/android/audio_device_template.h b/modules/audio_device/android/audio_device_template.h index 0b883bd76a..75dbaf315f 100644 --- a/modules/audio_device/android/audio_device_template.h +++ b/modules/audio_device/android/audio_device_template.h @@ -385,16 +385,6 @@ class AudioDeviceTemplate : public AudioDeviceGeneric { input_.AttachAudioBuffer(audioBuffer); } - int32_t SetLoudspeakerStatus(bool enable) override { - FATAL() << "Should never be called"; - return -1; - } - - int32_t GetLoudspeakerStatus(bool& enable) const override { - FATAL() << "Should never be called"; - return -1; - } - // Returns true if the device both supports built in AEC and the device // is not blacklisted. // Currently, if OpenSL ES is used in both directions, this method will still diff --git a/modules/audio_device/audio_device_data_observer.cc b/modules/audio_device/audio_device_data_observer.cc index 0dead0779f..823fbfed8c 100644 --- a/modules/audio_device/audio_device_data_observer.cc +++ b/modules/audio_device/audio_device_data_observer.cc @@ -244,12 +244,6 @@ class ADMWrapper : public AudioDeviceModule, public AudioTransport { int32_t PlayoutDelay(uint16_t* delay_ms) const override { return impl_->PlayoutDelay(delay_ms); } - int32_t SetLoudspeakerStatus(bool enable) override { - return impl_->SetLoudspeakerStatus(enable); - } - int32_t GetLoudspeakerStatus(bool* enabled) const override { - return impl_->GetLoudspeakerStatus(enabled); - } bool BuiltInAECIsAvailable() const override { return impl_->BuiltInAECIsAvailable(); } diff --git a/modules/audio_device/audio_device_generic.cc b/modules/audio_device/audio_device_generic.cc index 41ed2f1d84..2baea2a3a9 100644 --- a/modules/audio_device/audio_device_generic.cc +++ b/modules/audio_device/audio_device_generic.cc @@ -13,16 +13,6 @@ namespace webrtc { -int32_t AudioDeviceGeneric::SetLoudspeakerStatus(bool enable) { - RTC_LOG_F(LS_ERROR) << "Not supported on this platform"; - return -1; -} - -int32_t AudioDeviceGeneric::GetLoudspeakerStatus(bool& enable) const { - RTC_LOG_F(LS_ERROR) << "Not supported on this platform"; - return -1; -} - bool AudioDeviceGeneric::BuiltInAECIsAvailable() const { RTC_LOG_F(LS_ERROR) << "Not supported on this platform"; return false; diff --git a/modules/audio_device/audio_device_generic.h b/modules/audio_device/audio_device_generic.h index 61efd009e0..2cd8874671 100644 --- a/modules/audio_device/audio_device_generic.h +++ b/modules/audio_device/audio_device_generic.h @@ -116,10 +116,6 @@ class AudioDeviceGeneric { // Delay information and control virtual int32_t PlayoutDelay(uint16_t& delayMS) const = 0; - // Speaker audio routing (for mobile devices) - virtual int32_t SetLoudspeakerStatus(bool enable); - virtual int32_t GetLoudspeakerStatus(bool& enable) const; - // Android only virtual bool BuiltInAECIsAvailable() const; virtual bool BuiltInAGCIsAvailable() const; diff --git a/modules/audio_device/audio_device_impl.cc b/modules/audio_device/audio_device_impl.cc index 24c28f47bf..f3aceffc42 100644 --- a/modules/audio_device/audio_device_impl.cc +++ b/modules/audio_device/audio_device_impl.cc @@ -823,26 +823,6 @@ int32_t AudioDeviceModuleImpl::PlayoutDelay(uint16_t* delayMS) const { return 0; } -int32_t AudioDeviceModuleImpl::SetLoudspeakerStatus(bool enable) { - RTC_LOG(INFO) << __FUNCTION__ << "(" << enable << ")"; - CHECKinitialized_(); - if (audio_device_->SetLoudspeakerStatus(enable) != 0) { - return -1; - } - return 0; -} - -int32_t AudioDeviceModuleImpl::GetLoudspeakerStatus(bool* enabled) const { - RTC_LOG(INFO) << __FUNCTION__; - CHECKinitialized_(); - int32_t ok = 0; - if (audio_device_->GetLoudspeakerStatus(*enabled) != 0) { - ok = -1; - } - RTC_LOG(INFO) << "output: " << ok; - return ok; -} - bool AudioDeviceModuleImpl::BuiltInAECIsAvailable() const { RTC_LOG(INFO) << __FUNCTION__; CHECKinitialized__BOOL(); diff --git a/modules/audio_device/audio_device_impl.h b/modules/audio_device/audio_device_impl.h index 54af2e64f6..dce6b0c8c8 100644 --- a/modules/audio_device/audio_device_impl.h +++ b/modules/audio_device/audio_device_impl.h @@ -132,10 +132,6 @@ class AudioDeviceModuleImpl : public AudioDeviceModule { // Delay information and control int32_t PlayoutDelay(uint16_t* delayMS) const override; - // Mobile device specific functions - int32_t SetLoudspeakerStatus(bool enable) override; - int32_t GetLoudspeakerStatus(bool* enabled) const override; - bool BuiltInAECIsAvailable() const override; int32_t EnableBuiltInAEC(bool enable) override; bool BuiltInAGCIsAvailable() const override; diff --git a/modules/audio_device/include/audio_device.h b/modules/audio_device/include/audio_device.h index 928e6332b3..c096a8398c 100644 --- a/modules/audio_device/include/audio_device.h +++ b/modules/audio_device/include/audio_device.h @@ -50,10 +50,10 @@ class AudioDeviceModule : public rtc::RefCountInterface { }; public: - // Create an ADM. + // Creates an ADM. static rtc::scoped_refptr Create( const AudioLayer audio_layer); - // TODO(bugs.webrtc.org/7306): deprecated. + // TODO(bugs.webrtc.org/7306): deprecated (to be removed). static rtc::scoped_refptr Create( const int32_t id, const AudioLayer audio_layer); @@ -149,8 +149,7 @@ class AudioDeviceModule : public rtc::RefCountInterface { // Playout delay virtual int32_t PlayoutDelay(uint16_t* delayMS) const = 0; - // Deprecated. Don't use. - // TODO(henrika): remove these methods. + // TODO(bugs.webrtc.org/7306): deprecated (to be removed). virtual int32_t SetRecordingSampleRate(const uint32_t samplesPerSec) { return -1; } @@ -164,9 +163,9 @@ class AudioDeviceModule : public rtc::RefCountInterface { return -1; } - // Mobile device specific functions - virtual int32_t SetLoudspeakerStatus(bool enable) = 0; - virtual int32_t GetLoudspeakerStatus(bool* enabled) const = 0; + // TODO(bugs.webrtc.org/7306): deprecated (to be removed). + virtual int32_t SetLoudspeakerStatus(bool enable) { return -1; } + virtual int32_t GetLoudspeakerStatus(bool* enabled) const { return -1; } // Only supported on Android. virtual bool BuiltInAECIsAvailable() const = 0; diff --git a/modules/audio_device/include/fake_audio_device.h b/modules/audio_device/include/fake_audio_device.h index c271d6e3ba..e8e3f2cf33 100644 --- a/modules/audio_device/include/fake_audio_device.h +++ b/modules/audio_device/include/fake_audio_device.h @@ -103,8 +103,6 @@ class FakeAudioDeviceModule : public AudioDeviceModule { *delayMS = 0; return 0; } - int32_t SetLoudspeakerStatus(bool enable) override { return 0; } - int32_t GetLoudspeakerStatus(bool* enabled) const override { return 0; } bool BuiltInAECIsAvailable() const override { return false; } int32_t EnableBuiltInAEC(bool enable) override { return -1; } bool BuiltInAGCIsAvailable() const override { return false; } diff --git a/modules/audio_device/include/mock_audio_device.h b/modules/audio_device/include/mock_audio_device.h index 268b358346..7984e0b5bd 100644 --- a/modules/audio_device/include/mock_audio_device.h +++ b/modules/audio_device/include/mock_audio_device.h @@ -84,8 +84,6 @@ class MockAudioDeviceModule : public AudioDeviceModule { MOCK_METHOD1(SetStereoRecording, int32_t(bool enable)); MOCK_CONST_METHOD1(StereoRecording, int32_t(bool* enabled)); MOCK_CONST_METHOD1(PlayoutDelay, int32_t(uint16_t* delayMS)); - MOCK_METHOD1(SetLoudspeakerStatus, int32_t(bool enable)); - MOCK_CONST_METHOD1(GetLoudspeakerStatus, int32_t(bool* enabled)); MOCK_CONST_METHOD0(BuiltInAECIsAvailable, bool()); MOCK_CONST_METHOD0(BuiltInAGCIsAvailable, bool()); MOCK_CONST_METHOD0(BuiltInNSIsAvailable, bool()); diff --git a/modules/audio_device/ios/audio_device_ios.h b/modules/audio_device/ios/audio_device_ios.h index cdd855d28d..8f30889835 100644 --- a/modules/audio_device/ios/audio_device_ios.h +++ b/modules/audio_device/ios/audio_device_ios.h @@ -70,9 +70,6 @@ class AudioDeviceIOS : public AudioDeviceGeneric, int32_t StopRecording() override; bool Recording() const override { return recording_; } - int32_t SetLoudspeakerStatus(bool enable) override; - int32_t GetLoudspeakerStatus(bool& enabled) const override; - // These methods returns hard-coded delay values and not dynamic delay // estimates. The reason is that iOS supports a built-in AEC and the WebRTC // AEC will always be disabled in the Libjingle layer to avoid running two diff --git a/modules/audio_device/ios/audio_device_ios.mm b/modules/audio_device/ios/audio_device_ios.mm index 7e11fa2a69..6027ab794a 100644 --- a/modules/audio_device/ios/audio_device_ios.mm +++ b/modules/audio_device/ios/audio_device_ios.mm @@ -303,42 +303,6 @@ int32_t AudioDeviceIOS::StopRecording() { return 0; } -// Change the default receiver playout route to speaker. -int32_t AudioDeviceIOS::SetLoudspeakerStatus(bool enable) { - LOGI() << "SetLoudspeakerStatus(" << enable << ")"; - - RTCAudioSession* session = [RTCAudioSession sharedInstance]; - [session lockForConfiguration]; - NSString* category = session.category; - AVAudioSessionCategoryOptions options = session.categoryOptions; - // Respect old category options if category is - // AVAudioSessionCategoryPlayAndRecord. Otherwise reset it since old options - // might not be valid for this category. - if ([category isEqualToString:AVAudioSessionCategoryPlayAndRecord]) { - if (enable) { - options |= AVAudioSessionCategoryOptionDefaultToSpeaker; - } else { - options &= ~AVAudioSessionCategoryOptionDefaultToSpeaker; - } - } else { - options = AVAudioSessionCategoryOptionDefaultToSpeaker; - } - NSError* error = nil; - BOOL success = - [session setCategory:AVAudioSessionCategoryPlayAndRecord withOptions:options error:&error]; - ios::CheckAndLogError(success, error); - [session unlockForConfiguration]; - return (error == nil) ? 0 : -1; -} - -int32_t AudioDeviceIOS::GetLoudspeakerStatus(bool& enabled) const { - LOGI() << "GetLoudspeakerStatus"; - RTCAudioSession* session = [RTCAudioSession sharedInstance]; - AVAudioSessionCategoryOptions options = session.categoryOptions; - enabled = options & AVAudioSessionCategoryOptionDefaultToSpeaker; - return 0; -} - int32_t AudioDeviceIOS::PlayoutDelay(uint16_t& delayMS) const { delayMS = kFixedPlayoutDelayEstimate; return 0; diff --git a/pc/test/fakeaudiocapturemodule.cc b/pc/test/fakeaudiocapturemodule.cc index 26557c0adc..b54fc4b3c6 100644 --- a/pc/test/fakeaudiocapturemodule.cc +++ b/pc/test/fakeaudiocapturemodule.cc @@ -394,16 +394,6 @@ int32_t FakeAudioCaptureModule::PlayoutDelay(uint16_t* delay_ms) const { return 0; } -int32_t FakeAudioCaptureModule::SetLoudspeakerStatus(bool /*enable*/) { - RTC_NOTREACHED(); - return 0; -} - -int32_t FakeAudioCaptureModule::GetLoudspeakerStatus(bool* /*enabled*/) const { - RTC_NOTREACHED(); - return 0; -} - void FakeAudioCaptureModule::OnMessage(rtc::Message* msg) { switch (msg->message_id) { case MSG_START_PROCESS: diff --git a/pc/test/fakeaudiocapturemodule.h b/pc/test/fakeaudiocapturemodule.h index a2988089b7..7c899198b7 100644 --- a/pc/test/fakeaudiocapturemodule.h +++ b/pc/test/fakeaudiocapturemodule.h @@ -128,8 +128,6 @@ class FakeAudioCaptureModule int32_t PlayoutDelay(uint16_t* delay_ms) const override; - int32_t SetLoudspeakerStatus(bool enable) override; - int32_t GetLoudspeakerStatus(bool* enabled) const override; bool BuiltInAECIsAvailable() const override { return false; } int32_t EnableBuiltInAEC(bool enable) override { return -1; } bool BuiltInAGCIsAvailable() const override { return false; }