CLIENT: improved voip quality

improved opus settings and add jitter handling

adaptive bitrates

added input volume rendering to the ui and allow to test your mic

Author: mgerhardy

code/cgame/cg_draw.c

@@ -746,8 +746,20 @@ static float CG_DrawVoiceNames(float y) {
 		durationFraction = (float)(cg.time - cg.lastVoiceTime[i]) / duration_max;
 		alpha = alpha_max - (durationFraction * (alpha_max - alpha_min));
 
-		nameLeft = SCREEN_WIDTH - (Q_PrintStrlen(name) * BIGCHAR_WIDTH);
-		CG_DrawBigString(nameLeft, y, name, alpha);
+		// Color-code the name based on VoIP quality
+		{
+			const char *qualityPrefix;
+			int quality = cg.lastVoiceQuality[i];
+			if (quality >= 90) {
+				qualityPrefix = S_COLOR_GREEN;
+			} else if (quality >= 70) {
+				qualityPrefix = S_COLOR_YELLOW;
+			} else {
+				qualityPrefix = S_COLOR_RED;
+			}
+			nameLeft = SCREEN_WIDTH - ((Q_PrintStrlen(name) + 1) * BIGCHAR_WIDTH);
+			CG_DrawBigString(nameLeft, y, va("%s%s", qualityPrefix, name), alpha);
+		}
 
 		iconLeft = nameLeft - icon2textSpacing - iconWidth;
 		CG_DrawPic(iconLeft, y, iconWidth, iconHeight, cgs.media.voiceIcon);

code/cgame/cg_local.h

@@ -692,6 +692,7 @@ typedef struct {
 	qboolean testGun;
 
 	int lastVoiceTime[MAX_CLIENTS];
+	int lastVoiceQuality[MAX_CLIENTS]; // 0-100, quality percentage per sender
 	// cammod
 	vec3_t CamPos;
 	vec3_t CamAngles;
@@ -1841,6 +1842,7 @@ qboolean trap_getCameraInfo(int time, vec3_t *origin, vec3_t *angles);
 
 qboolean trap_GetEntityToken(char *buffer, int bufferSize);
 void trap_GetVoipTimes(int *times);
+void trap_GetVoipQuality(int *quality);
 
 int trap_RealTime(qtime_t *qtime);
 

code/cgame/cg_public.h

@@ -158,6 +158,7 @@ typedef enum {
 	// 1.32
 	CG_FS_SEEK,
 	CG_GET_VOIP_TIMES,
+	CG_GET_VOIP_QUALITY,
 	/*
 		CG_LOADCAMERA,
 		CG_STARTCAMERA,

code/cgame/cg_syscalls.asm

@@ -12,7 +12,7 @@ equ	trap_Argv							-9
 equ	trap_Args							-10
 equ	trap_FS_FOpenFile					-11
 equ	trap_FS_Read						-12
-equ	trap_FS_Write						-13 
+equ	trap_FS_Write						-13
 equ	trap_FS_FCloseFile					-14
 equ	trap_SendConsoleCommand				-15
 equ	trap_AddCommand						-16
@@ -91,6 +91,7 @@ equ	trap_R_AddPolysToScene				-88
 equ trap_R_inPVS						-89
 equ trap_FS_Seek			-90
 equ trap_GetVoipTimes		-91
+equ trap_GetVoipQuality		-92
 
 equ	memset						-101
 equ	memcpy						-102

code/cgame/cg_syscalls.c

@@ -438,3 +438,7 @@ qboolean trap_R_inPVS(const vec3_t p1, const vec3_t p2) {
 void trap_GetVoipTimes(int *times) {
 	syscall(CG_GET_VOIP_TIMES, times);
 }
+
+void trap_GetVoipQuality(int *quality) {
+	syscall(CG_GET_VOIP_QUALITY, quality);
+}

code/cgame/cg_view.c

@@ -1129,5 +1129,6 @@ void CG_DrawActiveFrame(int serverTime, stereoFrame_t stereoView, qboolean demoP
 	CG_UpdateVoipTeamIDs();
 	if (cg_drawVoiceNames.integer) {
 		trap_GetVoipTimes(cg.lastVoiceTime);
+		trap_GetVoipQuality(cg.lastVoiceQuality);
 	}
 }

code/client/CMakeLists.txt

@@ -8,6 +8,7 @@ set(SRCS
 	cl_main.c
 	cl_net_chan.c
 	cl_parse.c
+	cl_voip.c
 	cl_scrn.c
 	cl_ui.c
 	cl_avi.c

code/client/cl_cgame.c

@@ -350,7 +350,31 @@ static void CL_CM_LoadMap(const char *mapname) {
 }
 
 static void CL_GetVoipTimes(int *times) {
-	memcpy(times, clc.voipLastPacket, sizeof(int) * MAX_CLIENTS);
+	int i;
+	for (i = 0; i < MAX_CLIENTS; i++) {
+		times[i] = clc.voipSenders[i].lastPacketTime;
+	}
+}
+
+// Returns per-client VoIP quality as integer percentage (0=worst, 100=perfect)
+static void CL_GetVoipQuality(int *quality) {
+	int i;
+	for (i = 0; i < MAX_CLIENTS; i++) {
+		voipNetStats_t *stats = &clc.voipSenders[i].netStats;
+		if (stats->packetsReceived > 0) {
+			// Quality = 100 - loss percentage, clamped to [0, 100]
+			int q = 100 - (int)(stats->lossRate * 100.0f + 0.5f);
+			if (q < 0) {
+				q = 0;
+			}
+			if (q > 100) {
+				q = 100;
+			}
+			quality[i] = q;
+		} else {
+			quality[i] = 100; // no data = assume perfect
+		}
+	}
 }
 
 /*
@@ -671,6 +695,9 @@ static intptr_t CL_CgameSystemCalls(intptr_t *args) {
 	case CG_GET_VOIP_TIMES:
 		CL_GetVoipTimes(VMA(1));
 		return 0;
+	case CG_GET_VOIP_QUALITY:
+		CL_GetVoipQuality(VMA(1));
+		return 0;
 
 	default:
 		assert(0);
@@ -876,31 +903,10 @@ static void CL_FirstSnapshot(void) {
 
 #ifdef USE_VOIP
 	if (!clc.voipCodecInitialized) {
-		int i;
-		int error;
-
-		clc.opusEncoder = opus_encoder_create(48000, 1, OPUS_APPLICATION_VOIP, &error);
-
-		if (error) {
-			Com_DPrintf("VoIP: Error opus_encoder_create %d\n", error);
-			return;
-		}
-
-		for (i = 0; i < MAX_CLIENTS; i++) {
-			clc.opusDecoder[i] = opus_decoder_create(48000, 1, &error);
-			if (error) {
-				Com_DPrintf("VoIP: Error opus_decoder_create(%d) %d\n", i, error);
-				return;
-			}
-			clc.voipIgnore[i] = qfalse;
-			clc.voipGain[i] = 1.0f;
-			clc.voipLastPacket[i] = 0;
+		CL_VoipCodecInit();
+		if (clc.voipCodecInitialized) {
+			Cvar_Set("cl_voipSendTarget", "spatial");
 		}
-		clc.voipCodecInitialized = qtrue;
-		clc.voipMuteAll = qfalse;
-		Cmd_AddCommand("voip", CL_Voip_f);
-		Cvar_Set("cl_voipSendTarget", "spatial");
-		Com_Memset(clc.voipTargets, ~0, sizeof(clc.voipTargets));
 	}
 #endif
 }

code/client/cl_main.c

@@ -46,6 +46,11 @@ cvar_t *cl_voipCaptureMult;
 cvar_t *cl_voipShowMeter;
 cvar_t *cl_voipProtocol;
 cvar_t *cl_voip;
+cvar_t *cl_voipBitrate;
+cvar_t *cl_voipComplexity;
+cvar_t *cl_voipFEC;
+cvar_t *cl_voipPacketLossRate;
+cvar_t *cl_voipAdaptive;
 #endif
 
 #ifdef USE_RENDERER_DLOPEN
@@ -198,7 +203,7 @@ static void CL_UpdateVoipIgnore(const char *idstr, qboolean ignore) {
 	if ((*idstr >= '0') && (*idstr <= '9')) {
 		const int id = atoi(idstr);
 		if ((id >= 0) && (id < MAX_CLIENTS)) {
-			clc.voipIgnore[id] = ignore;
+			clc.voipSenders[id].ignore = ignore;
 			CL_AddReliableCommand(va("voip %s %d", ignore ? "ignore" : "unignore", id), qfalse);
 			Com_Printf("VoIP: %s ignoring player #%d\n", ignore ? "Now" : "No longer", id);
 			return;
@@ -213,7 +218,7 @@ static void CL_UpdateVoipGain(const char *idstr, float gain) {
 		if (gain < 0.0f)
 			gain = 0.0f;
 		if ((id >= 0) && (id < MAX_CLIENTS)) {
-			clc.voipGain[id] = gain;
+			clc.voipSenders[id].gain = gain;
 			Com_Printf("VoIP: player #%d gain now set to %f\n", id, gain);
 		}
 	}
@@ -223,6 +228,25 @@ void CL_Voip_f(void) {
 	const char *cmd = Cmd_Argv(1);
 	const char *reason = NULL;
 
+	// Commands that only need the codec, not a server connection
+	if (strcmp(cmd, "test") == 0) {
+		CL_VoipToggleTest();
+		return;
+	} else if (strcmp(cmd, "test_stop") == 0) {
+		if (clc.voipTestMode) {
+			CL_VoipToggleTest();
+		}
+		return;
+	} else if (strcmp(cmd, "stats") == 0) {
+		if (!clc.voipCodecInitialized) {
+			Com_Printf("VoIP: codec not initialized.\n");
+			return;
+		}
+		CL_VoipPrintStats();
+		return;
+	}
+
+	// All other commands require an active server connection
 	if (clc.state != CA_ACTIVE)
 		reason = "Not connected to a server";
 	else if (!clc.voipCodecInitialized)
@@ -248,7 +272,7 @@ void CL_Voip_f(void) {
 		} else if (Q_isanumber(Cmd_Argv(2))) {
 			int id = atoi(Cmd_Argv(2));
 			if (id >= 0 && id < MAX_CLIENTS) {
-				Com_Printf("VoIP: current gain for player #%d is %f\n", id, clc.voipGain[id]);
+				Com_Printf("VoIP: current gain for player #%d is %f\n", id, clc.voipSenders[id].gain);
 			} else {
 				Com_Printf("VoIP: invalid player ID#\n");
 			}
@@ -266,7 +290,9 @@ void CL_Voip_f(void) {
 	} else {
 		Com_Printf("usage: voip [un]ignore <playerID#>\n"
 				   "       voip [un]muteall\n"
-				   "       voip gain <playerID#> [value]\n");
+				   "       voip gain <playerID#> [value]\n"
+				   "       voip stats\n"
+				   "       voip test\n");
 	}
 }
 
@@ -354,8 +380,11 @@ static void CL_VoipParseTargets(void) {
 ===============
 CL_CaptureVoip
 
-Record more audio from the hardware if required and encode it into Opus
- data for later transmission.
+Record audio from the hardware, apply gain (with clipping protection),
+encode into Opus data, and queue for transmission. Handles push-to-talk,
+voice activity detection (VAD), and rate checking.
+
+Called once per client frame from CL_Frame().
 ===============
 */
 static void CL_CaptureVoip(void) {
@@ -446,6 +475,7 @@ static void CL_CaptureVoip(void) {
 			// audio capture is always MONO16.
 			static int16_t sampbuffer[VOIP_MAX_PACKET_SAMPLES];
 			float voipPower = 0.0f;
+			float peakAmplitude = 0.0f;
 			int voipFrames;
 			int i, bytes;
 
@@ -470,7 +500,8 @@ static void CL_CaptureVoip(void) {
 				const float flsamp = (float)sampbuffer[i];
 				const float s = fabs(flsamp);
 				voipPower += s * s;
-				sampbuffer[i] = (int16_t)((flsamp)*audioMult);
+				if (s > peakAmplitude) peakAmplitude = s;
+				sampbuffer[i] = CL_VoipClampSample(flsamp * audioMult);
 			}
 
 			// encode raw audio samples into Opus data...
@@ -483,22 +514,16 @@ static void CL_CaptureVoip(void) {
 
 			clc.voipPower = (voipPower / (32768.0f * 32768.0f * ((float)samples))) * 100.0f;
 
-			if ((useVad) && (clc.voipPower < cl_voipVADThreshold->value)) {
+			// Update the mic level cvar for UI display (peak amplitude as % of full scale)
+			Cvar_Set("cl_voipMicLevel", va("%d", (int)((peakAmplitude / 32768.0f) * 100.0f)));
+
+			if ((useVad) && !CL_VoipVADCheck(clc.voipPower)) {
 				CL_VoipNewGeneration(); // no "talk" for at least 1/4 second.
 			} else {
 				clc.voipOutgoingDataSize = bytes;
 				clc.voipOutgoingDataFrames = voipFrames;
 
 				Com_DPrintf("VoIP: Send %d frames, %d bytes, %f power\n", voipFrames, bytes, clc.voipPower);
-
-#if 0
-				static FILE *encio = NULL;
-				if (encio == NULL) encio = fopen("voip-outgoing-encoded.bin", "wb");
-				if (encio != NULL) { fwrite(clc.voipOutgoingData, bytes, 1, encio); fflush(encio); }
-				static FILE *decio = NULL;
-				if (decio == NULL) decio = fopen("voip-outgoing-decoded.bin", "wb");
-				if (decio != NULL) { fwrite(sampbuffer, voipFrames * VOIP_MAX_FRAME_SAMPLES * 2, 1, decio); fflush(decio); }
-#endif
 			}
 		}
 	}
@@ -2773,7 +2798,13 @@ void CL_Frame(int msec) {
 	S_Update();
 
 #ifdef USE_VOIP
-	CL_CaptureVoip();
+	if (clc.voipTestMode) {
+		CL_VoipTestFrame();
+	} else {
+		CL_CaptureVoip();
+	}
+	CL_VoipProcessJitterBuffers();
+	CL_VoipAdaptToNetwork();
 #endif
 
 #ifdef USE_MUMBLE
@@ -2885,6 +2916,10 @@ void CL_StartHunkUsers(qboolean rendererOnly) {
 	if (!cls.soundStarted) {
 		cls.soundStarted = qtrue;
 		S_Init();
+#ifdef USE_VOIP
+		// Set capture availability immediately so the UI knows before codec init
+		Cvar_Set("cl_voipNoMic", S_CaptureAvailable() ? "0" : "1");
+#endif
 	}
 
 	if (!cls.soundRegistered) {
@@ -3519,12 +3554,38 @@ void CL_Init(void) {
 	cl_voipGainDuringCapture = Cvar_Get("cl_voipGainDuringCapture", "0.2", CVAR_ARCHIVE);
 	cl_voipCaptureMult = Cvar_Get("cl_voipCaptureMult", "2.0", CVAR_ARCHIVE);
 	cl_voipUseVAD = Cvar_Get("cl_voipUseVAD", "0", CVAR_ARCHIVE);
-	cl_voipVADThreshold = Cvar_Get("cl_voipVADThreshold", "0.25", CVAR_ARCHIVE);
+	cl_voipVADThreshold = Cvar_Get("cl_voipVADThreshold", "0.05", CVAR_ARCHIVE);
 	cl_voipShowMeter = Cvar_Get("cl_voipShowMeter", "1", CVAR_ARCHIVE);
 
+	// Opus encoder quality settings
+	cl_voipBitrate = Cvar_Get("cl_voipBitrate", "32000", CVAR_ARCHIVE);
+	Cvar_CheckRange(cl_voipBitrate, 6000, 128000, qtrue);
+	cl_voipComplexity = Cvar_Get("cl_voipComplexity", "5", CVAR_ARCHIVE);
+	Cvar_CheckRange(cl_voipComplexity, 0, 10, qtrue);
+	cl_voipFEC = Cvar_Get("cl_voipFEC", "1", CVAR_ARCHIVE);
+	Cvar_CheckRange(cl_voipFEC, 0, 1, qtrue);
+	cl_voipPacketLossRate = Cvar_Get("cl_voipPacketLossRate", "5", CVAR_ARCHIVE);
+	Cvar_CheckRange(cl_voipPacketLossRate, 0, 100, qtrue);
+
+	// Jitter buffer
+	cl_voipJitterDelay = Cvar_Get("cl_voipJitterDelay", "60", CVAR_ARCHIVE);
+	Cvar_CheckRange(cl_voipJitterDelay, 0, 200, qtrue);
+
+	// Network adaptation
+	cl_voipAdaptive = Cvar_Get("cl_voipAdaptive", "1", CVAR_ARCHIVE);
+	Cvar_CheckRange(cl_voipAdaptive, 0, 1, qtrue);
+
 	cl_voip = Cvar_Get("cl_voip", "1", CVAR_ARCHIVE);
 	Cvar_CheckRange(cl_voip, 0, 1, qtrue);
 	cl_voipProtocol = Cvar_Get("cl_voipProtocol", cl_voip->integer ? "opus" : "", CVAR_USERINFO | CVAR_ROM);
+
+	// Mic level for UI display (updated each frame during capture)
+	Cvar_Get("cl_voipMicLevel", "0", 0);
+	Cvar_Get("cl_voipTestMode", "0", 0);
+	Cvar_Get("cl_voipNoMic", "0", 0);
+
+	// Register the voip command early so it's available from the menu
+	Cmd_AddCommand("voip", CL_Voip_f);
 #endif
 
 #ifdef USE_HTTP