RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

ao_wasapi: move device selection to main thread 

In attempt to simplify the audio event thread, this can now be moved out.
This commit is contained in:
Kevin Mitchell 2016-01-04 17:43:22 -08:00
parent fb84c6974d
commit d22d24a6d5
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
audio/out/ao_wasapi.c
View File

@ -273,7 +273,7 @@ static void uninit(struct ao *ao)
SAFE_RELEASE(state->hInitDone, CloseHandle(state->hInitDone));
SAFE_RELEASE(state->hWake, CloseHandle(state->hWake));
SAFE_RELEASE(state->hAudioThread,CloseHandle(state->hAudioThread));
talloc_free(state->deviceID);
CoUninitialize();
MP_DBG(ao, "Uninit wasapi done\n");
}
@ -286,6 +286,11 @@ static int init(struct ao *ao)
struct wasapi_state *state = ao->priv;
state->log = ao->log;
if (!find_device(ao)) {
uninit(ao);
return -1;
}
state->hInitDone = CreateEventW(NULL, FALSE, FALSE, NULL);
state->hWake = CreateEventW(NULL, FALSE, FALSE, NULL);
if (!state->hInitDone || !state->hWake) {

10
audio/out/ao_wasapi_utils.c
View File

@ -933,7 +933,7 @@ exit_label:
return hr;
}
static HRESULT find_device(struct ao *ao)
bool find_device(struct ao *ao)
{
struct wasapi_state *state = ao->priv;
bstr device = bstr_strip(bstr0(state->opt_device));
@ -996,7 +996,7 @@ static HRESULT find_device(struct ao *ao)
exit_label:
talloc_free(d);
destroy_enumerator(enumerator);
return state->deviceID ? S_OK : E_FAIL;
return !!state->deviceID;
}
static void *unmarshal(struct wasapi_state *state, REFIID type, IStream **from)
@ -1092,10 +1092,7 @@ HRESULT wasapi_thread_init(struct ao *ao)
MP_DBG(ao, "Init wasapi thread\n");
int64_t retry_wait = 1;
retry: ;
HRESULT hr = find_device(ao);
EXIT_ON_ERROR(hr);
hr = load_device(ao->log, &state->pDevice, state->deviceID);
HRESULT hr = load_device(ao->log, &state->pDevice, state->deviceID);
EXIT_ON_ERROR(hr);
MP_DBG(ao, "Activating pAudioClient interface\n");
@ -1154,7 +1151,6 @@ void wasapi_thread_uninit(struct ao *ao)
SAFE_RELEASE(state->pSessionControl, IAudioSessionControl_Release(state->pSessionControl));
SAFE_RELEASE(state->pAudioClient, IAudioClient_Release(state->pAudioClient));
SAFE_RELEASE(state->pDevice, IMMDevice_Release(state->pDevice));
SAFE_RELEASE(state->deviceID, talloc_free(state->deviceID));
SAFE_RELEASE(state->hTask, AvRevertMmThreadCharacteristics(state->hTask));
MP_DBG(ao, "Thread uninit done\n");
}

1
audio/out/ao_wasapi_utils.h
View File

@ -38,6 +38,7 @@ char *mp_HRESULT_to_str_buf(char *buf, size_t buf_size, HRESULT hr);
bool wasapi_fill_VistaBlob(wasapi_state *state);
void wasapi_list_devs(struct ao *ao, struct ao_device_list *list);
bool find_device(struct ao *ao);
void wasapi_dispatch(struct ao *ao);
HRESULT wasapi_thread_init(struct ao *ao);