UNLOZE/sm-ext-Voice
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added broadcastvoice data back but only for steam clients so that they can have voice_loopback 1 and hear their voices in demo

Browse Source
This commit is contained in:
jenz 2026-07-01 21:18:11 +01:00
parent 37c1a4d1b6
commit 984f3804cf
2 changed files with 28 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
extension.cpp
View File

@ -180,6 +180,8 @@ DETOUR_DECL_MEMBER1(ProcessVoiceData, bool, void *, msg)
CLC_VoiceData *voiceMsg = (CLC_VoiceData *)msg;
char voiceDataBuffer[4096];
int startBit = voiceMsg->m_DataIn.GetNumBitsRead();//check where we start
int bitsRead = voiceMsg->m_DataIn.ReadBitsClamped(voiceDataBuffer, voiceMsg->m_nLength);
int nBytes = Bits2Bytes(bitsRead);
@ -224,6 +226,7 @@ DETOUR_DECL_MEMBER1(ProcessVoiceData, bool, void *, msg)
if (g_bClientMuted[i + 1][clientIndex])
continue;
//smutils->LogMessage(myself, "in ProcessVoiceData before SendVoiceDataMsg");
//send celt packets to all nosteamers
SendVoiceDataMsg(playerSlot, pToClient, (unsigned char *)voiceDataBuffer, nBytes, voiceMsg->m_xuid);
}
}
@ -231,31 +234,36 @@ DETOUR_DECL_MEMBER1(ProcessVoiceData, bool, void *, msg)
{
//convert steam OPUS packet to CELT for no steam clients
g_Interface.PushPlayerVoiceData(playerSlot, nBytes, voiceDataBuffer);
// Send steam Opus packet to Steam clients
int maxClients = iserver->GetClientCount();
for (int i = 0; i < maxClients; i++)
{
IClient *pToClient = iserver->GetClient(i);
if (!pToClient || !pToClient->IsConnected() || !pToClient->IsActive() || pToClient->IsFakeClient())
continue;
bool bSelf = (i == playerSlot);
if (bSelf)
continue;
if (g_bIsNoSteam[i + 1])
continue;
if (g_bClientMuted[i + 1][clientIndex])
continue;
//smutils->LogMessage(myself, "in ProcessVoiceData before SendVoiceDataMsg");
SendVoiceDataMsg(playerSlot, pToClient, (unsigned char *)voiceDataBuffer, nBytes, voiceMsg->m_xuid);
}
voiceMsg->m_DataIn.Seek(startBit);// rewind so the real engine can read the voice data as well.
//send opus packets from steam clients to actual broadcastvoice data. makes voices in demos work and voice_loopback 1 as well.
DETOUR_MEMBER_CALL(ProcessVoiceData)(msg);
}
return true;
}
//re-introduced for the sake of voice_loopback 1 working and demos having voice chat again but only for steam clients.
DETOUR_DECL_STATIC4(SV_BroadcastVoiceData, void, IClient *, pClient, int, nBytes, char *, data, int64, xuid)
{
if(g_Interface.OnBroadcastVoiceData(pClient, nBytes, data))
{
DETOUR_STATIC_CALL(SV_BroadcastVoiceData)(pClient, nBytes, data, xuid);
}
}
bool CVoice::OnBroadcastVoiceData(IClient *pClient, int nBytes, char *data)
{
// Reject empty packets
if(nBytes < 1)
return false;
int client = pClient->GetPlayerSlot() + 1;
if (g_aFrameVoiceBytes[client] > NET_MAX_VOICE_BYTES_FRAME)
{
return false;
}
return true;
}
double getTime()
@ -1474,33 +1482,6 @@ void CVoice::TranscodeNoSteamToSteam(int playerSlot, int nBytes, char *data)
}
}
/*
// Resample 22050 -> 24000 and push into ring buffer
const int STEP = 24000;
const int DIV = 22050;
for (int i = 0; i < decoded; i++)
{
m_nosteamResampleAccum[playerSlot] += STEP;
while (m_nosteamResampleAccum[playerSlot] >= DIV)
{
m_nosteamResampleAccum[playerSlot] -= DIV;
int16_t sample = pcmBuf[i];
if (m_nosteamOpusPCMBuffer[playerSlot].CurrentFree() > 0)
m_nosteamOpusPCMBuffer[playerSlot].Push(&sample, 1);
}
}
*/
}
void CVoice::HandleNoSteamVoiceData()

2
extension.h
View File

@ -137,6 +137,7 @@ public: // IConCommandBaseAccessor
public:
CVoice();
void OnGameFrame(bool simulating);
bool OnBroadcastVoiceData(IClient *pClient, int nBytes, char *data);
void ListenSocket();
void PushPlayerVoiceData(int playerSlot, int nBytes, char *data);
@ -218,6 +219,7 @@ private:
void OnDataReceived(CClient *pClient, int16_t *pData, size_t Samples);
void HandleVoiceDataTorchlight();
void HandleNoSteamVoiceData();
void BroadcastVoiceData(IClient *pClient, int nBytes, unsigned char *pData);
};
#endif // _INCLUDE_SOURCEMOD_EXTENSION_PROPER_H_