me/portaudio
Watch
1
0
Fork
You've already forked portaudio
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

wasapi: workaround to avoid PaWasapi_Initialize() failure when enumerating devices and device fails to report min/default periods with IAudioClient::GetDevicePeriod(): ignore error and assign WASAPI common known period values for min/default

Browse source
This commit is contained in:
dmitrykos 2015-10-20 16:02:39 +00:00
commit 58eca02986
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/hostapi/wasapi/pa_win_wasapi.c
View file

@ -1283,6 +1283,11 @@ PaError PaWasapi_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiInd
IF_FAILED_INTERNAL_ERROR_JUMP(hr, result, error); IF_FAILED_INTERNAL_ERROR_JUMP(hr, result, error);
paWasapi->devInfo = (PaWasapiDeviceInfo *)PaUtil_AllocateMemory(sizeof(PaWasapiDeviceInfo) * paWasapi->deviceCount); paWasapi->devInfo = (PaWasapiDeviceInfo *)PaUtil_AllocateMemory(sizeof(PaWasapiDeviceInfo) * paWasapi->deviceCount);
if (paWasapi->devInfo == NULL)
{
result = paInsufficientMemory;
goto error;
}
for (i = 0; i < paWasapi->deviceCount; ++i) for (i = 0; i < paWasapi->deviceCount; ++i)
memset(&paWasapi->devInfo[i], 0, sizeof(PaWasapiDeviceInfo)); memset(&paWasapi->devInfo[i], 0, sizeof(PaWasapiDeviceInfo));
@ -1446,9 +1451,14 @@ PaError PaWasapi_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiInd
hr = IAudioClient_GetDevicePeriod(tmpClient, hr = IAudioClient_GetDevicePeriod(tmpClient,
&paWasapi->devInfo[i].DefaultDevicePeriod, &paWasapi->devInfo[i].DefaultDevicePeriod,
&paWasapi->devInfo[i].MinimumDevicePeriod); &paWasapi->devInfo[i].MinimumDevicePeriod);
// We need to set the result to a value otherwise we will return paNoError if (FAILED(hr))
// [IF_FAILED_JUMP(hResult, error);] {
IF_FAILED_INTERNAL_ERROR_JUMP(hr, result, error); PA_DEBUG(("WASAPI:%d| failed getting min/default periods by IAudioClient::GetDevicePeriod() with error[%d], will use 30000/100000 hns\n", i));
// assign WASAPI common values
paWasapi->devInfo[i].DefaultDevicePeriod = 100000;
paWasapi->devInfo[i].MinimumDevicePeriod = 30000;
}
//hr = tmpClient->GetMixFormat(&paWasapi->devInfo[i].MixFormat); //hr = tmpClient->GetMixFormat(&paWasapi->devInfo[i].MixFormat);
@ -1492,7 +1502,7 @@ PaError PaWasapi_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiInd
// We need to set the result to a value otherwise we will return paNoError // We need to set the result to a value otherwise we will return paNoError
result = paInternalError; result = paInternalError;
//continue; // do not skip from list, allow to initialize //continue; // do not skip from list, allow to initialize
break; break;
} }
(*hostApi)->deviceInfos[i] = deviceInfo; (*hostApi)->deviceInfos[i] = deviceInfo;