Merge PR #6389: Backport "Merge PR #6364: FEAT(client): Add ReNameNoi…

…se as a replacement for RNNoise" to 1.5.x

.gitmodules

@@ -7,9 +7,6 @@
 [submodule "3rdparty/speexdsp"]
 	path = 3rdparty/speexdsp
 	url = https://github.com/xiph/speexdsp.git
-[submodule "3rdparty/rnnoise-src"]
-	path = 3rdparty/rnnoise-src
-	url = https://github.com/mumble-voip/rnnoise.git
 [submodule "3rdparty/FindPythonInterpreter"]
 	path = 3rdparty/FindPythonInterpreter
 	url = https://github.com/Krzmbrzl/FindPythonInterpreter.git
@@ -28,3 +25,6 @@
 [submodule "3rdparty/cmake-compiler-flags"]
 	path = 3rdparty/cmake-compiler-flags
 	url = https://github.com/Krzmbrzl/cmake-compiler-flags.git
+[submodule "3rdparty/renamenoise"]
+	path = 3rdparty/renamenoise
+	url = https://github.com/mumble-voip/ReNameNoise.git

docs/dev/build-instructions/cmake_options.md

@@ -44,10 +44,10 @@ Use the bundled GSL version instead of looking for one on the system
 Build the included version of nlohmann_json instead of looking for one on the system
 (Default: ON)
 
-### bundled-rnnoise
+### bundled-renamenoise
 
-Build the included version of RNNoise instead of looking for one on the system.
-(Default: ${rnnoise})
+Build the included version of ReNameNoise instead of looking for one on the system.
+(Default: ${renamenoise})
 
 ### bundled-speex
 
@@ -189,14 +189,14 @@ Build support for custom Diffie-Hellman parameters.
 Use Qt's text-to-speech system (part of the Qt Speech module) instead of Mumble's own OS-specific text-to-speech implementations.
 (Default: OFF)
 
-### retracted-plugins
+### renamenoise
 
-Build redacted (outdated) plugins as well
-(Default: OFF)
+Use ReNameNoise for machine learning noise reduction.
+(Default: ON)
 
-### rnnoise
+### retracted-plugins
 
-Use RNNoise for machine learning noise reduction.
+Build redacted (outdated) plugins as well
 (Default: OFF)
 
 ### server

installer/ClientInstaller.cs

@@ -18,7 +18,6 @@
 public struct Features {
 	public bool overlay;
 	public bool g15;
-	public bool rnnoise;
 }
 
 public class ClientInstaller : MumbleInstall {
@@ -87,14 +86,11 @@ public ClientInstaller(string version, string arch, Features features) {
 			// 64 bit
 			this.Platform = WixSharp.Platform.x64;
 			binaries = new List<string>() {
+				"renamenoise.dll",
 				"speexdsp.dll",
 				"mumble.exe",
 			};
 
-			if (features.rnnoise) {
-				binaries.Add("rnnoise.dll");
-			}
-
 			if (features.overlay) {
 				binaries.Add("mumble_ol.dll");
 				binaries.Add("mumble_ol_helper.exe");
@@ -109,14 +105,11 @@ public ClientInstaller(string version, string arch, Features features) {
 			// 32 bit
 			this.Platform = WixSharp.Platform.x86;
 			binaries = new List<string>() {
+				"renamenoise.dll",
 				"speexdsp.dll",
 				"mumble.exe",
 			};
 
-			if (features.rnnoise) {
-				binaries.Add("rnnoise.dll");
-			}
-
 			if (features.overlay) {
 				binaries.Add("mumble_ol.dll");
 				binaries.Add("mumble_ol_helper.exe");
@@ -221,10 +214,6 @@ public static void Main(string[] args) {
 			if (args[i] == "--overlay") {
 				features.overlay = true;
 			}
-
-			if (args[i] == "--rnnoise") {
-				features.rnnoise = true;
-			}
 		}
 
 		if (version != null && arch != null) {

src/mumble/AudioConfigDialog.cpp

@@ -76,9 +76,9 @@ AudioInputDialog::AudioInputDialog(Settings &st) : ConfigWidget(st) {
 	// Hide the slider by default
 	showSpeexNoiseSuppressionSlider(false);
 
-#ifndef USE_RNNOISE
-	// Hide options related to RNNoise
-	qrbNoiseSupRNNoise->setVisible(false);
+#ifndef USE_RENAMENOISE
+	// Hide options related to ReNameNoise
+	qrbNoiseSupReNameNoise->setVisible(false);
 	qrbNoiseSupBoth->setVisible(false);
 #endif
 }
@@ -143,12 +143,12 @@ void AudioInputDialog::load(const Settings &r) {
 		loadSlider(qsSpeexNoiseSupStrength, 14);
 	}
 
-	bool allowRNNoise = SAMPLE_RATE == 48000;
+	bool allowReNameNoise = SAMPLE_RATE == 48000;
 
-	if (!allowRNNoise) {
+	if (!allowReNameNoise) {
 		const QString tooltip = QObject::tr("RNNoise is not available due to a sample rate mismatch.");
-		qrbNoiseSupRNNoise->setEnabled(false);
-		qrbNoiseSupRNNoise->setToolTip(tooltip);
+		qrbNoiseSupReNameNoise->setEnabled(false);
+		qrbNoiseSupReNameNoise->setToolTip(tooltip);
 		qrbNoiseSupBoth->setEnabled(false);
 		qrbNoiseSupBoth->setToolTip(tooltip);
 	}
@@ -161,9 +161,9 @@ void AudioInputDialog::load(const Settings &r) {
 			loadCheckBox(qrbNoiseSupSpeex, true);
 			break;
 		case Settings::NoiseCancelRNN:
-#ifdef USE_RNNOISE
-			if (allowRNNoise) {
-				loadCheckBox(qrbNoiseSupRNNoise, true);
+#ifdef USE_RENAMENOISE
+			if (allowReNameNoise) {
+				loadCheckBox(qrbNoiseSupReNameNoise, true);
 			} else {
 				// We have to switch to speex as a fallback
 				loadCheckBox(qrbNoiseSupSpeex, true);
@@ -174,8 +174,8 @@ void AudioInputDialog::load(const Settings &r) {
 #endif
 			break;
 		case Settings::NoiseCancelBoth:
-#ifdef USE_RNNOISE
-			if (allowRNNoise) {
+#ifdef USE_RENAMENOISE
+			if (allowReNameNoise) {
 				loadCheckBox(qrbNoiseSupBoth, true);
 			} else {
 				// We have to switch to speex as a fallback
@@ -233,7 +233,7 @@ void AudioInputDialog::save() const {
 		s.noiseCancelMode = Settings::NoiseCancelOff;
 	} else if (qrbNoiseSupBoth->isChecked()) {
 		s.noiseCancelMode = Settings::NoiseCancelBoth;
-	} else if (qrbNoiseSupRNNoise->isChecked()) {
+	} else if (qrbNoiseSupReNameNoise->isChecked()) {
 		s.noiseCancelMode = Settings::NoiseCancelRNN;
 	} else {
 		s.noiseCancelMode = Settings::NoiseCancelSpeex;