From acd86ce490b7d920c5f8bbeb4358c4209842f9a3 Mon Sep 17 00:00:00 2001
From: Alibek Omarov <a1ba.omarov@gmail.com>
Date: Fri, 13 Jan 2023 08:50:33 +0300
Subject: [PATCH] engine: sound: select which to buffer raw channels will be
 painted to, choose stream buffer for voice

---
 engine/client/s_mix.c | 51 +++++++++----------------------------------
 1 file changed, 10 insertions(+), 41 deletions(-)

diff --git a/engine/client/s_mix.c b/engine/client/s_mix.c
index 721f05fa..8d5e0ba7 100644
--- a/engine/client/s_mix.c
+++ b/engine/client/s_mix.c
@@ -897,43 +897,13 @@ void S_MixUpsample( int sampleCount, int filtertype )
 	ppaint->ifilter++;
 }
 
-void MIX_MixStreamBuffer( int end )
-{
-	portable_samplepair_t	*pbuf;
-	rawchan_t			*ch;
-
-	pbuf = MIX_GetPFrontFromIPaint( ISTREAMBUFFER );
-	ch = S_FindRawChannel( S_RAW_SOUND_BACKGROUNDTRACK, false );
-
-	// clear the paint buffer
-	if( s_listener.paused || !ch || ch->s_rawend < paintedtime )
-	{
-		memset( pbuf, 0, (end - paintedtime) * sizeof( portable_samplepair_t ));
-	}
-	else
-	{
-		int	i, stop;
-
-		// copy from the streaming sound source
-		stop = (end < ch->s_rawend) ? end : ch->s_rawend;
-
-		for( i = paintedtime; i < stop; i++ )
-		{
-			pbuf[i-paintedtime].left = ( ch->rawsamples[i & ( ch->max_samples - 1 )].left * ch->leftvol ) >> 8;
-			pbuf[i-paintedtime].right = ( ch->rawsamples[i & ( ch->max_samples - 1 )].right * ch->rightvol ) >> 8;
-		}
-
-		for( ; i < end; i++ )
-			pbuf[i-paintedtime].left = pbuf[i-paintedtime].right = 0;
-	}
-}
-
 void MIX_MixRawSamplesBuffer( int end )
 {
-	portable_samplepair_t	*pbuf;
+	portable_samplepair_t	*pbuf, *roombuf, *streambuf;
 	uint			i, j, stop;
 
-	pbuf = MIX_GetCurrentPaintbufferPtr()->pbuf;
+	roombuf = MIX_GetPFrontFromIPaint( IROOMBUFFER );
+	streambuf = MIX_GetPFrontFromIPaint( ISTREAMBUFFER );
 
 	if( s_listener.paused ) return;
 
@@ -941,16 +911,19 @@ void MIX_MixRawSamplesBuffer( int end )
 	for( i = 0; i < MAX_RAW_CHANNELS; i++ )
 	{
 		// copy from the streaming sound source
-		rawchan_t	*ch = raw_channels[i];
+		rawchan_t *ch = raw_channels[i];
+		qboolean stream;
 
-		// background track should be mixing into another buffer
-		if( !ch || ch->entnum == S_RAW_SOUND_BACKGROUNDTRACK )
+		if( !ch )
 			continue;
 
 		// not audible
 		if( !ch->leftvol && !ch->rightvol )
 			continue;
 
+		stream = ch->entnum == S_RAW_SOUND_BACKGROUNDTRACK || CL_IsPlayerIndex( ch->entnum );
+		pbuf = stream ? streambuf : roombuf;
+
 		stop = (end < ch->s_rawend) ? end : ch->s_rawend;
 
 		for( j = paintedtime; j < stop; j++ )
@@ -959,7 +932,7 @@ void MIX_MixRawSamplesBuffer( int end )
 			pbuf[j-paintedtime].right += ( ch->rawsamples[j & ( ch->max_samples - 1 )].right * ch->rightvol ) >> 8;
 		}
 
-		if ( ch->entnum > 0 )
+		if( ch->entnum > 0 )
 			SND_MoveMouthRaw( ch, &ch->rawsamples[paintedtime & ( ch->max_samples - 1 )], stop - paintedtime );
 	}
 }
@@ -970,9 +943,6 @@ void MIX_MixRawSamplesBuffer( int end )
 // caller also remixes all into final IPAINTBUFFER output.
 void MIX_UpsampleAllPaintbuffers( int end, int count )
 {
-	// process stream buffer
-	MIX_MixStreamBuffer( end );
-
 	// 11khz sounds are mixed into 3 buffers based on distance from listener, and facing direction
 	// These buffers are facing, facingaway, room
 	// These 3 mixed buffers are then each upsampled to 22khz.
@@ -1014,7 +984,6 @@ void MIX_UpsampleAllPaintbuffers( int end, int count )
 #endif
 
 	// mix raw samples from the video streams
-	MIX_SetCurrentPaintbuffer( IROOMBUFFER );
 	MIX_MixRawSamplesBuffer( end );
 
 	MIX_DeactivateAllPaintbuffers();