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

deal with add/remove of participants more effectively.

meow-7.2.2
Roxie Linden 2023-09-21 22:33:57 -07:00
parent 1cd8f6f4f8
commit dc56d0104d
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/llwebrtc/llwebrtc.cpp
View File

@ -87,11 +87,6 @@ void LLWebRTCImpl::terminate()
mDeviceModule = nullptr;
}
});
mNetworkThread->Stop();
mWorkerThread->Stop();
mSignalingThread->Stop();
}

25
indra/newview/llvoicewebrtc.cpp
View File

@ -2619,7 +2619,7 @@ void LLWebRTCVoiceClient::OnAudioLevel(float level)
{
Json::FastWriter writer;
Json::Value root;
root["p"] = (UINT32) (level * 256);
root["p"] = (uint32_t) (level * 256);
std::string json_data = writer.write(root);
mWebRTCDataInterface->sendData(json_data, false);
@ -2656,9 +2656,6 @@ void LLWebRTCVoiceClient::OnDataReceived(const std::string& data, bool binary)
}
for (auto &participant_id : voice_data.getMemberNames())
{
std::string foo = participant_id;
LL_WARNS("Voice") << "Participant ID (" << participant_id << "):" << data << LL_ENDL;
LLUUID agent_id(participant_id);
if (agent_id.isNull())
{
@ -2666,8 +2663,16 @@ void LLWebRTCVoiceClient::OnDataReceived(const std::string& data, bool binary)
continue;
}
participantStatePtr_t participant = findParticipantByID(agent_id);
if (!participant && voice_data[participant_id].get("j", Json::Value(false)).asBool())
{
participant = addParticipantByID(agent_id);
}
if (participant)
{
if(voice_data[participant_id].get("l", Json::Value(false)).asBool())
{
removeParticipantByID(agent_id);
}
participant->mPower = (F32) (voice_data[participant_id].get("p", Json::Value(participant->mPower)).asInt()) / 256;
/* WebRTC appears to have deprecated VAD, but it's still in the Audio Processing Module so maybe we
can use it at some point when we actually process frames. */
@ -3842,6 +3847,18 @@ LLWebRTCVoiceClient::participantStatePtr_t LLWebRTCVoiceClient::addParticipantBy
return result;
}
void LLWebRTCVoiceClient::removeParticipantByID(const LLUUID &id)
{
participantStatePtr_t result;
if (mAudioSession)
{
participantStatePtr_t participant = mAudioSession->findParticipantByID(id);
if (participant)
{
mAudioSession->removeParticipant(participant);
}
}
}
// Check for parcel boundary crossing

3
indra/newview/llvoicewebrtc.h
View File

@ -554,7 +554,8 @@ protected:
participantStatePtr_t findParticipantByID(const LLUUID& id);
participantStatePtr_t addParticipantByID(const LLUUID &id);
void removeParticipantByID(const LLUUID &id);
#if 0
////////////////////////////////////////
// voice sessions.