ubergames/lilium-voyager
0
0
Fork 0
mirror of https://github.com/UberGames/lilium-voyager.git synced 2024-12-12 21:22:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

VoIP: tweaked VAD code.

Browse source 
Also added cl_voipVADThreshold cvar...if the power of a set of Speex frames
 doesn't exceed this value, it isn't transmitted.
This commit is contained in:
Ryan C. Gordon 2008-06-08 07:29:25 +00:00
parent fd239c58a8
commit be9ae48039
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/client/cl_main.c
View file

@ -35,6 +35,7 @@ cvar_t *cl_mumbleScale;
#if USE_VOIP #if USE_VOIP
cvar_t *cl_voipUseVAD; cvar_t *cl_voipUseVAD;
cvar_t *cl_voipVADThreshold;
cvar_t *cl_voipSend; cvar_t *cl_voipSend;
cvar_t *cl_voipSendTarget; cvar_t *cl_voipSendTarget;
cvar_t *cl_voipGainDuringCapture; cvar_t *cl_voipGainDuringCapture;
@ -384,7 +385,7 @@ void CL_CaptureVoip(void)
clc.voipPower = voipPower / (32768.0f * 32768.0f * clc.voipPower = voipPower / (32768.0f * 32768.0f *
((float) (clc.speexFrameSize * speexFrames))); ((float) (clc.speexFrameSize * speexFrames)));
if ((useVad) && (clc.voipPower > 0.25f)) { if ((useVad) && (clc.voipPower < cl_voipVADThreshold->value)) {
CL_VoipNewGeneration(); // no "talk" for at least 1/4 second. CL_VoipNewGeneration(); // no "talk" for at least 1/4 second.
} else { } else {
clc.voipOutgoingDataSize = wpos; clc.voipOutgoingDataSize = wpos;
@ -3082,6 +3083,7 @@ void CL_Init( void ) {
cl_voipSendTarget = Cvar_Get ("cl_voipSendTarget", "all", 0); cl_voipSendTarget = Cvar_Get ("cl_voipSendTarget", "all", 0);
cl_voipGainDuringCapture = Cvar_Get ("cl_voipGainDuringCapture", "0.2", CVAR_ARCHIVE); cl_voipGainDuringCapture = Cvar_Get ("cl_voipGainDuringCapture", "0.2", CVAR_ARCHIVE);
cl_voipUseVAD = Cvar_Get ("cl_voipUseVAD", "0", CVAR_ARCHIVE); cl_voipUseVAD = Cvar_Get ("cl_voipUseVAD", "0", CVAR_ARCHIVE);
cl_voipVADThreshold = Cvar_Get ("cl_voipVADThreshold", "0.0025", CVAR_ARCHIVE);
voip = Cvar_Get ("voip", "1", CVAR_USERINFO | CVAR_ARCHIVE | CVAR_LATCH); voip = Cvar_Get ("voip", "1", CVAR_USERINFO | CVAR_ARCHIVE | CVAR_LATCH);
// This is a protocol version number. // This is a protocol version number.

1
code/client/client.h
View file

@ -412,6 +412,7 @@ extern cvar_t *cl_mumbleScale;
// send to no one, or a comma-separated list of client numbers: // send to no one, or a comma-separated list of client numbers:
// "0,7,2,23" ... an empty string is treated like "all". // "0,7,2,23" ... an empty string is treated like "all".
extern cvar_t *cl_voipUseVAD; extern cvar_t *cl_voipUseVAD;
extern cvar_t *cl_voipVADThreshold;
extern cvar_t *cl_voipSend; extern cvar_t *cl_voipSend;
extern cvar_t *cl_voipSendTarget; extern cvar_t *cl_voipSendTarget;
extern cvar_t *cl_voipGainDuringCapture; extern cvar_t *cl_voipGainDuringCapture;