mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-19 20:32:15 +02:00
Code

win-wasapi: Fall back to old code if RTWQ fails

Browse Source 
Fixes a crash if RTWQ is unavailable, e.g. if the mmcss service is not
running.
This commit is contained in:
Richard Stanway 2022-02-24 23:25:29 +01:00 committed by Matt Gajownik
parent cc1395857a
commit bad7edd051
1 changed files with 44 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
plugins/win-wasapi/win-wasapi.cpp
View File

@ -347,46 +347,54 @@ WASAPISource::WASAPISource(obs_data_t *settings, obs_source_t *source_,
(PFN_RtwqPutWaitingWorkItem)GetProcAddress(
rtwq_module, "RtwqPutWaitingWorkItem");
hr = rtwq_create_async_result(nullptr, &startCapture, nullptr,
&startCaptureAsyncResult);
if (FAILED(hr)) {
enumerator->UnregisterEndpointNotificationCallback(
notify);
throw HRError(
"Could not create startCaptureAsyncResult", hr);
}
try {
hr = rtwq_create_async_result(nullptr, &startCapture,
nullptr,
&startCaptureAsyncResult);
if (FAILED(hr)) {
throw HRError(
"Could not create startCaptureAsyncResult",
hr);
}
hr = rtwq_create_async_result(nullptr, &sampleReady, nullptr,
&sampleReadyAsyncResult);
if (FAILED(hr)) {
enumerator->UnregisterEndpointNotificationCallback(
notify);
throw HRError("Could not create sampleReadyAsyncResult",
hr);
}
hr = rtwq_create_async_result(nullptr, &sampleReady,
nullptr,
&sampleReadyAsyncResult);
if (FAILED(hr)) {
throw HRError(
"Could not create sampleReadyAsyncResult",
hr);
}
hr = rtwq_create_async_result(nullptr, &restart, nullptr,
&restartAsyncResult);
if (FAILED(hr)) {
enumerator->UnregisterEndpointNotificationCallback(
notify);
throw HRError("Could not create restartAsyncResult",
hr);
}
hr = rtwq_create_async_result(nullptr, &restart,
nullptr,
&restartAsyncResult);
if (FAILED(hr)) {
throw HRError(
"Could not create restartAsyncResult",
hr);
}
DWORD taskId = 0;
DWORD id = 0;
hr = rtwq_lock_shared_work_queue(L"Capture", 0, &taskId, &id);
if (FAILED(hr)) {
enumerator->UnregisterEndpointNotificationCallback(
notify);
throw HRError("RtwqLockSharedWorkQueue failed", hr);
}
DWORD taskId = 0;
DWORD id = 0;
hr = rtwq_lock_shared_work_queue(L"Capture", 0, &taskId,
&id);
if (FAILED(hr)) {
throw HRError("RtwqLockSharedWorkQueue failed",
hr);
}
startCapture.SetQueueId(id);
sampleReady.SetQueueId(id);
restart.SetQueueId(id);
} else {
startCapture.SetQueueId(id);
sampleReady.SetQueueId(id);
restart.SetQueueId(id);
} catch (HRError &err) {
blog(LOG_ERROR, "RTWQ setup failed: %s (0x%08X)",
err.str, err.hr);
rtwq_supported = false;
}
}
if (!rtwq_supported) {
captureThread = CreateThread(nullptr, 0,
WASAPISource::CaptureThread, this,
0, nullptr);