dsound: Skip resampling/mixing inaudible buffers.

In some situations, "ZUSI 3" has a lot of secondary buffers in the PLAYING state, but most of these buffers have a really low volume, so these buffers are multiplied by 0 before mixing (and possibly after resampling). There can be hundreds of inaudible buffers at the same time. In these situations, the dsound mixthread is unable to mix fast enough, resulting in sound stuttering and generally poor performance. To resolve this performance issue, skip the mixing (and possibly resampling) step for all inaudible secondary buffers. Signed-off-by: Florian Will <florian.will@gmail.com> Signed-off-by: Andrew Eikum <aeikum@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dsound: Skip resampling/mixing inaudible buffers.
835dfaab · Florian Will · Alexandre Julliard · 17a0f2c5 · 835dfaab · 835dfaab
Commit 835dfaab authored Dec 06, 2021 by Florian Will Committed by Alexandre Julliard Dec 06, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 25 additions and 5 deletions

buffer.c dlls/dsound/buffer.c +11 -0

dsound_private.h dlls/dsound/dsound_private.h +1 -0

mixer.c dlls/dsound/mixer.c +13 -5

No files found.
--- a/dlls/dsound/buffer.c
+++ b/dlls/dsound/buffer.c
@@ -1197,6 +1197,17 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This)
    TRACE("(%p) released\n", This);
 }

+BOOL secondarybuffer_is_audible(IDirectSoundBufferImpl *This)
+{
+    UINT i;
+    for (i = 0; i < This->device->pwfx->nChannels; i++) {
+        if (This->volpan.dwTotalAmpFactor[i] != 0)
+            return TRUE;
+    }
+
+   return FALSE;
+}
+
 HRESULT IDirectSoundBufferImpl_Duplicate(
    DirectSoundDevice *device,
    IDirectSoundBufferImpl **ppdsb,

--- a/dlls/dsound/dsound_private.h
+++ b/dlls/dsound/dsound_private.h
@@ -193,6 +193,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate(
    IDirectSoundBufferImpl **ppdsb,
    IDirectSoundBufferImpl *pdsb) DECLSPEC_HIDDEN;
 void secondarybuffer_destroy(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN;
+BOOL secondarybuffer_is_audible(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN;
 extern const IDirectSound3DListenerVtbl ds3dlvt DECLSPEC_HIDDEN;
 extern const IDirectSound3DBufferVtbl ds3dbvt DECLSPEC_HIDDEN;
 extern const IKsPropertySetVtbl iksbvt DECLSPEC_HIDDEN;

--- a/dlls/dsound/mixer.c
+++ b/dlls/dsound/mixer.c
@@ -290,6 +290,9 @@ static UINT cp_fields_noresample(IDirectSoundBufferImpl *dsb, UINT count)
    UINT committed_samples = 0;
    DWORD channel, i;

+    if (!secondarybuffer_is_audible(dsb))
+        return count;
+
    if(dsb->use_committed) {
        committed_samples = (dsb->writelead - dsb->committed_mixpos) / istride;
        committed_samples = committed_samples <= count ? committed_samples : count;
@@ -329,6 +332,11 @@ static UINT cp_fields_resample(IDirectSoundBufferImpl *dsb, UINT count, LONG64 *
    len += fir_cachesize;
    len *= sizeof(float);

+    *freqAccNum = freqAcc_end % dsb->freqAdjustDen;
+
+    if (!secondarybuffer_is_audible(dsb))
+        return max_ipos;
+
    if (!dsb->device->cp_buffer) {
        dsb->device->cp_buffer = HeapAlloc(GetProcessHeap(), 0, len);
        dsb->device->cp_buffer_len = len;
@@ -386,8 +394,6 @@ static UINT cp_fields_resample(IDirectSoundBufferImpl *dsb, UINT count, LONG64 *
        }
    }

-    *freqAccNum = freqAcc_end % dsb->freqAdjustDen;
-
    return max_ipos;
 }

@@ -535,10 +541,12 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, float *mix_buffer, 
 	DSOUND_MixToTemporary(dsb, frames);
 	ibuf = dsb->device->tmp_buffer;

-	/* Apply volume if needed */
-	DSOUND_MixerVol(dsb, frames);
+	if (secondarybuffer_is_audible(dsb)) {
+		/* Apply volume if needed */
+		DSOUND_MixerVol(dsb, frames);

-	mixieee32(ibuf, mix_buffer, frames * dsb->device->pwfx->nChannels);
+		mixieee32(ibuf, mix_buffer, frames * dsb->device->pwfx->nChannels);
+	}

 	/* check for notification positions */
 	if (dsb->dsbd.dwFlags & DSBCAPS_CTRLPOSITIONNOTIFY &&