Merge pull request #4700: FIX(server): Make max bandwidth the highest supported

558000 = 510000 (Opus) + 9600 (position) + 38400 (TCP overhead)

Closes #3895

2 files changed, 8 insertions, 5 deletions

diff --git a/scripts/murmur.ini b/scripts/murmur.ini
index 91c671697..de224847b 100644
--- a/scripts/murmur.ini
+++ b/scripts/murmur.ini
@@ -133,7 +133,7 @@ serverpassword=
 
 ; Maximum bandwidth (in bits per second) clients are allowed
 ; to send speech at.
-bandwidth=72000
+bandwidth=558000
 
 ; Murmur and Mumble are usually pretty good about cleaning up hung clients, but
 ; occasionally one will get stuck on the server. The timeout setting will cause
diff --git a/src/murmur/Meta.cpp b/src/murmur/Meta.cpp
index a1d30c7a3..a87044a1e 100644
--- a/src/murmur/Meta.cpp
+++ b/src/murmur/Meta.cpp
@@ -47,10 +47,13 @@ HANDLE Meta::hQoS = nullptr;
 #endif
 
 MetaParams::MetaParams() {
-	qsPassword                 = QString();
-	usPort                     = DEFAULT_MUMBLE_PORT;
-	iTimeout                   = 30;
-	iMaxBandwidth              = 72000;
+	qsPassword = QString();
+	usPort     = DEFAULT_MUMBLE_PORT;
+	iTimeout   = 30;
+	// This represents the maximum possible bandwidth using 10 ms audio TCP packets with position data
+	// (restricted by the maximum bitrate Opus supports)
+	// 558000 = 510000 (Opus) + 9600 (position) + 38400 (TCP overhead)
+	iMaxBandwidth              = 558000;
 	iMaxUsers                  = 1000;
 	iMaxUsersPerChannel        = 0;
 	iMaxListenersPerChannel    = -1;