From cdae5ebc168d95a304b9905de7b66381723e402f Mon Sep 17 00:00:00 2001
From: Roxie Linden <roxie@lindenlab.com>
Date: Sat, 30 Mar 2024 21:58:00 -0700
Subject: 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.
---
 .../default/xui/en/panel_preferences_sound.xml     | 69 ++++++++++++++++++++--
 1 file changed, 64 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index ab2e9c72f3..3dba5d060b 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -340,7 +340,7 @@
    follows="left|top"
    top_delta="-6"
    layout="topleft"
-   left_pad="20"
+   left_pad="10"
    width="360"
    height="40"
    name="media_ear_location">
@@ -422,7 +422,7 @@
    control_name="VoiceEarLocation"
    follows="left|top"
    layout="topleft"
-   left_pad="20"
+   left_pad="10"
    top_delta="-6"
    width="360"
    height="40"
@@ -454,18 +454,38 @@
    name="enable_lip_sync"
    top_pad="10" 
    width="237"/>
+  <check_box
+   control_name="VoiceEchoCancellation"
+   height="15"
+   tool_tip="Check to enable voice echo cancellation"
+   label="Echo Cancellation"
+   layout="topleft"
+   left="260"
+   name="enable_echo_cancellation"
+   top_pad="-15"
+   width="200"/>
   <check_box
    follows="top|left"
    enabled_control="EnableVoiceChat"
    control_name="PushToTalkToggle"
    height="15"
-   label="Toggle speak on/off when I press button in toolbar"
+   label="Toggle speak on/off with toolbar button"
    layout="topleft"
    left="20"
    name="push_to_talk_toggle_check"
    width="237"
    tool_tip="When in toggle mode, press and release the trigger key ONCE to switch your microphone on or off. When not in toggle mode, the microphone broadcasts your voice only while the trigger is being held down."
    top_pad="5"/>
+  <check_box
+   control_name="VoiceAutomaticGainControl"
+   height="15"
+   tool_tip="Check to enable automatic gain control"
+   label="Automatic Gain Control"
+   layout="topleft"
+   name="voice_automatic_gain_control"
+   left="260"
+   top_pad="-15"
+   width="200"/>
   <check_box
    name="gesture_audio_play_btn"
    control_name="EnableGestureSounds"
@@ -477,6 +497,45 @@
    label="Play sounds from gestures"
    top_pad="5"
    left="20"/>
+  <text
+   layout="topleft"
+   height="15"
+   left="260"
+   top_pad="-12"
+   width="100"
+   name="noise_suppression_label">
+    Noise Suppression
+  </text>
+  <combo_box
+      control_name="VoiceNoiseSuppressionLevel"
+      enabled_control="AudioStreamingMedia"
+      layout="topleft"
+      height="23"
+      left_pad="10"
+      top_pad="-18"
+      name="noise_suppression_combo"
+      width="80">
+  <item
+      label="Off"
+      name="noise_suppression_none"
+      value="0"/>
+  <item
+      label="Low"
+      name="noise_suppression_low"
+      value="1"/>
+  <item
+      label="Moderate"
+      name="noise_suppression_moderate"
+      value="2"/>
+  <item
+      label="High"
+      name="noise_suppression_high"
+      value="3"/>
+  <item
+      label="Max"
+      name="noise_suppression_max"
+      value="4"/>
+  </combo_box>
   <button
    control_name="ShowDeviceSettings"
    follows="left|top"
@@ -485,9 +544,9 @@
    label="Voice Input/Output devices"
    layout="topleft"
    left="20"
-   top_pad="9"
+   top_pad="0"
    name="device_settings_btn"
-   width="230">
+   width="200">
   </button>
     <panel
     layout="topleft"
-- 
cgit v1.2.3


From 4c4d23acb00960d1bc812eab4656d3f4cdcd70e3 Mon Sep 17 00:00:00 2001
From: Roxie Linden <roxie@lindenlab.com>
Date: Fri, 26 Apr 2024 21:31:06 -0700
Subject: Renegotiate voice if the voice server type has changed.

The server will send an update with new voice credentials
when another peer comes in requiring vivox, if the channel
was initially webrtc.
---
 indra/newview/skins/default/xui/en/floater_incoming_call.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_incoming_call.xml b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
index a7864381a9..e576310160 100644
--- a/indra/newview/skins/default/xui/en/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
@@ -12,7 +12,7 @@
  width="550">
     <floater.string
      name="lifetime">
-        5
+        30
     </floater.string>
     <floater.string
      name="localchat">
-- 
cgit v1.2.3


From 0799f799e6ead1342babfd8f12d80afe48cfb1fa Mon Sep 17 00:00:00 2001
From: Roxie Linden <roxie@lindenlab.com>
Date: Tue, 18 Jun 2024 15:40:12 -0700
Subject: Fix crash issue when echo cancellation is enabled/disabled.

New webrtc library fixes an assert in webrtc when echo cancellation is enabled or
disabled.

Also, fix an issue where disabling media grays out noise cancellation.
---
 indra/newview/skins/default/xui/en/panel_preferences_sound.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index 569f2318ae..eb38f8bff3 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -508,7 +508,6 @@
   </text>
   <combo_box
       control_name="VoiceNoiseSuppressionLevel"
-      enabled_control="AudioStreamingMedia"
       layout="topleft"
       height="23"
       left_pad="10"
-- 
cgit v1.2.3