Skip to content

wasapi: Trigger reconfig on render thread if device invalidated. #844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kinetiknz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

wasapi: Trigger reconfig on render thread if device invalidated. #844

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 9 additions & 20 deletions src/cubeb_wasapi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3111,27 +3111,16 @@ stream_start_one_side(cubeb_stream * stm, StreamDirection dir)
HRESULT hr =
dir == OUTPUT ? stm->output_client->Start() : stm->input_client->Start();
if (hr == AUDCLNT_E_DEVICE_INVALIDATED) {
LOG("audioclient invalidated for %s device, reconfiguring",
// The render thread runs for the entire stream lifetime and may be
// dereferencing stm->{output,render,input,capture}_client in its refill
// path without holding stream_reset_lock. Recovering inline here would
// null those pointers while the render thread is using them, causing
// crashes in get_output_buffer et al. Defer the reconfigure to the
// render thread's own reconfigure path, which is self-synchronising.
LOG("audioclient invalidated for %s device on start, triggering async "
"reconfigure",
dir == OUTPUT ? "output" : "input");

BOOL ok = ResetEvent(stm->reconfigure_event);
if (!ok) {
LOG("resetting reconfig event failed for %s stream: %lx",
dir == OUTPUT ? "output" : "input", GetLastError());
}

close_wasapi_stream(stm);
int r = setup_wasapi_stream(stm);
if (r != CUBEB_OK) {
LOG("reconfigure failed");
return r;
}

HRESULT hr2 = dir == OUTPUT ? stm->output_client->Start()
: stm->input_client->Start();
if (FAILED(hr2)) {
LOG("could not start the %s stream after reconfig: %lx",
dir == OUTPUT ? "output" : "input", hr);
if (!trigger_async_reconfigure(stm)) {
return CUBEB_ERROR;
}
} else if (FAILED(hr)) {
Expand Down
Loading