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: Work on process loopback support.

Browse Source 
This is still not working on my machine. The device will initialize and
run, but the captured data is always silent for some reason. I have
been unable to figure out how to make this work.

This commit allows initialization of the device to complete at the very
least.

Public issue https://github.com/mackron/miniaudio/issues/484
This commit is contained in:
David Reid
2023-04-25 18:29:36 +10:00
parent 5541983ff0
commit 97663b349d
1 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
miniaudio.h
+27 -2
View File
@@ -21998,6 +21998,7 @@ static ma_result ma_device_init_internal__wasapi(ma_context* pContext, ma_device
ma_WASAPIDeviceInterface* pDeviceInterface = NULL; ma_WASAPIDeviceInterface* pDeviceInterface = NULL;
ma_IAudioClient2* pAudioClient2; ma_IAudioClient2* pAudioClient2;
ma_uint32 nativeSampleRate; ma_uint32 nativeSampleRate;
ma_bool32 usingProcessLoopback = MA_FALSE;
MA_ASSERT(pContext != NULL); MA_ASSERT(pContext != NULL);
MA_ASSERT(pData != NULL); MA_ASSERT(pData != NULL);
@@ -22007,6 +22008,8 @@ static ma_result ma_device_init_internal__wasapi(ma_context* pContext, ma_device
return MA_INVALID_ARGS; return MA_INVALID_ARGS;
} }
usingProcessLoopback = deviceType == ma_device_type_loopback && pData->loopbackProcessID != 0 && pDeviceID == NULL;
pData->pAudioClient = NULL; pData->pAudioClient = NULL;
pData->pRenderClient = NULL; pData->pRenderClient = NULL;
pData->pCaptureClient = NULL; pData->pCaptureClient = NULL;
@@ -22093,7 +22096,20 @@ static ma_result ma_device_init_internal__wasapi(ma_context* pContext, ma_device
MA_WAVEFORMATEXTENSIBLE* pNativeFormat = NULL; MA_WAVEFORMATEXTENSIBLE* pNativeFormat = NULL;
hr = ma_IAudioClient_GetMixFormat((ma_IAudioClient*)pData->pAudioClient, (MA_WAVEFORMATEX**)&pNativeFormat); hr = ma_IAudioClient_GetMixFormat((ma_IAudioClient*)pData->pAudioClient, (MA_WAVEFORMATEX**)&pNativeFormat);
if (hr != S_OK) { if (hr != S_OK) {
result = MA_FORMAT_NOT_SUPPORTED; /* When using process-specific loopback, GetMixFormat() seems to always fail. */
if (usingProcessLoopback) {
wf.wFormatTag = WAVE_FORMAT_IEEE_FLOAT;
wf.nChannels = 2;
wf.nSamplesPerSec = 44100;
wf.wBitsPerSample = 32;
wf.nBlockAlign = wf.nChannels * wf.wBitsPerSample / 8;
wf.nAvgBytesPerSec = wf.nSamplesPerSec * wf.nBlockAlign;
wf.cbSize = sizeof(MA_WAVEFORMATEX);
result = MA_SUCCESS;
} else {
result = MA_FORMAT_NOT_SUPPORTED;
}
} else { } else {
/* /*
I've seen cases where cbSize will be set to sizeof(WAVEFORMATEX) even though the structure itself I've seen cases where cbSize will be set to sizeof(WAVEFORMATEX) even though the structure itself
@@ -22344,13 +22360,22 @@ static ma_result ma_device_init_internal__wasapi(ma_context* pContext, ma_device
} }
if (!wasInitializedUsingIAudioClient3) { if (!wasInitializedUsingIAudioClient3) {
ma_uint32 bufferSizeInFrames; ma_uint32 bufferSizeInFrames = 0;
hr = ma_IAudioClient_GetBufferSize((ma_IAudioClient*)pData->pAudioClient, &bufferSizeInFrames); hr = ma_IAudioClient_GetBufferSize((ma_IAudioClient*)pData->pAudioClient, &bufferSizeInFrames);
if (FAILED(hr)) { if (FAILED(hr)) {
errorMsg = "[WASAPI] Failed to get audio client's actual buffer size.", result = ma_result_from_HRESULT(hr); errorMsg = "[WASAPI] Failed to get audio client's actual buffer size.", result = ma_result_from_HRESULT(hr);
goto done; goto done;
} }
/*
When using process loopback mode, retrieval of the buffer size seems to result in totally
incorrect values. In this case we'll just assume it's the same size as what we requested
when we initialized the client.
*/
if (usingProcessLoopback) {
bufferSizeInFrames = (ma_uint32)((periodDurationInMicroseconds * pData->periodsOut) * pData->sampleRateOut / 1000000);
}
pData->periodSizeInFramesOut = bufferSizeInFrames / pData->periodsOut; pData->periodSizeInFramesOut = bufferSizeInFrames / pData->periodsOut;
} }