mirror/miniaudio
1
0
Fork 0
mirror of https://github.com/mackron/miniaudio.git synced 2026-04-22 00:06:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

WASAPI: Handle AUDCLNT_E_DEVICE_INVALIDATED.

Browse Source 
When this is detected the device will be reinitialized. If this fails
the device will be put into an errored state and will become unusable.
This commit is contained in:
David Reid
2026-01-07 10:23:39 +10:00
parent 882d7329f9
commit 4bd8eb0aa0
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
miniaudio.h
+22
View File
@@ -24858,6 +24858,17 @@ static ma_result ma_device_step__wasapi(ma_device* pDevice, ma_blocking_mode blo
} else { } else {
if (hr == MA_AUDCLNT_S_BUFFER_EMPTY || hr == MA_AUDCLNT_E_BUFFER_ERROR) { if (hr == MA_AUDCLNT_S_BUFFER_EMPTY || hr == MA_AUDCLNT_E_BUFFER_ERROR) {
/* No data available. */ /* No data available. */
} else if (hr == MA_AUDCLNT_E_DEVICE_INVALIDATED) {
ma_log_postf(ma_device_get_log(pDevice), MA_LOG_LEVEL_WARNING, "[WASAPI] Capture device invalidated. Attempting reinitialization.");
result = ma_device_reroute__wasapi(pDevice, ma_device_type_capture);
if (result != MA_SUCCESS) {
ma_log_postf(ma_device_get_log(pDevice), MA_LOG_LEVEL_ERROR, "[WASAPI] Capture device invalidated and reinitialization failed. Stopping device.");
ma_device_set_errored(pDevice);
return result;
}
ma_device_start__wasapi(pDevice);
} else { } else {
/* An error occurred and we need to abort. */ /* An error occurred and we need to abort. */
ma_log_postf(ma_device_get_log(pDevice), MA_LOG_LEVEL_ERROR, "[WASAPI] Failed to retrieve internal buffer from capture device in preparation for reading from the device. HRESULT = %d. Stopping device.", (int)hr); ma_log_postf(ma_device_get_log(pDevice), MA_LOG_LEVEL_ERROR, "[WASAPI] Failed to retrieve internal buffer from capture device in preparation for reading from the device. HRESULT = %d. Stopping device.", (int)hr);
@@ -24886,6 +24897,17 @@ static ma_result ma_device_step__wasapi(ma_device* pDevice, ma_blocking_mode blo
} else { } else {
if (hr == MA_AUDCLNT_E_BUFFER_TOO_LARGE || hr == MA_AUDCLNT_E_BUFFER_ERROR) { if (hr == MA_AUDCLNT_E_BUFFER_TOO_LARGE || hr == MA_AUDCLNT_E_BUFFER_ERROR) {
/* Not enough data available. Nothing to do. */ /* Not enough data available. Nothing to do. */
} else if (hr == MA_AUDCLNT_E_DEVICE_INVALIDATED) {
ma_log_postf(ma_device_get_log(pDevice), MA_LOG_LEVEL_WARNING, "[WASAPI] Playback device invalidated. Attempting reinitialization.");
result = ma_device_reroute__wasapi(pDevice, ma_device_type_playback);
if (result != MA_SUCCESS) {
ma_log_postf(ma_device_get_log(pDevice), MA_LOG_LEVEL_ERROR, "[WASAPI] Playback device invalidated and reinitialization failed. Stopping device.");
ma_device_set_errored(pDevice);
return result;
}
ma_device_start__wasapi(pDevice);
} else { } else {
/* Some error occurred. We'll need to abort. */ /* Some error occurred. We'll need to abort. */
ma_log_postf(ma_device_get_log(pDevice), MA_LOG_LEVEL_ERROR, "[WASAPI] Failed to retrieve internal buffer from playback device in preparation for writing to the device. HRESULT = %d. Stopping device.", (int)hr); ma_log_postf(ma_device_get_log(pDevice), MA_LOG_LEVEL_ERROR, "[WASAPI] Failed to retrieve internal buffer from playback device in preparation for writing to the device. HRESULT = %d. Stopping device.", (int)hr);