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

ao/wasapi: request reset on appropriate events 

on changes to PKEY_AudioEngine_DeviceFormat, device status, and default device.
call ao_reload directly in the change_notify "methods".

this requires keeping a device enumerator around for the duration of
execution, rather than just for initially querying devices
This commit is contained in:
Kevin Mitchell 2014-11-13 01:09:47 -08:00
parent e647f202ed
commit 6c512892d4
4 changed files with 116 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
audio/out/ao_wasapi.c
View File

@ -36,11 +36,6 @@
#include "osdep/timer.h" #include "osdep/timer.h"
#include "osdep/io.h" #include "osdep/io.h"
#define EXIT_ON_ERROR(hres) \
do { if (FAILED(hres)) { goto exit_label; } } while(0)
#define SAFE_RELEASE(unk, release) \
do { if ((unk) != NULL) { release; (unk) = NULL; } } while(0)
static double get_device_delay(struct wasapi_state *state) { static double get_device_delay(struct wasapi_state *state) {
UINT64 sample_count = atomic_load(&state->sample_count); UINT64 sample_count = atomic_load(&state->sample_count);
UINT64 position, qpc_position; UINT64 position, qpc_position;

16
audio/out/ao_wasapi.h
View File

@ -31,12 +31,18 @@
#include "osdep/atomics.h" #include "osdep/atomics.h"
typedef struct change_notify { typedef struct change_notify {
IMMNotificationClient client; IMMNotificationClient client; /* this must be first in the structure! */
LPWSTR monitored; /* Monitored device */ LPWSTR monitored; /* Monitored device */
struct ao *ao;
} change_notify; } change_notify;
HRESULT wasapi_change_init(struct change_notify *change, IMMDevice *monitor); HRESULT wasapi_change_init(struct ao* ao);
void wasapi_change_free(struct change_notify *change); void wasapi_change_uninit(struct ao* ao);
#define EXIT_ON_ERROR(hres) \
do { if (FAILED(hres)) { goto exit_label; } } while(0)
#define SAFE_RELEASE(unk, release) \
do { if ((unk) != NULL) { release; (unk) = NULL; } } while(0)
typedef struct wasapi_state { typedef struct wasapi_state {
struct mp_log *log; struct mp_log *log;
@ -70,6 +76,8 @@ typedef struct wasapi_state {
ISimpleAudioVolume *pAudioVolume; ISimpleAudioVolume *pAudioVolume;
IAudioEndpointVolume *pEndpointVolume; IAudioEndpointVolume *pEndpointVolume;
IAudioSessionControl *pSessionControl; IAudioSessionControl *pSessionControl;
IMMDeviceEnumerator *pEnumerator;
HANDLE hFeed; /* wasapi event */ HANDLE hFeed; /* wasapi event */
HANDLE hForceFeed; /* forces writing a buffer (e.g. before audio_resume) */ HANDLE hForceFeed; /* forces writing a buffer (e.g. before audio_resume) */
HANDLE hFeedDone; /* set only after a hForceFeed */ HANDLE hFeedDone; /* set only after a hForceFeed */
@ -108,6 +116,8 @@ typedef struct wasapi_state {
HANDLE (WINAPI *pAvSetMmThreadCharacteristicsW)(LPCWSTR, LPDWORD); HANDLE (WINAPI *pAvSetMmThreadCharacteristicsW)(LPCWSTR, LPDWORD);
WINBOOL (WINAPI *pAvRevertMmThreadCharacteristics)(HANDLE); WINBOOL (WINAPI *pAvRevertMmThreadCharacteristics)(HANDLE);
} VistaBlob; } VistaBlob;
change_notify change;
} wasapi_state; } wasapi_state;
#endif #endif

100
audio/out/ao_wasapi_changenotify.c
View File

@ -125,13 +125,16 @@ static HRESULT STDMETHODCALLTYPE sIMMNotificationClient_OnDeviceStateChanged(
DWORD dwNewState) DWORD dwNewState)
{ {
change_notify *change = (change_notify *)This; change_notify *change = (change_notify *)This;
struct ao *ao = change->ao;
if (!wcscmp(change->monitored, pwstrDeviceId)){ if (pwstrDeviceId && !wcscmp(change->monitored, pwstrDeviceId)){
switch (dwNewState) { switch (dwNewState) {
case DEVICE_STATE_DISABLED: case DEVICE_STATE_DISABLED:
case DEVICE_STATE_NOTPRESENT: case DEVICE_STATE_NOTPRESENT:
case DEVICE_STATE_UNPLUGGED: case DEVICE_STATE_UNPLUGGED:
MP_VERBOSE(ao,
"OnDeviceStateChange triggered - requesting ao reload\n");
ao_request_reload(ao);
case DEVICE_STATE_ACTIVE: case DEVICE_STATE_ACTIVE:
default: default:
return S_OK; return S_OK;
@ -145,7 +148,11 @@ static HRESULT STDMETHODCALLTYPE sIMMNotificationClient_OnDeviceAdded(
LPCWSTR pwstrDeviceId) LPCWSTR pwstrDeviceId)
{ {
change_notify *change = (change_notify *)This; change_notify *change = (change_notify *)This;
struct ao *ao = change->ao;
MP_VERBOSE(ao, "OnDeviceAdded triggered\n");
if(pwstrDeviceId)
MP_VERBOSE(ao, "New device %S\n",pwstrDeviceId);
return S_OK; return S_OK;
} }
@ -155,9 +162,11 @@ static HRESULT STDMETHODCALLTYPE sIMMNotificationClient_OnDeviceRemoved(
LPCWSTR pwstrDeviceId) LPCWSTR pwstrDeviceId)
{ {
change_notify *change = (change_notify *)This; change_notify *change = (change_notify *)This;
struct ao *ao = change->ao;
if (!wcscmp(change->monitored, pwstrDeviceId)) { if (pwstrDeviceId && !wcscmp(change->monitored, pwstrDeviceId)) {
MP_VERBOSE(ao, "OnDeviceRemoved triggered - requesting ao reload\n");
ao_request_reload(ao);
} }
return S_OK; return S_OK;
} }
@ -169,10 +178,33 @@ static HRESULT STDMETHODCALLTYPE sIMMNotificationClient_OnDefaultDeviceChanged(
LPCWSTR pwstrDeviceId) LPCWSTR pwstrDeviceId)
{ {
change_notify *change = (change_notify *)This; change_notify *change = (change_notify *)This;
struct ao *ao = change->ao;
struct wasapi_state *state = (struct wasapi_state *)ao->priv;
if (!wcscmp(change->monitored, pwstrDeviceId)) { MP_VERBOSE(ao, "OnDefaultDeviceChanged triggered for role:%s flow:%s\n",
ERole_to_str(role), EDataFlow_to_str(flow));
if(pwstrDeviceId)
MP_VERBOSE(ao, "New default device %S\n", pwstrDeviceId);
/* don't care about "eCapture" or non-"eMultimedia" roles */
if ( flow == eCapture ||
role != eMultimedia ) return S_OK;
/* stay on the device the user specified */
if (state->opt_device) {
MP_VERBOSE(ao, "Staying on specified device \"%s\"", state->opt_device);
return S_OK;
} }
/* don't reload if already on the new default */
if ( pwstrDeviceId && !wcscmp(change->monitored, pwstrDeviceId) ){
MP_VERBOSE(ao, "Already using default device, no reload required\n");
return S_OK;
}
/* if we got here, we need to reload */
ao_request_reload(ao);
MP_VERBOSE(ao, "Requesting ao reload\n");
return S_OK; return S_OK;
} }
@ -182,9 +214,18 @@ static HRESULT STDMETHODCALLTYPE sIMMNotificationClient_OnPropertyValueChanged(
const PROPERTYKEY key) const PROPERTYKEY key)
{ {
change_notify *change = (change_notify *)This; change_notify *change = (change_notify *)This;
struct ao *ao = change->ao;
if (!wcscmp(change->monitored, pwstrDeviceId)) { if (pwstrDeviceId && !wcscmp(change->monitored, pwstrDeviceId)) {
MP_VERBOSE(ao, "OnPropertyValueChanged triggered\n");
MP_VERBOSE(ao, "Changed property: ");
if (!PKEY_compare(&PKEY_AudioEngine_DeviceFormat, &key)) {
MP_VERBOSE(change->ao,
"PKEY_AudioEngine_DeviceFormat - requesting ao reload\n");
ao_request_reload(change->ao);
} else {
MP_VERBOSE(ao, "%s\n", PKEY_to_str(&key));
}
} }
return S_OK; return S_OK;
} }
@ -200,21 +241,44 @@ static CONST_VTBL IMMNotificationClientVtbl sIMMDeviceEnumeratorVtbl_vtbl = {
.OnPropertyValueChanged = sIMMNotificationClient_OnPropertyValueChanged, .OnPropertyValueChanged = sIMMNotificationClient_OnPropertyValueChanged,
}; };
HRESULT wasapi_change_init(struct change_notify *change, IMMDevice *monitor)
HRESULT wasapi_change_init(struct ao *ao)
{ {
HRESULT ret; MP_DBG(ao, "Setting up monitoring on playback device\n");
struct wasapi_state *state = (struct wasapi_state *)ao->priv;
if ( ((ret = IMMDevice_GetId(monitor, &change->monitored)) != S_OK) ) { struct change_notify *change = &state->change;
wasapi_change_free(change); /* COM voodoo to emulate c++ class */
return ret;
}
ret = S_OK;
change->client.lpVtbl = &sIMMDeviceEnumeratorVtbl_vtbl; change->client.lpVtbl = &sIMMDeviceEnumeratorVtbl_vtbl;
return ret;
/* so the callbacks can access the ao */
change->ao = ao;
/* get the device string to compare with the pwstrDeviceId argument in callbacks */
HRESULT hr = IMMDevice_GetId(state->pDevice, &change->monitored);
EXIT_ON_ERROR(hr);
/* register the change notification client */
hr = IMMDeviceEnumerator_RegisterEndpointNotificationCallback(
state->pEnumerator, (IMMNotificationClient *)change);
EXIT_ON_ERROR(hr);
MP_VERBOSE(state, "Monitoring changes in device: %S\n", state->change.monitored);
return hr;
exit_label:
MP_ERR(state, "Error setting up device change monitoring: %s\n",
wasapi_explain_err(hr));
wasapi_change_uninit(ao);
return hr;
} }
void wasapi_change_free(struct change_notify *change) void wasapi_change_uninit(struct ao *ao)
{ {
struct wasapi_state *state = (struct wasapi_state *)ao->priv;
struct change_notify *change = &state->change;
if( state->pEnumerator && change->client.lpVtbl )
IMMDeviceEnumerator_UnregisterEndpointNotificationCallback(
state->pEnumerator, (IMMNotificationClient *)change);
if (change->monitored) CoTaskMemFree(change->monitored); if (change->monitored) CoTaskMemFree(change->monitored);
} }

50
audio/out/ao_wasapi_utils.c
View File

@ -33,11 +33,6 @@
#define MIXER_DEFAULT_LABEL L"mpv - video player" #define MIXER_DEFAULT_LABEL L"mpv - video player"
#define EXIT_ON_ERROR(hres) \
do { if (FAILED(hres)) { goto exit_label; } } while(0)
#define SAFE_RELEASE(unk, release) \
do { if ((unk) != NULL) { release; (unk) = NULL; } } while(0)
#ifndef PKEY_Device_FriendlyName #ifndef PKEY_Device_FriendlyName
DEFINE_PROPERTYKEY(PKEY_Device_FriendlyName, DEFINE_PROPERTYKEY(PKEY_Device_FriendlyName,
0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20,
@ -728,20 +723,12 @@ exit_label:
return 1; return 1;
} }
static HRESULT load_default_device(struct ao *ao, IMMDevice **ppDevice) static HRESULT load_default_device(struct ao *ao, IMMDeviceEnumerator* pEnumerator,
IMMDevice **ppDevice)
{ {
HRESULT hr; HRESULT hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(pEnumerator,
struct wasapi_state *state = (struct wasapi_state *)ao->priv; eRender, eMultimedia,
ppDevice);
IMMDeviceEnumerator *pEnumerator;
hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL,
&IID_IMMDeviceEnumerator, (void**)&pEnumerator);
EXIT_ON_ERROR(hr);
hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(pEnumerator,
eRender, eMultimedia,
ppDevice);
SAFE_RELEASE(pEnumerator, IMMDeviceEnumerator_Release(pEnumerator));
EXIT_ON_ERROR(hr); EXIT_ON_ERROR(hr);
char *id = get_device_id(*ppDevice); char *id = get_device_id(*ppDevice);
@ -750,16 +737,15 @@ static HRESULT load_default_device(struct ao *ao, IMMDevice **ppDevice)
return S_OK; return S_OK;
exit_label: exit_label:
MP_ERR(state, "Error loading default device: %s (0x%"PRIx32")\n", MP_ERR(ao , "Error loading default device: %s (0x%"PRIx32")\n",
wasapi_explain_err(hr), (uint32_t)hr); wasapi_explain_err(hr), (uint32_t)hr);
return hr; return hr;
} }
static HRESULT find_and_load_device(struct ao *ao, IMMDevice **ppDevice, static HRESULT find_and_load_device(struct ao *ao, IMMDeviceEnumerator* pEnumerator,
char *search) IMMDevice **ppDevice, char *search)
{ {
HRESULT hr; HRESULT hr;
IMMDeviceEnumerator *pEnumerator = NULL;
IMMDeviceCollection *pDevices = NULL; IMMDeviceCollection *pDevices = NULL;
IMMDevice *pTempDevice = NULL; IMMDevice *pTempDevice = NULL;
LPWSTR deviceID = NULL; LPWSTR deviceID = NULL;
@ -772,10 +758,6 @@ static HRESULT find_and_load_device(struct ao *ao, IMMDevice **ppDevice,
devid = search; devid = search;
} }
hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL,
&IID_IMMDeviceEnumerator, (void**)&pEnumerator);
EXIT_ON_ERROR(hr);
int search_err = 0; int search_err = 0;
if (devid == NULL) { if (devid == NULL) {
@ -866,7 +848,7 @@ static HRESULT find_and_load_device(struct ao *ao, IMMDevice **ppDevice,
exit_label: exit_label:
SAFE_RELEASE(pTempDevice, IMMDevice_Release(pTempDevice)); SAFE_RELEASE(pTempDevice, IMMDevice_Release(pTempDevice));
SAFE_RELEASE(pDevices, IMMDeviceCollection_Release(pDevices)); SAFE_RELEASE(pDevices, IMMDeviceCollection_Release(pDevices));
SAFE_RELEASE(pEnumerator, IMMDeviceEnumerator_Release(pEnumerator));
CoTaskMemFree(deviceID); CoTaskMemFree(deviceID);
return hr; return hr;
} }
@ -963,14 +945,19 @@ HRESULT wasapi_thread_init(struct ao *ao)
MP_DBG(ao, "Init wasapi thread\n"); MP_DBG(ao, "Init wasapi thread\n");
state->initial_volume = -1.0; state->initial_volume = -1.0;
hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL,
&IID_IMMDeviceEnumerator, (void**)&state->pEnumerator);
EXIT_ON_ERROR(hr);
char *device = state->opt_device; char *device = state->opt_device;
if (!device || !device[0]) if (!device || !device[0])
device = ao->device; device = ao->device;
if (!device || !device[0]) if (!device || !device[0])
hr = load_default_device(ao, &state->pDevice); hr = load_default_device(ao, state->pEnumerator, &state->pDevice);
else else
hr = find_and_load_device(ao, &state->pDevice, device); hr = find_and_load_device(ao, state->pEnumerator, &state->pDevice, device);
EXIT_ON_ERROR(hr); EXIT_ON_ERROR(hr);
char *name = get_device_name(state->pDevice); char *name = get_device_name(state->pDevice);
@ -1019,6 +1006,8 @@ HRESULT wasapi_thread_init(struct ao *ao)
state->previous_volume = state->initial_volume; state->previous_volume = state->initial_volume;
wasapi_change_init(ao);
MP_DBG(ao, "Init wasapi thread done\n"); MP_DBG(ao, "Init wasapi thread done\n");
return S_OK; return S_OK;
exit_label: exit_label:
@ -1036,6 +1025,8 @@ void wasapi_thread_uninit(struct ao *ao)
if (state->pAudioClient) if (state->pAudioClient)
IAudioClient_Stop(state->pAudioClient); IAudioClient_Stop(state->pAudioClient);
wasapi_change_uninit(ao);
if (state->opt_exclusive && if (state->opt_exclusive &&
state->pEndpointVolume && state->pEndpointVolume &&
state->initial_volume > 0 ) state->initial_volume > 0 )
@ -1049,6 +1040,7 @@ void wasapi_thread_uninit(struct ao *ao)
SAFE_RELEASE(state->pSessionControl, IAudioSessionControl_Release(state->pSessionControl)); SAFE_RELEASE(state->pSessionControl, IAudioSessionControl_Release(state->pSessionControl));
SAFE_RELEASE(state->pAudioClient, IAudioClient_Release(state->pAudioClient)); SAFE_RELEASE(state->pAudioClient, IAudioClient_Release(state->pAudioClient));
SAFE_RELEASE(state->pDevice, IMMDevice_Release(state->pDevice)); SAFE_RELEASE(state->pDevice, IMMDevice_Release(state->pDevice));
SAFE_RELEASE(state->pEnumerator, IMMDeviceEnumerator_Release(state->pEnumerator));
if (state->hTask) if (state->hTask)
state->VistaBlob.pAvRevertMmThreadCharacteristics(state->hTask); state->VistaBlob.pAvRevertMmThreadCharacteristics(state->hTask);