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

WASAPI: Improvement to buffer size negotiation for exclusive mode.

Browse Source
This commit is contained in:
David Reid
2026-01-11 20:02:47 +10:00
parent de3946c9ec
commit 8709bef653
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
miniaudio.h
+21 -3
View File
@@ -23779,7 +23779,24 @@ static ma_result ma_device_init_internal__wasapi(ma_context* pContext, ma_device
/* Slightly different initialization for shared and exclusive modes. We try exclusive mode first, and if it fails, fall back to shared mode. */ /* Slightly different initialization for shared and exclusive modes. We try exclusive mode first, and if it fails, fall back to shared mode. */
if (shareMode == MA_AUDCLNT_SHAREMODE_EXCLUSIVE) { if (shareMode == MA_AUDCLNT_SHAREMODE_EXCLUSIVE) {
MA_REFERENCE_TIME bufferDuration = periodDurationInMicroseconds * pData->periodsOut * 10; MA_REFERENCE_TIME bufferDuration = bufferDuration = periodDurationInMicroseconds * 10;
MA_REFERENCE_TIME minPeriod = 0;
/* There is no notion of a period in Exclusive mode. Set this to 1. */
pData->periodsOut = 1;
/*
Grab the minimum period and start with that. If this fails we'll keep trying by incrementing the
buffer duration by the period size.
*/
hr = ma_IAudioClient_GetDevicePeriod(pData->pAudioClient, NULL, &minPeriod);
if (FAILED(hr)) {
minPeriod = 0;
}
if (bufferDuration < minPeriod) {
bufferDuration = minPeriod;
}
/* /*
If the periodicity is too small, Initialize() will fail with AUDCLNT_E_INVALID_DEVICE_PERIOD. In this case we should just keep increasing If the periodicity is too small, Initialize() will fail with AUDCLNT_E_INVALID_DEVICE_PERIOD. In this case we should just keep increasing
@@ -23787,7 +23804,7 @@ static ma_result ma_device_init_internal__wasapi(ma_context* pContext, ma_device
*/ */
hr = E_FAIL; hr = E_FAIL;
for (;;) { for (;;) {
hr = ma_IAudioClient_Initialize((ma_IAudioClient*)pData->pAudioClient, shareMode, streamFlags, bufferDuration, bufferDuration, (MA_WAVEFORMATEX*)&wf, NULL); hr = ma_IAudioClient_Initialize(pData->pAudioClient, shareMode, streamFlags, bufferDuration, bufferDuration, (MA_WAVEFORMATEX*)&wf, NULL);
if (hr == MA_AUDCLNT_E_INVALID_DEVICE_PERIOD) { if (hr == MA_AUDCLNT_E_INVALID_DEVICE_PERIOD) {
if (bufferDuration > 500*10000) { if (bufferDuration > 500*10000) {
break; break;
@@ -23796,7 +23813,8 @@ static ma_result ma_device_init_internal__wasapi(ma_context* pContext, ma_device
break; break;
} }
bufferDuration = bufferDuration * 2; /* Increment by our period size. */
bufferDuration += (periodDurationInMicroseconds * 10);
continue; continue;
} }
} else { } else {