1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
commit 90f8315432c85b3efdde3a808c3fd890fe4a0064
Author: Andrew Opalach <andrew@akon.city>
Date: Mon Feb 3 13:58:49 2025 -0500
WASAPI: Release mapped buffer before stopping device
diff --git a/miniaudio.h b/miniaudio.h
index 22b0e4f..2d94253 100644
--- a/miniaudio.h
+++ b/miniaudio.h
@@ -23102,6 +23102,14 @@ static ma_result ma_device_stop__wasapi_nolock(ma_device* pDevice)
}
if (pDevice->type == ma_device_type_capture || pDevice->type == ma_device_type_duplex || pDevice->type == ma_device_type_loopback) {
+ /* If we have a mapped buffer we need to release it. */
+ if (pDevice->wasapi.pMappedBufferCapture != NULL) {
+ ma_IAudioCaptureClient_ReleaseBuffer((ma_IAudioCaptureClient*)pDevice->wasapi.pCaptureClient, pDevice->wasapi.mappedBufferCaptureCap);
+ pDevice->wasapi.pMappedBufferCapture = NULL;
+ pDevice->wasapi.mappedBufferCaptureCap = 0;
+ pDevice->wasapi.mappedBufferCaptureLen = 0;
+ }
+
hr = ma_IAudioClient_Stop((ma_IAudioClient*)pDevice->wasapi.pAudioClientCapture);
if (FAILED(hr)) {
ma_log_post(ma_device_get_log(pDevice), MA_LOG_LEVEL_ERROR, "[WASAPI] Failed to stop internal capture device.");
@@ -23115,18 +23123,22 @@ static ma_result ma_device_stop__wasapi_nolock(ma_device* pDevice)
return ma_result_from_HRESULT(hr);
}
- /* If we have a mapped buffer we need to release it. */
- if (pDevice->wasapi.pMappedBufferCapture != NULL) {
- ma_IAudioCaptureClient_ReleaseBuffer((ma_IAudioCaptureClient*)pDevice->wasapi.pCaptureClient, pDevice->wasapi.mappedBufferCaptureCap);
- pDevice->wasapi.pMappedBufferCapture = NULL;
- pDevice->wasapi.mappedBufferCaptureCap = 0;
- pDevice->wasapi.mappedBufferCaptureLen = 0;
- }
-
ma_atomic_bool32_set(&pDevice->wasapi.isStartedCapture, MA_FALSE);
}
if (pDevice->type == ma_device_type_playback || pDevice->type == ma_device_type_duplex) {
+ if (pDevice->wasapi.pMappedBufferPlayback != NULL) {
+ ma_silence_pcm_frames(
+ ma_offset_pcm_frames_ptr(pDevice->wasapi.pMappedBufferPlayback, pDevice->wasapi.mappedBufferPlaybackLen, pDevice->playback.internalFormat, pDevice->playback.internalChannels),
+ pDevice->wasapi.mappedBufferPlaybackCap - pDevice->wasapi.mappedBufferPlaybackLen,
+ pDevice->playback.internalFormat, pDevice->playback.internalChannels
+ );
+ ma_IAudioRenderClient_ReleaseBuffer((ma_IAudioRenderClient*)pDevice->wasapi.pRenderClient, pDevice->wasapi.mappedBufferPlaybackCap, 0);
+ pDevice->wasapi.pMappedBufferPlayback = NULL;
+ pDevice->wasapi.mappedBufferPlaybackCap = 0;
+ pDevice->wasapi.mappedBufferPlaybackLen = 0;
+ }
+
/*
The buffer needs to be drained before stopping the device. Not doing this will result in the last few frames not getting output to
the speakers. This is a problem for very short sounds because it'll result in a significant portion of it not getting played.
@@ -23178,13 +23190,6 @@ static ma_result ma_device_stop__wasapi_nolock(ma_device* pDevice)
return ma_result_from_HRESULT(hr);
}
- if (pDevice->wasapi.pMappedBufferPlayback != NULL) {
- ma_IAudioRenderClient_ReleaseBuffer((ma_IAudioRenderClient*)pDevice->wasapi.pRenderClient, pDevice->wasapi.mappedBufferPlaybackCap, 0);
- pDevice->wasapi.pMappedBufferPlayback = NULL;
- pDevice->wasapi.mappedBufferPlaybackCap = 0;
- pDevice->wasapi.mappedBufferPlaybackLen = 0;
- }
-
ma_atomic_bool32_set(&pDevice->wasapi.isStartedPlayback, MA_FALSE);
}
|