Improve internal buffer management for voice packets

botder · botder · commit 63b91ff36ed0 · 2025-08-31T21:37:55.000+02:00
diff --git a/Client/mods/deathmatch/CVoiceRecorder.cpp b/Client/mods/deathmatch/CVoiceRecorder.cpp
@@ -101,7 +101,7 @@ void CVoiceRecorder::Init(bool bEnabled, unsigned int uiServerSampleRate, unsign
     if (iBitRate)
         speex_encoder_ctl(m_pSpeexEncoderState, SPEEX_SET_BITRATE, &iBitRate);
 
-    m_pOutgoingBuffer = (char*)malloc(m_uiBufferSizeBytes * FRAME_OUTGOING_BUFFER_COUNT);
+    m_pOutgoingBuffer = (unsigned char*)malloc(m_uiBufferSizeBytes * FRAME_OUTGOING_BUFFER_COUNT);
     m_uiOutgoingReadIndex = 0;
     m_uiOutgoingWriteIndex = 0;
 
@@ -247,9 +247,9 @@ void CVoiceRecorder::DoPulse()
 {
     std::lock_guard<std::mutex> lock(m_Mutex);
 
-    char*        pInputBuffer;
-    char         bufTempOutput[2048];
-    unsigned int uiTotalBufferSize = m_uiBufferSizeBytes * FRAME_OUTGOING_BUFFER_COUNT;
+    unsigned char* pInputBuffer;
+    unsigned char  audioBuffer[2048]{};
+    unsigned int   uiTotalBufferSize = m_uiBufferSizeBytes * FRAME_OUTGOING_BUFFER_COUNT;
 
     // Only send every 100 ms
     if (CClientTime::GetTime() - m_ulTimeOfLastSend > 100 && m_VoiceState != VOICESTATE_AWAITING_INPUT)
@@ -280,8 +280,8 @@ void CVoiceRecorder::DoPulse()
                 {
                     unsigned t;
                     for (t = 0; t < uiSpeexBlockSize; t++)
-                        bufTempOutput[t] = m_pOutgoingBuffer[t % uiTotalBufferSize];
-                    pInputBuffer = bufTempOutput;
+                        audioBuffer[t] = m_pOutgoingBuffer[t % uiTotalBufferSize];
+                    pInputBuffer = audioBuffer;
                 }
                 else
                     pInputBuffer = m_pOutgoingBuffer + m_uiOutgoingReadIndex;
@@ -296,9 +296,9 @@ void CVoiceRecorder::DoPulse()
 
                 m_bIsSendingVoiceData = true;
 
-                unsigned int uiBytesWritten = speex_bits_write(&speexBits, bufTempOutput, 2048);
+                unsigned int audioBufferLength = speex_bits_write(&speexBits, reinterpret_cast<char*>(audioBuffer), 2048);
 
-                g_pClientGame->GetLocalPlayer()->GetVoice()->DecodeAndBuffer(bufTempOutput, uiBytesWritten);
+                g_pClientGame->GetLocalPlayer()->GetVoice()->DecodeAndBuffer(audioBuffer, audioBufferLength);
 
                 NetBitStreamInterface* pBitStream = g_pNet->AllocateNetBitStream();
                 if (pBitStream)
@@ -307,8 +307,8 @@ void CVoiceRecorder::DoPulse()
 
                     if (pLocalPlayer)
                     {
-                        pBitStream->Write((unsigned short)uiBytesWritten);                  // size of buffer / voice data
-                        pBitStream->Write((char*)bufTempOutput, uiBytesWritten);            // voice data
+                        pBitStream->Write((unsigned short)audioBufferLength);
+                        pBitStream->Write(reinterpret_cast<char*>(audioBuffer), audioBufferLength);
 
                         g_pNet->SendPacket(PACKET_ID_VOICE_DATA, pBitStream, PACKET_PRIORITY_LOW, PACKET_RELIABILITY_UNRELIABLE_SEQUENCED,
                                            PACKET_ORDERING_VOICE);
diff --git a/Client/mods/deathmatch/CVoiceRecorder.h b/Client/mods/deathmatch/CVoiceRecorder.h
@@ -79,11 +79,11 @@ class CVoiceRecorder
     void*                 m_pSpeexEncoderState;
     SpeexPreprocessState* m_pSpeexPreprocState;
 
-    char*        m_pOutgoingBuffer;
-    int          m_iSpeexOutgoingFrameSampleCount;
-    unsigned int m_uiOutgoingReadIndex;
-    unsigned int m_uiOutgoingWriteIndex;
-    bool         m_bIsSendingVoiceData;
+    unsigned char* m_pOutgoingBuffer;
+    int            m_iSpeexOutgoingFrameSampleCount;
+    unsigned int   m_uiOutgoingReadIndex;
+    unsigned int   m_uiOutgoingWriteIndex;
+    bool           m_bIsSendingVoiceData;
 
     unsigned long m_ulTimeOfLastSend;
 
diff --git a/Client/mods/deathmatch/logic/CClientPlayerVoice.cpp b/Client/mods/deathmatch/logic/CClientPlayerVoice.cpp
@@ -118,8 +118,11 @@ void CClientPlayerVoice::DoPulse()
     }
 }
 
-void CClientPlayerVoice::DecodeAndBuffer(char* pBuffer, unsigned int bytesWritten)
+void CClientPlayerVoice::DecodeAndBuffer(const unsigned char* voiceBuffer, unsigned int voiceBufferLength)
 {
+    if (!voiceBuffer || !voiceBufferLength || voiceBufferLength > 2048)
+        return;
+
     m_Mutex.lock();
 
     if (!m_bVoiceActive)
@@ -143,7 +146,7 @@ void CClientPlayerVoice::DecodeAndBuffer(char* pBuffer, unsigned int bytesWritte
     SpeexBits speexBits;
     speex_bits_init(&speexBits);
 
-    speex_bits_read_from(&speexBits, (char*)(pBuffer), bytesWritten);
+    speex_bits_read_from(&speexBits, reinterpret_cast<const char*>(voiceBuffer), voiceBufferLength);
     speex_decode_int(m_pSpeexDecoderState, &speexBits, (spx_int16_t*)pTempBuffer);
 
     speex_bits_destroy(&speexBits);
diff --git a/Client/mods/deathmatch/logic/CClientPlayerVoice.h b/Client/mods/deathmatch/logic/CClientPlayerVoice.h
@@ -28,7 +28,7 @@ class CClientPlayerVoice
     ZERO_ON_NEW
     CClientPlayerVoice(CClientPlayer* pPlayer, CVoiceRecorder* pVoiceRecorder);
     ~CClientPlayerVoice();
-    void DecodeAndBuffer(char* pBuffer, unsigned int bytesWritten);
+    void DecodeAndBuffer(const unsigned char* voiceBuffer, unsigned int voiceBufferLength);
     void DoPulse();
 
     bool m_bVoiceActive;
diff --git a/Client/mods/deathmatch/logic/CPacketHandler.cpp b/Client/mods/deathmatch/logic/CPacketHandler.cpp
@@ -5403,24 +5403,26 @@ void CPacketHandler::Packet_DestroySatchels(NetBitStreamInterface& bitStream)
 
 void CPacketHandler::Packet_VoiceData(NetBitStreamInterface& bitStream)
 {
-    unsigned short usPacketSize;
+    unsigned short voiceBufferLength;
     ElementID      PlayerID;
+
     if (bitStream.Read(PlayerID))
     {
         CClientPlayer* pPlayer = g_pClientGame->m_pPlayerManager->Get(PlayerID);
-        if (pPlayer && bitStream.Read(usPacketSize))
+
+        if (pPlayer && bitStream.Read(voiceBufferLength) && voiceBufferLength <= 2048)
         {
-            char* pBuf = new char[usPacketSize];
+            const auto voiceBuffer = new unsigned char[voiceBufferLength];
 
-            if (bitStream.Read(pBuf, usPacketSize))
+            if (bitStream.Read(reinterpret_cast<char*>(voiceBuffer), voiceBufferLength))
             {
                 if (pPlayer->GetVoice())
                 {
-                    pPlayer->GetVoice()->DecodeAndBuffer(pBuf, usPacketSize);
+                    pPlayer->GetVoice()->DecodeAndBuffer(voiceBuffer, voiceBufferLength);
                 }
             }
 
-            delete[] pBuf;
+            delete[] voiceBuffer;
         }
     }
 }
diff --git a/Server/mods/deathmatch/logic/CGame.cpp b/Server/mods/deathmatch/logic/CGame.cpp
@@ -3859,9 +3859,7 @@ void CGame::Packet_Voice_Data(CVoiceDataPacket& Packet)
 
     if (m_pMainConfig->IsVoiceEnabled())            // Shouldn't really be receiving voice packets at all if voice is disabled
     {
-        usDataLength = Packet.GetDataLength();
-
-        if (usDataLength > 0)
+        if (!Packet.IsEmpty())
         {
             CPlayer* pPlayer = Packet.GetSourcePlayer();
 
@@ -3890,9 +3888,6 @@ void CGame::Packet_Voice_Data(CVoiceDataPacket& Packet)
                 if (pPlayer->GetVoiceState() ==
                     VOICESTATE_TRANSMITTING)            // If we reach here, and we're still in idle state, then the event was cancelled
                 {
-                    const unsigned char* pBuffer = Packet.GetData();
-                    CVoiceDataPacket     VoicePacket(pPlayer, pBuffer, usDataLength);
-
                     // Make list of players to send the voice packet to
                     std::set<CPlayer*> playerSendMap;
 
@@ -3935,7 +3930,7 @@ void CGame::Packet_Voice_Data(CVoiceDataPacket& Packet)
                     }
 
                     // Send to all players in the send list
-                    CPlayerManager::Broadcast(VoicePacket, playerSendMap);
+                    CPlayerManager::Broadcast(Packet, playerSendMap);
                 }
             }
         }
diff --git a/Server/mods/deathmatch/logic/packets/CVoiceDataPacket.cpp b/Server/mods/deathmatch/logic/packets/CVoiceDataPacket.cpp
@@ -1,11 +1,11 @@
 /*****************************************************************************
  *
- *  PROJECT:     Multi Theft Auto v1.0
+ *  PROJECT:     Multi Theft Auto
  *  LICENSE:     See LICENSE in the top level directory
  *  FILE:        mods/deathmatch/logic/packets/CVoiceDataPacket.cpp
  *  PURPOSE:     Voice data packet class
  *
- *  Multi Theft Auto is available from https://www.multitheftauto.com/
+ *  Multi Theft Auto is available from https://multitheftauto.com/
  *
  *****************************************************************************/
 
@@ -15,112 +15,47 @@
 
 CVoiceDataPacket::CVoiceDataPacket()
 {
-    m_pBuffer = NULL;
-    m_usDataBufferSize = 0;
-    m_usActualDataLength = 0;
-
-    AllocateBuffer(1024);
-}
-
-CVoiceDataPacket::CVoiceDataPacket(CPlayer* pPlayer, const unsigned char* pbSrcBuffer, unsigned short usLength)
-{
-    m_pBuffer = NULL;
-    m_usDataBufferSize = 0;
-    m_usActualDataLength = 0;
-
-    SetSourceElement(pPlayer);
-    SetData(pbSrcBuffer, usLength);
-}
-CVoiceDataPacket::~CVoiceDataPacket()
-{
-    DeallocateBuffer();
+    m_voiceBuffer.reserve(2048);
 }
 
 bool CVoiceDataPacket::Read(NetBitStreamInterface& BitStream)
 {
-    if (m_pBuffer)
+    unsigned short voiceBufferLength{};
+
+    if (BitStream.Read(voiceBufferLength) && voiceBufferLength <= m_voiceBuffer.capacity())
     {
-        BitStream.Read(m_usActualDataLength);
-        if (m_usActualDataLength)
-        {
-            BitStream.Read(reinterpret_cast<char*>(m_pBuffer), m_usActualDataLength <= m_usDataBufferSize ? m_usActualDataLength : m_usDataBufferSize);
-        }
-        return true;
+        m_voiceBuffer.resize(voiceBufferLength);
+        return BitStream.Read(reinterpret_cast<char*>(m_voiceBuffer.data()), m_voiceBuffer.size());
     }
 
     return false;
 }
 
 bool CVoiceDataPacket::Write(NetBitStreamInterface& BitStream) const
 {
-    if (m_usActualDataLength)
+    if (!m_voiceBuffer.empty())
     {
+        const auto voiceBuffer = reinterpret_cast<const char*>(m_voiceBuffer.data());
+        const auto voiceBufferLength = static_cast<uint16_t>(m_voiceBuffer.size());
+
         // Write the source player
-        ElementID ID = m_pSourceElement->GetID();
-        BitStream.Write(ID);
+        BitStream.Write(m_pSourceElement->GetID());
         // Write the length as an unsigned short and then write the string
-        BitStream.Write(m_usActualDataLength);
-        BitStream.Write(reinterpret_cast<const char*>(m_pBuffer), m_usActualDataLength);
+        BitStream.Write(voiceBufferLength);
+        BitStream.Write(voiceBuffer, voiceBufferLength);
         return true;
     }
 
     return false;
 }
 
-void CVoiceDataPacket::AllocateBuffer(unsigned short usBufferSize)
-{
-    // Test to see if we already have an allocated buffer
-    // that will hold the requested size.
-    if (m_usDataBufferSize < usBufferSize)
-    {
-        // It's not... resize the buffer.
-        if (m_pBuffer)
-        {
-            // Free the current buffer.
-            delete[] m_pBuffer;
-        }
-
-        // Allocate new buffer.
-        m_pBuffer = new unsigned char[usBufferSize];
-
-        // Clear buffer.
-        memset(m_pBuffer, 0, usBufferSize);
-
-        // Save the new size.
-        m_usDataBufferSize = usBufferSize;
-    }
-}
-
-void CVoiceDataPacket::DeallocateBuffer()
+void CVoiceDataPacket::SetVoiceData(const unsigned char* voiceBuffer, unsigned short voiceBufferLength)
 {
-    if (m_pBuffer)
-    {
-        delete[] m_pBuffer;
-        m_pBuffer = NULL;
-        m_usDataBufferSize = 0;
-        m_usActualDataLength = 0;
-    }
-}
+    m_voiceBuffer.clear();
 
-void CVoiceDataPacket::SetData(const unsigned char* pbSrcBuffer, unsigned short usLength)
-{
-    // Allocate new buffer.
-    AllocateBuffer(usLength);
+    if (!voiceBuffer || !voiceBufferLength || voiceBufferLength > m_voiceBuffer.capacity())
+        return;
 
-    // Copy in the data.
-    if (m_pBuffer)
-    {
-        memcpy(m_pBuffer, pbSrcBuffer, usLength);
-        m_usActualDataLength = usLength;
-    }
-}
-
-const unsigned char* CVoiceDataPacket::GetData() const
-{
-    return m_pBuffer;
-}
-
-unsigned short CVoiceDataPacket::GetDataLength() const
-{
-    return m_usActualDataLength;
+    m_voiceBuffer.resize(voiceBufferLength);
+    std::copy_n(voiceBuffer, voiceBufferLength, m_voiceBuffer.data());
 }
diff --git a/Server/mods/deathmatch/logic/packets/CVoiceDataPacket.h b/Server/mods/deathmatch/logic/packets/CVoiceDataPacket.h
@@ -1,24 +1,23 @@
 /*****************************************************************************
  *
- *  PROJECT:     Multi Theft Auto v1.0
+ *  PROJECT:     Multi Theft Auto
  *  LICENSE:     See LICENSE in the top level directory
  *  FILE:        mods/deathmatch/logic/packets/CVoiceDataPacket.h
  *  PURPOSE:     Voice data packet class
  *
- *  Multi Theft Auto is available from https://www.multitheftauto.com/
+ *  Multi Theft Auto is available from https://multitheftauto.com/
  *
  *****************************************************************************/
 
 #pragma once
 
 #include "CPacket.h"
+#include <vector>
 
 class CVoiceDataPacket final : public CPacket
 {
 public:
-    CVoiceDataPacket(CPlayer* pPlayer, const unsigned char* pbSrcBuffer, unsigned short usLength);
     CVoiceDataPacket();
-    ~CVoiceDataPacket();
 
     ePacketID               GetPacketID() const { return PACKET_ID_VOICE_DATA; }
     unsigned long           GetFlags() const { return PACKET_LOW_PRIORITY | PACKET_SEQUENCED; };
@@ -27,16 +26,10 @@ class CVoiceDataPacket final : public CPacket
     bool Read(NetBitStreamInterface& BitStream);
     bool Write(NetBitStreamInterface& BitStream) const;
 
-    void SetData(const unsigned char* pbSrcBuffer, unsigned short usLength);
+    void SetVoiceData(const unsigned char* voiceBuffer, unsigned short voiceBufferLength);
 
-    unsigned short       GetDataLength() const;
-    const unsigned char* GetData() const;
+    bool IsEmpty() const noexcept { return m_voiceBuffer.empty(); }
 
 private:
-    void AllocateBuffer(unsigned short usBufferSize);
-    void DeallocateBuffer();
-
-    unsigned char* m_pBuffer;
-    unsigned short m_usDataBufferSize;
-    unsigned short m_usActualDataLength;
+    std::vector<unsigned char> m_voiceBuffer;
 };

Original file line number	Diff line number	Diff line change
`@@ -118,8 +118,11 @@ void CClientPlayerVoice::DoPulse()`
`118`	`118`	`}`
`119`	`119`	`}`
`120`	`120`
`121`		`-void CClientPlayerVoice::DecodeAndBuffer(char* pBuffer, unsigned int bytesWritten)`
	`121`	`+void CClientPlayerVoice::DecodeAndBuffer(const unsigned char* voiceBuffer, unsigned int voiceBufferLength)`
`122`	`122`	`{`
	`123`	`+ if (!voiceBuffer \|\| !voiceBufferLength \|\| voiceBufferLength > 2048)`
	`124`	`+ return;`
	`125`	`+`
`123`	`126`	`m_Mutex.lock();`
`124`	`127`
`125`	`128`	`if (!m_bVoiceActive)`
`@@ -143,7 +146,7 @@ void CClientPlayerVoice::DecodeAndBuffer(char* pBuffer, unsigned int bytesWritte`
`143`	`146`	`SpeexBits speexBits;`
`144`	`147`	`speex_bits_init(&speexBits);`
`145`	`148`
`146`		`- speex_bits_read_from(&speexBits, (char*)(pBuffer), bytesWritten);`
	`149`	`+ speex_bits_read_from(&speexBits, reinterpret_cast<const char*>(voiceBuffer), voiceBufferLength);`
`147`	`150`	`speex_decode_int(m_pSpeexDecoderState, &speexBits, (spx_int16_t*)pTempBuffer);`
`148`	`151`
`149`	`152`	`speex_bits_destroy(&speexBits);`
Original file line number	Diff line number	Diff line change
`@@ -5403,24 +5403,26 @@ void CPacketHandler::Packet_DestroySatchels(NetBitStreamInterface& bitStream)`
`5403`	`5403`
`5404`	`5404`	`void CPacketHandler::Packet_VoiceData(NetBitStreamInterface& bitStream)`
`5405`	`5405`	`{`
`5406`		`- unsigned short usPacketSize;`
	`5406`	`+ unsigned short voiceBufferLength;`
`5407`	`5407`	`ElementID PlayerID;`
	`5408`	`+`
`5408`	`5409`	`if (bitStream.Read(PlayerID))`
`5409`	`5410`	`{`
`5410`	`5411`	`CClientPlayer* pPlayer = g_pClientGame->m_pPlayerManager->Get(PlayerID);`
`5411`		`- if (pPlayer && bitStream.Read(usPacketSize))`
	`5412`	`+`
	`5413`	`+ if (pPlayer && bitStream.Read(voiceBufferLength) && voiceBufferLength <= 2048)`
`5412`	`5414`	`{`
`5413`		`- char* pBuf = new char[usPacketSize];`
	`5415`	`+ const auto voiceBuffer = new unsigned char[voiceBufferLength];`
`5414`	`5416`
`5415`		`- if (bitStream.Read(pBuf, usPacketSize))`
	`5417`	`+ if (bitStream.Read(reinterpret_cast<char*>(voiceBuffer), voiceBufferLength))`
`5416`	`5418`	`{`
`5417`	`5419`	`if (pPlayer->GetVoice())`
`5418`	`5420`	`{`
`5419`		`- pPlayer->GetVoice()->DecodeAndBuffer(pBuf, usPacketSize);`
	`5421`	`+ pPlayer->GetVoice()->DecodeAndBuffer(voiceBuffer, voiceBufferLength);`
`5420`	`5422`	`}`
`5421`	`5423`	`}`
`5422`	`5424`
`5423`		`- delete[] pBuf;`
	`5425`	`+ delete[] voiceBuffer;`
`5424`	`5426`	`}`
`5425`	`5427`	`}`
`5426`	`5428`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3859,9 +3859,7 @@ void CGame::Packet_Voice_Data(CVoiceDataPacket& Packet)`
`3859`	`3859`
`3860`	`3860`	`if (m_pMainConfig->IsVoiceEnabled()) // Shouldn't really be receiving voice packets at all if voice is disabled`
`3861`	`3861`	`{`
`3862`		`- usDataLength = Packet.GetDataLength();`
`3863`		`-`
`3864`		`- if (usDataLength > 0)`
	`3862`	`+ if (!Packet.IsEmpty())`
`3865`	`3863`	`{`
`3866`	`3864`	`CPlayer* pPlayer = Packet.GetSourcePlayer();`
`3867`	`3865`
`@@ -3890,9 +3888,6 @@ void CGame::Packet_Voice_Data(CVoiceDataPacket& Packet)`
`3890`	`3888`	`if (pPlayer->GetVoiceState() ==`
`3891`	`3889`	`VOICESTATE_TRANSMITTING) // If we reach here, and we're still in idle state, then the event was cancelled`
`3892`	`3890`	`{`
`3893`		`- const unsigned char* pBuffer = Packet.GetData();`
`3894`		`- CVoiceDataPacket VoicePacket(pPlayer, pBuffer, usDataLength);`
`3895`		`-`
`3896`	`3891`	`// Make list of players to send the voice packet to`
`3897`	`3892`	`std::set<CPlayer*> playerSendMap;`
`3898`	`3893`
`@@ -3935,7 +3930,7 @@ void CGame::Packet_Voice_Data(CVoiceDataPacket& Packet)`
`3935`	`3930`	`}`
`3936`	`3931`
`3937`	`3932`	`// Send to all players in the send list`
`3938`		`- CPlayerManager::Broadcast(VoicePacket, playerSendMap);`
	`3933`	`+ CPlayerManager::Broadcast(Packet, playerSendMap);`
`3939`	`3934`	`}`
`3940`	`3935`	`}`
`3941`	`3936`	`}`