Fix whitespace for pre-commit hooks
parent
6393e88ca4
commit
863c541ce0
|
|
@ -87,7 +87,7 @@ if (WINDOWS)
|
||||||
if( ADDRESS_SIZE EQUAL 32 )
|
if( ADDRESS_SIZE EQUAL 32 )
|
||||||
add_compile_options( /arch:SSE2 )
|
add_compile_options( /arch:SSE2 )
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Are we using the crummy Visual Studio KDU build workaround?
|
# Are we using the crummy Visual Studio KDU build workaround?
|
||||||
if (NOT VS_DISABLE_FATAL_WARNINGS)
|
if (NOT VS_DISABLE_FATAL_WARNINGS)
|
||||||
add_compile_options(/WX)
|
add_compile_options(/WX)
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@ elseif (DARWIN)
|
||||||
FIND_LIBRARY(AUDIOTOOLBOX_LIBRARY AudioToolbox)
|
FIND_LIBRARY(AUDIOTOOLBOX_LIBRARY AudioToolbox)
|
||||||
FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation)
|
FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation)
|
||||||
FIND_LIBRARY(COCOA_LIBRARY Cocoa)
|
FIND_LIBRARY(COCOA_LIBRARY Cocoa)
|
||||||
|
|
||||||
target_link_libraries( ll::webrtc INTERFACE
|
target_link_libraries( ll::webrtc INTERFACE
|
||||||
libwebrtc.a
|
libwebrtc.a
|
||||||
${COREAUDIO_LIBRARY}
|
${COREAUDIO_LIBRARY}
|
||||||
|
|
|
||||||
|
|
@ -452,7 +452,7 @@ void ll_set_device_module_render_device(rtc::scoped_refptr<webrtc::AudioDeviceMo
|
||||||
{
|
{
|
||||||
device_module->SetPlayoutDevice(webrtc::AudioDeviceModule::kDefaultDevice);
|
device_module->SetPlayoutDevice(webrtc::AudioDeviceModule::kDefaultDevice);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
device_module->SetPlayoutDevice(device);
|
device_module->SetPlayoutDevice(device);
|
||||||
}
|
}
|
||||||
|
|
@ -648,7 +648,7 @@ void LLWebRTCImpl::freePeerConnection(LLWebRTCPeerConnectionInterface* peer_conn
|
||||||
// Most peer connection (signaling) happens on
|
// Most peer connection (signaling) happens on
|
||||||
// the signaling thread.
|
// the signaling thread.
|
||||||
|
|
||||||
LLWebRTCPeerConnectionImpl::LLWebRTCPeerConnectionImpl() :
|
LLWebRTCPeerConnectionImpl::LLWebRTCPeerConnectionImpl() :
|
||||||
mWebRTCImpl(nullptr),
|
mWebRTCImpl(nullptr),
|
||||||
mPeerConnection(nullptr),
|
mPeerConnection(nullptr),
|
||||||
mMute(false),
|
mMute(false),
|
||||||
|
|
@ -1163,7 +1163,7 @@ void LLWebRTCPeerConnectionImpl::OnSuccess(webrtc::SessionDescriptionInterface *
|
||||||
{
|
{
|
||||||
observer->OnOfferAvailable(mangled_sdp);
|
observer->OnOfferAvailable(mangled_sdp);
|
||||||
}
|
}
|
||||||
|
|
||||||
mPeerConnection->SetLocalDescription(std::unique_ptr<webrtc::SessionDescriptionInterface>(
|
mPeerConnection->SetLocalDescription(std::unique_ptr<webrtc::SessionDescriptionInterface>(
|
||||||
webrtc::CreateSessionDescription(webrtc::SdpType::kOffer, mangled_sdp)),
|
webrtc::CreateSessionDescription(webrtc::SdpType::kOffer, mangled_sdp)),
|
||||||
rtc::scoped_refptr<webrtc::SetLocalDescriptionObserverInterface>(this));
|
rtc::scoped_refptr<webrtc::SetLocalDescriptionObserverInterface>(this));
|
||||||
|
|
|
||||||
|
|
@ -129,7 +129,7 @@ class LLWebRTCDeviceInterface
|
||||||
};
|
};
|
||||||
|
|
||||||
virtual void setAudioConfig(AudioConfig config) = 0;
|
virtual void setAudioConfig(AudioConfig config) = 0;
|
||||||
|
|
||||||
// instructs webrtc to refresh the device list.
|
// instructs webrtc to refresh the device list.
|
||||||
virtual void refreshDevices() = 0;
|
virtual void refreshDevices() = 0;
|
||||||
|
|
||||||
|
|
@ -230,7 +230,7 @@ class LLWebRTCSignalingObserver
|
||||||
class LLWebRTCPeerConnectionInterface
|
class LLWebRTCPeerConnectionInterface
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
||||||
struct InitOptions
|
struct InitOptions
|
||||||
{
|
{
|
||||||
// equivalent of PeerConnectionInterface::IceServer
|
// equivalent of PeerConnectionInterface::IceServer
|
||||||
|
|
|
||||||
|
|
@ -230,7 +230,7 @@ class LLWebRTCImpl : public LLWebRTCDeviceInterface, public webrtc::AudioDeviceS
|
||||||
|
|
||||||
// The factory that allows creation of native webrtc PeerConnections.
|
// The factory that allows creation of native webrtc PeerConnections.
|
||||||
rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface> mPeerConnectionFactory;
|
rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface> mPeerConnectionFactory;
|
||||||
|
|
||||||
rtc::scoped_refptr<webrtc::AudioProcessing> mAudioProcessingModule;
|
rtc::scoped_refptr<webrtc::AudioProcessing> mAudioProcessingModule;
|
||||||
|
|
||||||
// more native webrtc stuff
|
// more native webrtc stuff
|
||||||
|
|
|
||||||
|
|
@ -320,7 +320,7 @@ void LLWebRTCVoiceClient::updateSettings()
|
||||||
config.mNoiseSuppressionLevel = (llwebrtc::LLWebRTCDeviceInterface::AudioConfig::ENoiseSuppressionLevel) (U32)sNoiseSuppressionLevel;
|
config.mNoiseSuppressionLevel = (llwebrtc::LLWebRTCDeviceInterface::AudioConfig::ENoiseSuppressionLevel) (U32)sNoiseSuppressionLevel;
|
||||||
|
|
||||||
mWebRTCDeviceInterface->setAudioConfig(config);
|
mWebRTCDeviceInterface->setAudioConfig(config);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Observers
|
// Observers
|
||||||
|
|
@ -620,10 +620,10 @@ void LLWebRTCVoiceClient::setDevicesListUpdated(bool state)
|
||||||
void LLWebRTCVoiceClient::OnDevicesChanged(const llwebrtc::LLWebRTCVoiceDeviceList& render_devices,
|
void LLWebRTCVoiceClient::OnDevicesChanged(const llwebrtc::LLWebRTCVoiceDeviceList& render_devices,
|
||||||
const llwebrtc::LLWebRTCVoiceDeviceList& capture_devices)
|
const llwebrtc::LLWebRTCVoiceDeviceList& capture_devices)
|
||||||
{
|
{
|
||||||
|
|
||||||
LL::WorkQueue::postMaybe(mMainQueue,
|
LL::WorkQueue::postMaybe(mMainQueue,
|
||||||
[=]
|
[=]
|
||||||
{
|
{
|
||||||
OnDevicesChangedImpl(render_devices, capture_devices);
|
OnDevicesChangedImpl(render_devices, capture_devices);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -647,7 +647,7 @@ void LLWebRTCVoiceClient::OnDevicesChangedImpl(const llwebrtc::LLWebRTCVoiceDevi
|
||||||
for (auto &device : capture_devices)
|
for (auto &device : capture_devices)
|
||||||
{
|
{
|
||||||
LL_DEBUGS("Voice") << "Checking capture device:'" << device.mID << "'" << LL_ENDL;
|
LL_DEBUGS("Voice") << "Checking capture device:'" << device.mID << "'" << LL_ENDL;
|
||||||
|
|
||||||
addCaptureDevice(LLVoiceDevice(device.mDisplayName, device.mID));
|
addCaptureDevice(LLVoiceDevice(device.mDisplayName, device.mID));
|
||||||
}
|
}
|
||||||
setCaptureDevice(inputDevice);
|
setCaptureDevice(inputDevice);
|
||||||
|
|
@ -2287,7 +2287,7 @@ void LLVoiceWebRTCConnection::processIceUpdatesCoro()
|
||||||
void LLVoiceWebRTCConnection::OnOfferAvailable(const std::string &sdp)
|
void LLVoiceWebRTCConnection::OnOfferAvailable(const std::string &sdp)
|
||||||
{
|
{
|
||||||
LL::WorkQueue::postMaybe(mMainQueue,
|
LL::WorkQueue::postMaybe(mMainQueue,
|
||||||
[=] {
|
[=] {
|
||||||
if (mShutDown)
|
if (mShutDown)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
|
@ -2336,7 +2336,7 @@ void LLVoiceWebRTCConnection::OnAudioEstablished(llwebrtc::LLWebRTCAudioInterfac
|
||||||
void LLVoiceWebRTCConnection::OnRenegotiationNeeded()
|
void LLVoiceWebRTCConnection::OnRenegotiationNeeded()
|
||||||
{
|
{
|
||||||
LL::WorkQueue::postMaybe(mMainQueue,
|
LL::WorkQueue::postMaybe(mMainQueue,
|
||||||
[=] {
|
[=] {
|
||||||
LL_DEBUGS("Voice") << "Voice channel requires renegotiation." << LL_ENDL;
|
LL_DEBUGS("Voice") << "Voice channel requires renegotiation." << LL_ENDL;
|
||||||
if (!mShutDown)
|
if (!mShutDown)
|
||||||
{
|
{
|
||||||
|
|
@ -2625,7 +2625,7 @@ bool LLVoiceWebRTCConnection::connectionStateMachine()
|
||||||
}
|
}
|
||||||
mIceCompleted = false;
|
mIceCompleted = false;
|
||||||
setVoiceConnectionState(VOICE_STATE_WAIT_FOR_SESSION_START);
|
setVoiceConnectionState(VOICE_STATE_WAIT_FOR_SESSION_START);
|
||||||
|
|
||||||
// tell the webrtc library that we want a connection. The library will
|
// tell the webrtc library that we want a connection. The library will
|
||||||
// respond with an offer on a separate thread, which will cause
|
// respond with an offer on a separate thread, which will cause
|
||||||
// the session state to change.
|
// the session state to change.
|
||||||
|
|
@ -2799,7 +2799,7 @@ void LLVoiceWebRTCConnection::OnDataReceived(const std::string& data, bool binar
|
||||||
|
|
||||||
//
|
//
|
||||||
// The LLWebRTCVoiceConnection object will not be deleted
|
// The LLWebRTCVoiceConnection object will not be deleted
|
||||||
// before the webrtc connection itself is shut down, so
|
// before the webrtc connection itself is shut down, so
|
||||||
// we shouldn't be getting this callback on a nonexistant
|
// we shouldn't be getting this callback on a nonexistant
|
||||||
// this pointer.
|
// this pointer.
|
||||||
void LLVoiceWebRTCConnection::OnDataReceivedImpl(const std::string &data, bool binary)
|
void LLVoiceWebRTCConnection::OnDataReceivedImpl(const std::string &data, bool binary)
|
||||||
|
|
@ -2832,7 +2832,7 @@ void LLVoiceWebRTCConnection::OnDataReceivedImpl(const std::string &data, bool b
|
||||||
boost::json::object user_gain;
|
boost::json::object user_gain;
|
||||||
for (auto &participant_elem : voice_data)
|
for (auto &participant_elem : voice_data)
|
||||||
{
|
{
|
||||||
boost::json::string participant_id(participant_elem.key());
|
boost::json::string participant_id(participant_elem.key());
|
||||||
LLUUID agent_id(participant_id.c_str());
|
LLUUID agent_id(participant_id.c_str());
|
||||||
if (agent_id.isNull())
|
if (agent_id.isNull())
|
||||||
{
|
{
|
||||||
|
|
@ -2973,7 +2973,7 @@ void LLVoiceWebRTCConnection::sendJoin()
|
||||||
{
|
{
|
||||||
LL_PROFILE_ZONE_SCOPED_CATEGORY_VOICE
|
LL_PROFILE_ZONE_SCOPED_CATEGORY_VOICE
|
||||||
|
|
||||||
|
|
||||||
boost::json::object root;
|
boost::json::object root;
|
||||||
boost::json::object join_obj;
|
boost::json::object join_obj;
|
||||||
LLUUID regionID = gAgent.getRegion()->getRegionID();
|
LLUUID regionID = gAgent.getRegion()->getRegionID();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue