livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'project/webrtc-voice' of https://github.com/secondlife/viewer 

# Conflicts:
#	autobuild.xml
#	indra/newview/llvoicevivox.cpp
master
Ansariel 2024-05-12 17:16:46 +02:00
parent c2d3c47bad be19e495c5
commit 223ac67c75
4 changed files with 860 additions and 853 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1607
autobuild.xml
View File

File diff suppressed because it is too large Load Diff

5
indra/newview/llvoiceclient.cpp
View File

@ -509,11 +509,6 @@ void LLVoiceClient::leaveNonSpatialChannel()
mNonSpatialVoiceModule->processChannels(false);
mNonSpatialVoiceModule = nullptr;
}
if (mSpatialVoiceModule)
{
mSpatialVoiceModule->processChannels(true);
;
}
}
void LLVoiceClient::activateSpatialChannel(bool activate)

2
indra/newview/llvoicevivox.cpp
View File

@ -1112,7 +1112,7 @@ bool LLVivoxVoiceClient::startAndLaunchDaemon()
{
LLFile::rename(new_log, old_log);
}
if (!shutdown_timeout().empty())
{
params.args.add("-st");

99
indra/newview/llvoicewebrtc.cpp
View File

@ -1414,13 +1414,19 @@ bool LLWebRTCVoiceClient::isCurrentChannel(const LLSD &channelInfo)
return false;
}
if (mSession)
sessionStatePtr_t session = mSession;
if (!session)
{
session = mNextSession;
}
if (session)
{
if (!channelInfo["session_handle"].asString().empty())
{
return mSession->mHandle == channelInfo["session_handle"].asString();
return session->mHandle == channelInfo["session_handle"].asString();
}
return channelInfo["channel_uri"].asString() == mSession->mChannelID;
return channelInfo["channel_uri"].asString() == session->mChannelID;
}
return false;
}
@ -2121,11 +2127,8 @@ LLVoiceWebRTCConnection::~LLVoiceWebRTCConnection()
// by llwebrtc::terminate() on shutdown.
return;
}
if (mWebRTCPeerConnectionInterface)
{
llwebrtc::freePeerConnection(mWebRTCPeerConnectionInterface);
mWebRTCPeerConnectionInterface = nullptr;
}
mWebRTCPeerConnectionInterface->unsetSignalingObserver(this);
llwebrtc::freePeerConnection(mWebRTCPeerConnectionInterface);
}
@ -2464,19 +2467,11 @@ void LLVoiceWebRTCConnection::breakVoiceConnectionCoro()
// also shut things down.
LLSD result = httpAdapter->postAndSuspend(httpRequest, url, body, httpOpts);
if (LLWebRTCVoiceClient::isShuttingDown())
{
mOutstandingRequests--;
return;
}
if (mWebRTCPeerConnectionInterface)
{
mWebRTCPeerConnectionInterface->shutdownConnection();
}
setVoiceConnectionState(VOICE_STATE_SESSION_EXIT);
mOutstandingRequests--;
if (!LLWebRTCVoiceClient::isShuttingDown())
{
setVoiceConnectionState(VOICE_STATE_SESSION_EXIT);
}
}
// Tell the simulator to tell the Secondlife WebRTC server that we want a voice
@ -2551,7 +2546,7 @@ void LLVoiceWebRTCSpatialConnection::requestVoiceConnection()
mCurrentStatus = LLVoiceClientStatusObserver::ERROR_UNKNOWN;
break;
}
setVoiceConnectionState(VOICE_STATE_SESSION_RETRY);
setVoiceConnectionState(VOICE_STATE_SESSION_EXIT);
}
mOutstandingRequests--;
}
@ -2578,7 +2573,7 @@ void LLVoiceWebRTCConnection::OnVoiceConnectionRequestSuccess(const LLSD &result
else
{
LL_WARNS("Voice") << "Invalid voice provision request result:" << result << LL_ENDL;
setVoiceConnectionState(VOICE_STATE_SESSION_RETRY);
setVoiceConnectionState(VOICE_STATE_SESSION_EXIT);
return;
}
@ -2624,7 +2619,7 @@ bool LLVoiceWebRTCConnection::connectionStateMachine()
LL_PROFILE_ZONE_NAMED_CATEGORY_VOICE("VOICE_STATE_START_SESSION")
if (mShutDown)
{
setVoiceConnectionState(VOICE_STATE_DISCONNECT);
setVoiceConnectionState(VOICE_STATE_SESSION_EXIT);
break;
}
mIceCompleted = false;
@ -2644,7 +2639,7 @@ bool LLVoiceWebRTCConnection::connectionStateMachine()
{
if (mShutDown)
{
setVoiceConnectionState(VOICE_STATE_DISCONNECT);
setVoiceConnectionState(VOICE_STATE_SESSION_EXIT);
}
break;
}
@ -2652,7 +2647,7 @@ bool LLVoiceWebRTCConnection::connectionStateMachine()
case VOICE_STATE_REQUEST_CONNECTION:
if (mShutDown)
{
setVoiceConnectionState(VOICE_STATE_DISCONNECT);
setVoiceConnectionState(VOICE_STATE_SESSION_EXIT);
break;
}
// Ask the sim to ask the Secondlife WebRTC server for a connection to
@ -2748,20 +2743,20 @@ bool LLVoiceWebRTCConnection::connectionStateMachine()
case VOICE_STATE_SESSION_EXIT:
{
mWebRTCPeerConnectionInterface->shutdownConnection();
if (!mShutDown)
{
if (!mShutDown)
mVoiceConnectionState = VOICE_STATE_START_SESSION;
}
else
{
// if we still have outstanding http or webrtc calls, wait for them to
// complete so we don't delete objects while they still may be used.
if (mOutstandingRequests <= 0)
{
mVoiceConnectionState = VOICE_STATE_START_SESSION;
}
else
{
// if we still have outstanding http or webrtc calls, wait for them to
// complete so we don't delete objects while they still may be used.
if (mOutstandingRequests <= 0)
{
LLWebRTCVoiceClient::getInstance()->OnConnectionShutDown(mChannelID, mRegionID);
return false;
}
LLWebRTCVoiceClient::getInstance()->OnConnectionShutDown(mChannelID, mRegionID);
return false;
}
}
break;
@ -2982,14 +2977,6 @@ LLVoiceWebRTCSpatialConnection::LLVoiceWebRTCSpatialConnection(const LLUUID &reg
LLVoiceWebRTCSpatialConnection::~LLVoiceWebRTCSpatialConnection()
{
if (LLWebRTCVoiceClient::isShuttingDown())
{
// peer connection and observers will be cleaned up
// by llwebrtc::terminate() on shutdown.
return;
}
assert(mOutstandingRequests == 0);
mWebRTCPeerConnectionInterface->unsetSignalingObserver(this);
}
void LLVoiceWebRTCSpatialConnection::setMuteMic(bool muted)
@ -3028,14 +3015,6 @@ LLVoiceWebRTCAdHocConnection::LLVoiceWebRTCAdHocConnection(const LLUUID &regionI
LLVoiceWebRTCAdHocConnection::~LLVoiceWebRTCAdHocConnection()
{
if (LLWebRTCVoiceClient::isShuttingDown())
{
// peer connection and observers will be cleaned up
// by llwebrtc::terminate() on shutdown.
return;
}
assert(mOutstandingRequests == 0);
mWebRTCPeerConnectionInterface->unsetSignalingObserver(this);
}
// Add-hoc connections require a different channel type
@ -3092,7 +3071,19 @@ void LLVoiceWebRTCAdHocConnection::requestVoiceConnection()
if (!status)
{
setVoiceConnectionState(VOICE_STATE_SESSION_RETRY);
switch (status.getType())
{
case HTTP_CONFLICT:
mCurrentStatus = LLVoiceClientStatusObserver::ERROR_CHANNEL_FULL;
break;
case HTTP_UNAUTHORIZED:
mCurrentStatus = LLVoiceClientStatusObserver::ERROR_CHANNEL_LOCKED;
break;
default:
mCurrentStatus = LLVoiceClientStatusObserver::ERROR_UNKNOWN;
break;
}
setVoiceConnectionState(VOICE_STATE_SESSION_EXIT);
}
else
{