From ec3e72be3293177e3e8d7a83ea7afc714a343f1e Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Sun, 14 Jul 2024 19:34:11 +0800 Subject: Disable audio device sink related code on some It's the custom part of LL's WebRTC fork, and I haven't got the resources to build LL's fork for the platforms unsupported by them. And for those less supported platforms, we're using binaries from https://github.com/crow-misia/libwebrtc-bin --- indra/llwebrtc/llwebrtc.cpp | 4 ++++ indra/llwebrtc/llwebrtc_impl.h | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/llwebrtc/llwebrtc.cpp b/indra/llwebrtc/llwebrtc.cpp index d5bd913315..6c501c0ca6 100644 --- a/indra/llwebrtc/llwebrtc.cpp +++ b/indra/llwebrtc/llwebrtc.cpp @@ -201,7 +201,9 @@ void LLWebRTCImpl::init() mTuningDeviceModule->SetPlayoutDevice(mPlayoutDevice); mTuningDeviceModule->SetRecordingDevice(mRecordingDevice); mTuningDeviceModule->EnableBuiltInAEC(false); +#if __x86_64__ && !__FreeBSD__ mTuningDeviceModule->SetAudioDeviceSink(this); +#endif mTuningDeviceModule->InitMicrophone(); mTuningDeviceModule->InitSpeaker(); mTuningDeviceModule->InitRecording(); @@ -554,6 +556,7 @@ void LLWebRTCImpl::updateDevices() } } +#if __x86_64__ && !__FreeBSD__ void LLWebRTCImpl::OnDevicesUpdated() { // reset these to a bad value so an update is forced @@ -562,6 +565,7 @@ void LLWebRTCImpl::OnDevicesUpdated() updateDevices(); } +#endif void LLWebRTCImpl::setTuningMode(bool enable) diff --git a/indra/llwebrtc/llwebrtc_impl.h b/indra/llwebrtc/llwebrtc_impl.h index 6672f8ce90..719c8b7eeb 100644 --- a/indra/llwebrtc/llwebrtc_impl.h +++ b/indra/llwebrtc/llwebrtc_impl.h @@ -136,7 +136,10 @@ class LLCustomProcessor : public webrtc::CustomProcessing // Primary singleton implementation for interfacing // with the native webrtc library. -class LLWebRTCImpl : public LLWebRTCDeviceInterface, public webrtc::AudioDeviceSink +class LLWebRTCImpl : public LLWebRTCDeviceInterface +#if __x86_64__ && !__FreeBSD__ + , public webrtc::AudioDeviceSink +#endif { public: LLWebRTCImpl(); @@ -168,7 +171,9 @@ class LLWebRTCImpl : public LLWebRTCDeviceInterface, public webrtc::AudioDeviceS // // AudioDeviceSink // +#if __x86_64__ && !__FreeBSD__ void OnDevicesUpdated() override; +#endif // // Helpers -- cgit v1.2.3