RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-26 18:32:08 +00:00
Code Issues Releases Wiki Activity

ao/wasapi: add retry loop on AUDCLNT_E_DEVICE_IN_USE

Browse Source 
this works around reinitializing too fast on device property changes
This commit is contained in:
Kevin Mitchell 2014-11-14 05:59:22 -08:00
parent 6c512892d4
commit 9371990bd1
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
audio/out/ao_wasapi_utils.c
View File

@ -30,6 +30,7 @@
#include "audio/format.h" #include "audio/format.h"
#include "osdep/io.h" #include "osdep/io.h"
#include "osdep/timer.h"
#define MIXER_DEFAULT_LABEL L"mpv - video player" #define MIXER_DEFAULT_LABEL L"mpv - video player"
@ -943,6 +944,8 @@ HRESULT wasapi_thread_init(struct ao *ao)
struct wasapi_state *state = (struct wasapi_state *)ao->priv; struct wasapi_state *state = (struct wasapi_state *)ao->priv;
HRESULT hr; HRESULT hr;
MP_DBG(ao, "Init wasapi thread\n"); MP_DBG(ao, "Init wasapi thread\n");
int64_t retry_wait = 1;
retry:
state->initial_volume = -1.0; state->initial_volume = -1.0;
hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL, hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL,
@ -990,6 +993,15 @@ HRESULT wasapi_thread_init(struct ao *ao)
MP_DBG(ao, "Fixing format\n"); MP_DBG(ao, "Fixing format\n");
hr = fix_format(state); hr = fix_format(state);
if ( (hr == AUDCLNT_E_DEVICE_IN_USE ||
hr == AUDCLNT_E_DEVICE_INVALIDATED) &&
retry_wait <= 8 ) {
wasapi_thread_uninit(ao);
MP_WARN(ao, "Retrying in %ld us\n", retry_wait);
mp_sleep_us(retry_wait);
retry_wait *= 2;
goto retry;
}
EXIT_ON_ERROR(hr); EXIT_ON_ERROR(hr);
MP_DBG(ao, "Creating proxies\n"); MP_DBG(ao, "Creating proxies\n");