Add UI for managing echo cancellation, AGC, and noise control.

Plumb audio settings through from webrtc to the sound preferences
UI (still needs some tweaking, of course.)

Also, choose stun servers based on grid.  Ultimately, the stun
stun servers will be passed up via login or something.

1 files changed, 33 insertions, 2 deletions

diff --git a/indra/newview/llvoicewebrtc.cpp b/indra/newview/llvoicewebrtc.cpp
index a8bc468f4c..bb5b386e7c 100644
--- a/indra/newview/llvoicewebrtc.cpp
+++ b/indra/newview/llvoicewebrtc.cpp
@@ -24,6 +24,7 @@
  * $/LicenseInfo$
  */
 #include <algorithm>
+#include <format>
 #include "llvoicewebrtc.h"
 
 #include "llsdutil.h"
@@ -279,7 +280,7 @@ void LLWebRTCVoiceClient::cleanUp()
     LL_DEBUGS("Voice") << "Exiting" << LL_ENDL;
 }
 
-//---------------------------------------------------
+// --------------------------------------------------
 
 const LLVoiceVersionInfo& LLWebRTCVoiceClient::getVersion()
 {
@@ -299,6 +300,13 @@ void LLWebRTCVoiceClient::updateSettings()
     setRenderDevice(outputDevice);
     F32 mic_level = gSavedSettings.getF32("AudioLevelMic");
     setMicGain(mic_level);
+    
+    llwebrtc::LLWebRTCDeviceInterface::AudioConfig config;
+    config.mEchoCancellation = gSavedSettings.getBOOL("VoiceEchoCancellation");
+    config.mAGC = gSavedSettings.getBOOL("VoiceAutomaticGainControl");
+    config.mNoiseSuppressionLevel = (llwebrtc::LLWebRTCDeviceInterface::AudioConfig::ENoiseSuppressionLevel)gSavedSettings.getU32("VoiceNoiseSuppressionLevel");
+    mWebRTCDeviceInterface->setAudioConfig(config);
+    
 }
 
 // Observers
@@ -2480,6 +2488,28 @@ void LLVoiceWebRTCConnection::OnVoiceConnectionRequestSuccess(const LLSD &result
     mWebRTCPeerConnectionInterface->AnswerAvailable(mRemoteChannelSDP);
 }
 
+static llwebrtc::LLWebRTCPeerConnectionInterface::InitOptions getConnectionOptions()
+{
+    llwebrtc::LLWebRTCPeerConnectionInterface::InitOptions options;
+    llwebrtc::LLWebRTCPeerConnectionInterface::InitOptions::IceServers servers;
+
+    // TODO: Pull these from login
+    std::string grid = LLGridManager::getInstance()->getGridLoginID();
+    std::transform(grid.begin(), grid.end(), grid.begin(), [](unsigned char c){ return std::tolower(c); });
+    int num_servers = 2;
+    if (grid == "agni")
+    {
+        num_servers = 3;
+    }
+    for (int i=1; i <= num_servers; i++)
+    {
+        servers.mUrls.push_back(llformat("stun:stun%d.%s.secondlife.io:3478", i, grid.c_str()));
+    }
+    options.mServers.push_back(servers);
+    return options;
+}
+
+
 // Primary state machine for negotiating a single voice connection to the
 // Secondlife WebRTC server.
 bool LLVoiceWebRTCConnection::connectionStateMachine()
@@ -2498,10 +2528,11 @@ bool LLVoiceWebRTCConnection::connectionStateMachine()
             mTrickling    = false;
             mIceCompleted = false;
             setVoiceConnectionState(VOICE_STATE_WAIT_FOR_SESSION_START);
+            
             // tell the webrtc library that we want a connection.  The library will
             // respond with an offer on a separate thread, which will cause
             // the session state to change.
-            if (!mWebRTCPeerConnectionInterface->initializeConnection())
+            if (!mWebRTCPeerConnectionInterface->initializeConnection(getConnectionOptions()))
             {
                 setVoiceConnectionState(VOICE_STATE_SESSION_RETRY);
             }