Skip to content

Clear a reused channel's stale audio and decoder state #3969

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
softins merged 6 commits into from
Oct 10, 2026
Merged

Clear a reused channel's stale audio and decoder state #3969

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
090cc44
Clear a reused channel's stale audio and decoder state
Oct 5, 2026
904cd1a
Say what the buffer clear and the decoder reset are for
Oct 7, 2026
0486984
Clear a reused channel's delay-panning history too
Oct 8, 2026
215038a
Say the intent of the clear and the reset in one breath
Oct 8, 2026
4113e7c
Update src/server.cpp
mcfnord Oct 10, 2026
3da8281
Drop the duplicated vecvecsData2 clear
Oct 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -894,6 +894,11 @@ void CServer::DecodeReceiveData ( const int iChanCnt, const int iNumClients )
else
{
CurOpusDecoder = nullptr;

// no codec yet, so nothing below overwrites these buffers: clear them so that a new client
// does not inherit the audio of this channel's previous client (#3901)
vecvecsData[iChanCnt].Reset ( 0 );
Comment thread
mcfnord marked this conversation as resolved.
vecvecsData2[iChanCnt].Reset ( 0 );
}

// get gains and pannings of all connected channels, compacted to the
Expand Down Expand Up @@ -940,6 +945,13 @@ void CServer::DecodeReceiveData ( const int iChanCnt, const int iNumClients )
{
emit ClientDisconnected ( iCurChanID ); // TODO do this outside the mutex lock?

// reset the decoders so that the next client in this channel does not continue
// the previous client's audio (#3901)
opus_custom_decoder_ctl ( OpusDecoderMono[iCurChanID], OPUS_RESET_STATE );
opus_custom_decoder_ctl ( OpusDecoderStereo[iCurChanID], OPUS_RESET_STATE );
opus_custom_decoder_ctl ( Opus64DecoderMono[iCurChanID], OPUS_RESET_STATE );
opus_custom_decoder_ctl ( Opus64DecoderStereo[iCurChanID], OPUS_RESET_STATE );

FreeChannel ( iCurChanID ); // note that the channel is now not in use

// note that no mutex is needed for this shared resource since it is a
Expand Down
Loading