|
|
@@ -37,14 +37,9 @@
|
|
|
|
|
|
#include "SDL_wasapi.h"
|
|
|
|
|
|
-static const ERole SDL_WASAPI_role = eConsole; /* !!! FIXME: should this be eMultimedia? Should be a hint? */
|
|
|
-
|
|
|
-/* This is global to the WASAPI target, to handle hotplug and default device lookup. */
|
|
|
-static IMMDeviceEnumerator *enumerator = NULL;
|
|
|
-
|
|
|
/* these increment as default devices change. Opened default devices pick up changes in their threads. */
|
|
|
-static SDL_atomic_t default_playback_generation;
|
|
|
-static SDL_atomic_t default_capture_generation;
|
|
|
+SDL_atomic_t WASAPI_DefaultPlaybackGeneration;
|
|
|
+SDL_atomic_t WASAPI_DefaultCaptureGeneration;
|
|
|
|
|
|
/* This is a list of device id strings we have inflight, so we have consistent pointers to the same device. */
|
|
|
typedef struct DevIdList
|
|
|
@@ -55,173 +50,11 @@ typedef struct DevIdList
|
|
|
|
|
|
static DevIdList *deviceid_list = NULL;
|
|
|
|
|
|
-/* handle to Avrt.dll--Vista and later!--for flagging the callback thread as "Pro Audio" (low latency). */
|
|
|
-#ifndef __WINRT__
|
|
|
-static HMODULE libavrt = NULL;
|
|
|
-#endif
|
|
|
-typedef HANDLE (WINAPI *pfnAvSetMmThreadCharacteristicsW)(LPWSTR,LPDWORD);
|
|
|
-typedef BOOL (WINAPI *pfnAvRevertMmThreadCharacteristics)(HANDLE);
|
|
|
-static pfnAvSetMmThreadCharacteristicsW pAvSetMmThreadCharacteristicsW = NULL;
|
|
|
-static pfnAvRevertMmThreadCharacteristics pAvRevertMmThreadCharacteristics = NULL;
|
|
|
-
|
|
|
/* Some GUIDs we need to know without linking to libraries that aren't available before Vista. */
|
|
|
-static const CLSID SDL_CLSID_MMDeviceEnumerator = { 0xbcde0395, 0xe52f, 0x467c, { 0x8e, 0x3d, 0xc4, 0x57, 0x92, 0x91, 0x69, 0x2e } };
|
|
|
-static const IID SDL_IID_IMMDeviceEnumerator = { 0xa95664d2, 0x9614, 0x4f35, { 0xa7, 0x46, 0xde, 0x8d, 0xb6, 0x36, 0x17, 0xe6 } };
|
|
|
-static const IID SDL_IID_IMMNotificationClient = { 0x7991eec9, 0x7e89, 0x4d85, { 0x83, 0x90, 0x6c, 0x70, 0x3c, 0xec, 0x60, 0xc0 } };
|
|
|
-static const IID SDL_IID_IMMEndpoint = { 0x1be09788, 0x6894, 0x4089, { 0x85, 0x86, 0x9a, 0x2a, 0x6c, 0x26, 0x5a, 0xc5 } };
|
|
|
-static const IID SDL_IID_IAudioClient = { 0x1cb9ad4c, 0xdbfa, 0x4c32, { 0xb1, 0x78, 0xc2, 0xf5, 0x68, 0xa7, 0x03, 0xb2 } };
|
|
|
-static const IID SDL_IID_IAudioRenderClient = { 0xf294acfc, 0x3146, 0x4483, { 0xa7, 0xbf, 0xad, 0xdc, 0xa7, 0xc2, 0x60, 0xe2 } };
|
|
|
-static const IID SDL_IID_IAudioCaptureClient = { 0xc8adbd64, 0xe71e, 0x48a0, { 0xa4, 0xde, 0x18, 0x5c, 0x39, 0x5c, 0xd3, 0x17 } };
|
|
|
-static const GUID SDL_KSDATAFORMAT_SUBTYPE_PCM = { 0x00000001, 0x0000, 0x0010, { 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 } };
|
|
|
-static const GUID SDL_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT = { 0x00000003, 0x0000, 0x0010, { 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 } };
|
|
|
-static const PROPERTYKEY SDL_PKEY_Device_FriendlyName = { { 0xa45c254e, 0xdf1c, 0x4efd, { 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, } }, 14 };
|
|
|
-
|
|
|
-/* PropVariantInit() is an inline function/macro in PropIdl.h that calls the C runtime's memset() directly. Use ours instead, to avoid dependency. */
|
|
|
-#ifdef PropVariantInit
|
|
|
-#undef PropVariantInit
|
|
|
-#endif
|
|
|
-#define PropVariantInit(p) SDL_zerop(p)
|
|
|
-
|
|
|
-static void AddWASAPIDevice(const SDL_bool iscapture, IMMDevice *device, LPCWSTR devid);
|
|
|
-static void RemoveWASAPIDevice(const SDL_bool iscapture, LPCWSTR devid);
|
|
|
-
|
|
|
-/* We need a COM subclass of IMMNotificationClient for hotplug support, which is
|
|
|
- easy in C++, but we have to tapdance more to make work in C.
|
|
|
- Thanks to this page for coaching on how to make this work:
|
|
|
- https://www.codeproject.com/Articles/13601/COM-in-plain-C */
|
|
|
-
|
|
|
-typedef struct SDLMMNotificationClient
|
|
|
-{
|
|
|
- const IMMNotificationClientVtbl *lpVtbl;
|
|
|
- SDL_atomic_t refcount;
|
|
|
-} SDLMMNotificationClient;
|
|
|
-
|
|
|
-static HRESULT STDMETHODCALLTYPE
|
|
|
-SDLMMNotificationClient_QueryInterface(IMMNotificationClient *this, REFIID iid, void **ppv)
|
|
|
-{
|
|
|
- if ((WIN_IsEqualIID(iid, &IID_IUnknown)) || (WIN_IsEqualIID(iid, &SDL_IID_IMMNotificationClient)))
|
|
|
- {
|
|
|
- *ppv = this;
|
|
|
- this->lpVtbl->AddRef(this);
|
|
|
- return S_OK;
|
|
|
- }
|
|
|
-
|
|
|
- *ppv = NULL;
|
|
|
- return E_NOINTERFACE;
|
|
|
-}
|
|
|
-
|
|
|
-static ULONG STDMETHODCALLTYPE
|
|
|
-SDLMMNotificationClient_AddRef(IMMNotificationClient *ithis)
|
|
|
-{
|
|
|
- SDLMMNotificationClient *this = (SDLMMNotificationClient *) ithis;
|
|
|
- return (ULONG) (SDL_AtomicIncRef(&this->refcount) + 1);
|
|
|
-}
|
|
|
-
|
|
|
-static ULONG STDMETHODCALLTYPE
|
|
|
-SDLMMNotificationClient_Release(IMMNotificationClient *ithis)
|
|
|
-{
|
|
|
- /* this is a static object; we don't ever free it. */
|
|
|
- SDLMMNotificationClient *this = (SDLMMNotificationClient *) ithis;
|
|
|
- const ULONG retval = SDL_AtomicDecRef(&this->refcount);
|
|
|
- if (retval == 0) {
|
|
|
- SDL_AtomicSet(&this->refcount, 0); /* uhh... */
|
|
|
- return 0;
|
|
|
- }
|
|
|
- return retval - 1;
|
|
|
-}
|
|
|
-
|
|
|
-/* These are the entry points called when WASAPI device endpoints change. */
|
|
|
-static HRESULT STDMETHODCALLTYPE
|
|
|
-SDLMMNotificationClient_OnDefaultDeviceChanged(IMMNotificationClient *ithis, EDataFlow flow, ERole role, LPCWSTR pwstrDeviceId)
|
|
|
-{
|
|
|
- if (role != SDL_WASAPI_role) {
|
|
|
- return S_OK; /* ignore it. */
|
|
|
- }
|
|
|
-
|
|
|
- /* Increment the "generation," so opened devices will pick this up in their threads. */
|
|
|
- switch (flow) {
|
|
|
- case eRender:
|
|
|
- SDL_AtomicAdd(&default_playback_generation, 1);
|
|
|
- break;
|
|
|
-
|
|
|
- case eCapture:
|
|
|
- SDL_AtomicAdd(&default_capture_generation, 1);
|
|
|
- break;
|
|
|
-
|
|
|
- case eAll:
|
|
|
- SDL_AtomicAdd(&default_playback_generation, 1);
|
|
|
- SDL_AtomicAdd(&default_capture_generation, 1);
|
|
|
- break;
|
|
|
-
|
|
|
- default:
|
|
|
- SDL_assert(!"uhoh, unexpected OnDefaultDeviceChange flow!");
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
- return S_OK;
|
|
|
-}
|
|
|
-
|
|
|
-static HRESULT STDMETHODCALLTYPE
|
|
|
-SDLMMNotificationClient_OnDeviceAdded(IMMNotificationClient *ithis, LPCWSTR pwstrDeviceId)
|
|
|
-{
|
|
|
- /* we ignore this; devices added here then progress to ACTIVE, if appropriate, in
|
|
|
- OnDeviceStateChange, making that a better place to deal with device adds. More
|
|
|
- importantly: the first time you plug in a USB audio device, this callback will
|
|
|
- fire, but when you unplug it, it isn't removed (it's state changes to NOTPRESENT).
|
|
|
- Plugging it back in won't fire this callback again. */
|
|
|
- return S_OK;
|
|
|
-}
|
|
|
-
|
|
|
-static HRESULT STDMETHODCALLTYPE
|
|
|
-SDLMMNotificationClient_OnDeviceRemoved(IMMNotificationClient *ithis, LPCWSTR pwstrDeviceId)
|
|
|
-{
|
|
|
- /* See notes in OnDeviceAdded handler about why we ignore this. */
|
|
|
- return S_OK;
|
|
|
-}
|
|
|
-
|
|
|
-static HRESULT STDMETHODCALLTYPE
|
|
|
-SDLMMNotificationClient_OnDeviceStateChanged(IMMNotificationClient *ithis, LPCWSTR pwstrDeviceId, DWORD dwNewState)
|
|
|
-{
|
|
|
- IMMDevice *device = NULL;
|
|
|
-
|
|
|
- if (SUCCEEDED(IMMDeviceEnumerator_GetDevice(enumerator, pwstrDeviceId, &device))) {
|
|
|
- IMMEndpoint *endpoint = NULL;
|
|
|
- if (SUCCEEDED(IMMDevice_QueryInterface(device, &SDL_IID_IMMEndpoint, (void **) &endpoint))) {
|
|
|
- EDataFlow flow;
|
|
|
- if (SUCCEEDED(IMMEndpoint_GetDataFlow(endpoint, &flow))) {
|
|
|
- const SDL_bool iscapture = (flow == eCapture);
|
|
|
- if (dwNewState == DEVICE_STATE_ACTIVE) {
|
|
|
- AddWASAPIDevice(iscapture, device, pwstrDeviceId);
|
|
|
- } else {
|
|
|
- RemoveWASAPIDevice(iscapture, pwstrDeviceId);
|
|
|
- }
|
|
|
- }
|
|
|
- IMMEndpoint_Release(endpoint);
|
|
|
- }
|
|
|
- IMMDevice_Release(device);
|
|
|
- }
|
|
|
-
|
|
|
- return S_OK;
|
|
|
-}
|
|
|
-
|
|
|
-static HRESULT STDMETHODCALLTYPE
|
|
|
-SDLMMNotificationClient_OnPropertyValueChanged(IMMNotificationClient *this, LPCWSTR pwstrDeviceId, const PROPERTYKEY key)
|
|
|
-{
|
|
|
- return S_OK; /* we don't care about these. */
|
|
|
-}
|
|
|
-
|
|
|
-static const IMMNotificationClientVtbl notification_client_vtbl = {
|
|
|
- SDLMMNotificationClient_QueryInterface,
|
|
|
- SDLMMNotificationClient_AddRef,
|
|
|
- SDLMMNotificationClient_Release,
|
|
|
- SDLMMNotificationClient_OnDeviceStateChanged,
|
|
|
- SDLMMNotificationClient_OnDeviceAdded,
|
|
|
- SDLMMNotificationClient_OnDeviceRemoved,
|
|
|
- SDLMMNotificationClient_OnDefaultDeviceChanged,
|
|
|
- SDLMMNotificationClient_OnPropertyValueChanged
|
|
|
-};
|
|
|
-
|
|
|
-static SDLMMNotificationClient notification_client = { ¬ification_client_vtbl, { 1 } };
|
|
|
+static const IID SDL_IID_IAudioRenderClient = { 0xf294acfc, 0x3146, 0x4483,{ 0xa7, 0xbf, 0xad, 0xdc, 0xa7, 0xc2, 0x60, 0xe2 } };
|
|
|
+static const IID SDL_IID_IAudioCaptureClient = { 0xc8adbd64, 0xe71e, 0x48a0,{ 0xa4, 0xde, 0x18, 0x5c, 0x39, 0x5c, 0xd3, 0x17 } };
|
|
|
+static const GUID SDL_KSDATAFORMAT_SUBTYPE_PCM = { 0x00000001, 0x0000, 0x0010,{ 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 } };
|
|
|
+static const GUID SDL_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT = { 0x00000003, 0x0000, 0x0010,{ 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 } };
|
|
|
|
|
|
static SDL_bool
|
|
|
WStrEqual(const WCHAR *a, const WCHAR *b)
|
|
|
@@ -236,10 +69,22 @@ WStrEqual(const WCHAR *a, const WCHAR *b)
|
|
|
return *b == 0;
|
|
|
}
|
|
|
|
|
|
+static size_t
|
|
|
+WStrLen(const WCHAR *wstr)
|
|
|
+{
|
|
|
+ size_t retval = 0;
|
|
|
+ if (wstr) {
|
|
|
+ while (*(wstr++)) {
|
|
|
+ retval++;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return retval;
|
|
|
+}
|
|
|
+
|
|
|
static WCHAR *
|
|
|
WStrDupe(const WCHAR *wstr)
|
|
|
{
|
|
|
- const int len = (lstrlenW(wstr) + 1) * sizeof (WCHAR);
|
|
|
+ const int len = (WStrLen(wstr) + 1) * sizeof (WCHAR);
|
|
|
WCHAR *retval = (WCHAR *) SDL_malloc(len);
|
|
|
if (retval) {
|
|
|
SDL_memcpy(retval, wstr, len);
|
|
|
@@ -247,8 +92,9 @@ WStrDupe(const WCHAR *wstr)
|
|
|
return retval;
|
|
|
}
|
|
|
|
|
|
-static void
|
|
|
-RemoveWASAPIDevice(const SDL_bool iscapture, LPCWSTR devid)
|
|
|
+
|
|
|
+void
|
|
|
+WASAPI_RemoveDevice(const SDL_bool iscapture, LPCWSTR devid)
|
|
|
{
|
|
|
DevIdList *i;
|
|
|
DevIdList *next;
|
|
|
@@ -269,23 +115,16 @@ RemoveWASAPIDevice(const SDL_bool iscapture, LPCWSTR devid)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-static void
|
|
|
-AddWASAPIDevice(const SDL_bool iscapture, IMMDevice *device, LPCWSTR devid)
|
|
|
+void
|
|
|
+WASAPI_AddDevice(const SDL_bool iscapture, const char *devname, LPCWSTR devid)
|
|
|
{
|
|
|
- IPropertyStore *props = NULL;
|
|
|
- char *utf8dev = NULL;
|
|
|
DevIdList *devidlist;
|
|
|
- PROPVARIANT var;
|
|
|
|
|
|
/* You can have multiple endpoints on a device that are mutually exclusive ("Speakers" vs "Line Out" or whatever).
|
|
|
In a perfect world, things that are unplugged won't be in this collection. The only gotcha is probably for
|
|
|
phones and tablets, where you might have an internal speaker and a headphone jack and expect both to be
|
|
|
available and switch automatically. (!!! FIXME...?) */
|
|
|
|
|
|
- /* PKEY_Device_FriendlyName gives you "Speakers (SoundBlaster Pro)" which drives me nuts. I'd rather it be
|
|
|
- "SoundBlaster Pro (Speakers)" but I guess that's developers vs users. Windows uses the FriendlyName in
|
|
|
- its own UIs, like Volume Control, etc. */
|
|
|
-
|
|
|
/* see if we already have this one. */
|
|
|
for (devidlist = deviceid_list; devidlist; devidlist = devidlist->next) {
|
|
|
if (WStrEqual(devidlist->str, devid)) {
|
|
|
@@ -308,61 +147,13 @@ AddWASAPIDevice(const SDL_bool iscapture, IMMDevice *device, LPCWSTR devid)
|
|
|
devidlist->next = deviceid_list;
|
|
|
deviceid_list = devidlist;
|
|
|
|
|
|
- if (SUCCEEDED(IMMDevice_OpenPropertyStore(device, STGM_READ, &props))) {
|
|
|
- PropVariantInit(&var);
|
|
|
- if (SUCCEEDED(IPropertyStore_GetValue(props, &SDL_PKEY_Device_FriendlyName, &var))) {
|
|
|
- utf8dev = WIN_StringToUTF8(var.pwszVal);
|
|
|
- if (utf8dev) {
|
|
|
- SDL_AddAudioDevice(iscapture, utf8dev, (void *) devid);
|
|
|
- SDL_free(utf8dev);
|
|
|
- }
|
|
|
- }
|
|
|
- PropVariantClear(&var);
|
|
|
- IPropertyStore_Release(props);
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
-static void
|
|
|
-EnumerateEndpoints(const SDL_bool iscapture)
|
|
|
-{
|
|
|
- IMMDeviceCollection *collection = NULL;
|
|
|
- UINT i, total;
|
|
|
-
|
|
|
- /* Note that WASAPI separates "adapter devices" from "audio endpoint devices"
|
|
|
- ...one adapter device ("SoundBlaster Pro") might have multiple endpoint devices ("Speakers", "Line-Out"). */
|
|
|
-
|
|
|
- if (FAILED(IMMDeviceEnumerator_EnumAudioEndpoints(enumerator, iscapture ? eCapture : eRender, DEVICE_STATE_ACTIVE, &collection))) {
|
|
|
- return;
|
|
|
- }
|
|
|
-
|
|
|
- if (FAILED(IMMDeviceCollection_GetCount(collection, &total))) {
|
|
|
- IMMDeviceCollection_Release(collection);
|
|
|
- return;
|
|
|
- }
|
|
|
-
|
|
|
- for (i = 0; i < total; i++) {
|
|
|
- IMMDevice *device = NULL;
|
|
|
- if (SUCCEEDED(IMMDeviceCollection_Item(collection, i, &device))) {
|
|
|
- LPWSTR devid = NULL;
|
|
|
- if (SUCCEEDED(IMMDevice_GetId(device, &devid))) {
|
|
|
- AddWASAPIDevice(iscapture, device, devid);
|
|
|
- CoTaskMemFree(devid);
|
|
|
- }
|
|
|
- IMMDevice_Release(device);
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- IMMDeviceCollection_Release(collection);
|
|
|
+ SDL_AddAudioDevice(iscapture, devname, (void *) devid);
|
|
|
}
|
|
|
|
|
|
static void
|
|
|
WASAPI_DetectDevices(void)
|
|
|
{
|
|
|
- EnumerateEndpoints(SDL_FALSE); /* playback */
|
|
|
- EnumerateEndpoints(SDL_TRUE); /* capture */
|
|
|
-
|
|
|
- /* if this fails, we just won't get hotplug events. Carry on anyhow. */
|
|
|
- IMMDeviceEnumerator_RegisterEndpointNotificationCallback(enumerator, (IMMNotificationClient *) ¬ification_client);
|
|
|
+ WASAPI_EnumerateEndpoints();
|
|
|
}
|
|
|
|
|
|
static int
|
|
|
@@ -372,10 +163,11 @@ WASAPI_GetPendingBytes(_THIS)
|
|
|
|
|
|
/* it's okay to fail here; we'll deal with failures in the audio thread. */
|
|
|
/* FIXME: need a lock around checking this->hidden->client */
|
|
|
- if (!this->hidden->client || FAILED(IAudioClient_GetCurrentPadding(this->hidden->client, &frames))) {
|
|
|
- return 0; /* oh well. */
|
|
|
+ if (this->hidden->client != NULL) { /* definitely activated? */
|
|
|
+ if (FAILED(IAudioClient_GetCurrentPadding(this->hidden->client, &frames))) {
|
|
|
+ return 0; /* oh well. */
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
return ((int) frames) * this->hidden->framesize;
|
|
|
}
|
|
|
|
|
|
@@ -397,41 +189,9 @@ WasapiFailed(_THIS, const HRESULT err)
|
|
|
return SDL_TRUE;
|
|
|
}
|
|
|
|
|
|
-static int PrepWasapiDevice(_THIS, const int iscapture, IMMDevice *device);
|
|
|
-static void ReleaseWasapiDevice(_THIS);
|
|
|
-
|
|
|
-static SDL_bool
|
|
|
-RecoverWasapiDevice(_THIS)
|
|
|
+static int
|
|
|
+UpdateAudioStream(_THIS, const SDL_AudioSpec *oldspec)
|
|
|
{
|
|
|
- const SDL_AudioSpec oldspec = this->spec;
|
|
|
- IMMDevice *device = NULL;
|
|
|
- HRESULT ret = S_OK;
|
|
|
-
|
|
|
- if (this->hidden->default_device_generation) {
|
|
|
- const EDataFlow dataflow = this->iscapture ? eCapture : eRender;
|
|
|
- ReleaseWasapiDevice(this); /* dump the lost device's handles. */
|
|
|
- this->hidden->default_device_generation = SDL_AtomicGet(this->iscapture ? &default_capture_generation : &default_playback_generation);
|
|
|
- ret = IMMDeviceEnumerator_GetDefaultAudioEndpoint(enumerator, dataflow, SDL_WASAPI_role, &device);
|
|
|
- if (FAILED(ret)) {
|
|
|
- return SDL_FALSE; /* can't find a new default device! */
|
|
|
- }
|
|
|
- } else {
|
|
|
- device = this->hidden->device;
|
|
|
- this->hidden->device = NULL; /* don't release this in ReleaseWasapiDevice(). */
|
|
|
- ReleaseWasapiDevice(this); /* dump the lost device's handles. */
|
|
|
- }
|
|
|
-
|
|
|
- SDL_assert(device != NULL);
|
|
|
-
|
|
|
- /* this can fail for lots of reasons, but the most likely is we had a
|
|
|
- non-default device that was disconnected, so we can't recover. Default
|
|
|
- devices try to reinitialize whatever the new default is, so it's more
|
|
|
- likely to carry on here, but this handles a non-default device that
|
|
|
- simply had its format changed in the Windows Control Panel. */
|
|
|
- if (PrepWasapiDevice(this, this->iscapture, device) == -1) {
|
|
|
- return SDL_FALSE;
|
|
|
- }
|
|
|
-
|
|
|
/* Since WASAPI requires us to handle all audio conversion, and our
|
|
|
device format might have changed, we might have to add/remove/change
|
|
|
the audio stream that the higher level uses to convert data, so
|
|
|
@@ -444,9 +204,9 @@ RecoverWasapiDevice(_THIS)
|
|
|
/* no need to buffer/convert in an AudioStream! */
|
|
|
SDL_FreeAudioStream(this->stream);
|
|
|
this->stream = NULL;
|
|
|
- } else if ( (oldspec.channels == this->spec.channels) &&
|
|
|
- (oldspec.format == this->spec.format) &&
|
|
|
- (oldspec.freq == this->spec.freq) ) {
|
|
|
+ } else if ( (oldspec->channels == this->spec.channels) &&
|
|
|
+ (oldspec->format == this->spec.format) &&
|
|
|
+ (oldspec->freq == this->spec.freq) ) {
|
|
|
/* The existing audio stream is okay to keep using. */
|
|
|
} else {
|
|
|
/* replace the audiostream for new format */
|
|
|
@@ -465,7 +225,7 @@ RecoverWasapiDevice(_THIS)
|
|
|
}
|
|
|
|
|
|
if (!this->stream) {
|
|
|
- return SDL_FALSE;
|
|
|
+ return -1;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -473,13 +233,37 @@ RecoverWasapiDevice(_THIS)
|
|
|
if (this->spec.size > this->work_buffer_len) {
|
|
|
Uint8 *ptr = (Uint8 *) SDL_realloc(this->work_buffer, this->spec.size);
|
|
|
if (ptr == NULL) {
|
|
|
- SDL_OutOfMemory();
|
|
|
- return SDL_FALSE;
|
|
|
+ return SDL_OutOfMemory();
|
|
|
}
|
|
|
this->work_buffer = ptr;
|
|
|
this->work_buffer_len = this->spec.size;
|
|
|
}
|
|
|
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
+
|
|
|
+static void ReleaseWasapiDevice(_THIS);
|
|
|
+
|
|
|
+static SDL_bool
|
|
|
+RecoverWasapiDevice(_THIS)
|
|
|
+{
|
|
|
+ ReleaseWasapiDevice(this); /* dump the lost device's handles. */
|
|
|
+
|
|
|
+ if (this->hidden->default_device_generation) {
|
|
|
+ this->hidden->default_device_generation = SDL_AtomicGet(this->iscapture ? &WASAPI_DefaultCaptureGeneration : &WASAPI_DefaultPlaybackGeneration);
|
|
|
+ }
|
|
|
+
|
|
|
+ /* this can fail for lots of reasons, but the most likely is we had a
|
|
|
+ non-default device that was disconnected, so we can't recover. Default
|
|
|
+ devices try to reinitialize whatever the new default is, so it's more
|
|
|
+ likely to carry on here, but this handles a non-default device that
|
|
|
+ simply had its format changed in the Windows Control Panel. */
|
|
|
+ if (WASAPI_ActivateDevice(this, SDL_TRUE) == -1) {
|
|
|
+ SDL_OpenedAudioDeviceDisconnected(this);
|
|
|
+ return SDL_FALSE;
|
|
|
+ }
|
|
|
+
|
|
|
this->hidden->device_lost = SDL_FALSE;
|
|
|
|
|
|
return SDL_TRUE; /* okay, carry on with new device details! */
|
|
|
@@ -495,8 +279,12 @@ RecoverWasapiIfLost(_THIS)
|
|
|
return SDL_FALSE; /* already failed. */
|
|
|
}
|
|
|
|
|
|
+ if (!this->hidden->client) {
|
|
|
+ return SDL_TRUE; /* still waiting for activation. */
|
|
|
+ }
|
|
|
+
|
|
|
if (!lost && (generation > 0)) { /* is a default device? */
|
|
|
- const int newgen = SDL_AtomicGet(this->iscapture ? &default_capture_generation : &default_playback_generation);
|
|
|
+ const int newgen = SDL_AtomicGet(this->iscapture ? &WASAPI_DefaultCaptureGeneration : &WASAPI_DefaultPlaybackGeneration);
|
|
|
if (generation != newgen) { /* the desired default device was changed, jump over to it. */
|
|
|
lost = SDL_TRUE;
|
|
|
}
|
|
|
@@ -511,7 +299,7 @@ WASAPI_GetDeviceBuf(_THIS)
|
|
|
/* get an endpoint buffer from WASAPI. */
|
|
|
BYTE *buffer = NULL;
|
|
|
|
|
|
- while (RecoverWasapiIfLost(this)) {
|
|
|
+ while (RecoverWasapiIfLost(this) && this->hidden->render) {
|
|
|
if (!WasapiFailed(this, IAudioRenderClient_GetBuffer(this->hidden->render, this->spec.samples, &buffer))) {
|
|
|
return (Uint8 *) buffer;
|
|
|
}
|
|
|
@@ -524,17 +312,18 @@ WASAPI_GetDeviceBuf(_THIS)
|
|
|
static void
|
|
|
WASAPI_PlayDevice(_THIS)
|
|
|
{
|
|
|
- /* WasapiFailed() will mark the device for reacquisition or removal elsewhere. */
|
|
|
- WasapiFailed(this, IAudioRenderClient_ReleaseBuffer(this->hidden->render, this->spec.samples, 0));
|
|
|
+ if (this->hidden->render != NULL) { /* definitely activated? */
|
|
|
+ /* WasapiFailed() will mark the device for reacquisition or removal elsewhere. */
|
|
|
+ WasapiFailed(this, IAudioRenderClient_ReleaseBuffer(this->hidden->render, this->spec.samples, 0));
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
static void
|
|
|
WASAPI_WaitDevice(_THIS)
|
|
|
{
|
|
|
- const UINT32 maxpadding = this->spec.samples;
|
|
|
- while (RecoverWasapiIfLost(this)) {
|
|
|
+ while (RecoverWasapiIfLost(this) && this->hidden->client) {
|
|
|
+ const UINT32 maxpadding = this->spec.samples;
|
|
|
UINT32 padding = 0;
|
|
|
-
|
|
|
if (!WasapiFailed(this, IAudioClient_GetCurrentPadding(this->hidden->client, &padding))) {
|
|
|
if (padding <= maxpadding) {
|
|
|
break;
|
|
|
@@ -562,6 +351,14 @@ WASAPI_CaptureFromDevice(_THIS, void *buffer, int buflen)
|
|
|
UINT32 frames = 0;
|
|
|
DWORD flags = 0;
|
|
|
|
|
|
+ /* uhoh, client isn't activated yet, just return silence. */
|
|
|
+ if (!this->hidden->capture) {
|
|
|
+ /* Delay so we run at about the speed that audio would be arriving. */
|
|
|
+ SDL_Delay(((this->spec.samples * 1000) / this->spec.freq));
|
|
|
+ SDL_memset(buffer, this->spec.silence, buflen);
|
|
|
+ return buflen;
|
|
|
+ }
|
|
|
+
|
|
|
ret = IAudioCaptureClient_GetBuffer(this->hidden->capture, &ptr, &frames, &flags, NULL, NULL);
|
|
|
if (ret != AUDCLNT_S_BUFFER_EMPTY) {
|
|
|
WasapiFailed(this, ret); /* mark device lost/failed if necessary. */
|
|
|
@@ -609,6 +406,10 @@ WASAPI_FlushCapture(_THIS)
|
|
|
UINT32 frames = 0;
|
|
|
DWORD flags = 0;
|
|
|
|
|
|
+ if (!this->hidden->capture) {
|
|
|
+ return; /* not activated yet? */
|
|
|
+ }
|
|
|
+
|
|
|
/* just read until we stop getting packets, throwing them away. */
|
|
|
while (SDL_TRUE) {
|
|
|
const HRESULT ret = IAudioCaptureClient_GetBuffer(this->hidden->capture, &ptr, &frames, &flags, NULL, NULL);
|
|
|
@@ -646,30 +447,49 @@ ReleaseWasapiDevice(_THIS)
|
|
|
this->hidden->waveformat = NULL;
|
|
|
}
|
|
|
|
|
|
- if (this->hidden->device) {
|
|
|
- IMMDevice_Release(this->hidden->device);
|
|
|
- this->hidden->device = NULL;
|
|
|
- }
|
|
|
-
|
|
|
if (this->hidden->capturestream) {
|
|
|
SDL_FreeAudioStream(this->hidden->capturestream);
|
|
|
this->hidden->capturestream = NULL;
|
|
|
}
|
|
|
+
|
|
|
+ if (this->hidden->activation_handler) {
|
|
|
+ WASAPI_PlatformDeleteActivationHandler(this->hidden->activation_handler);
|
|
|
+ this->hidden->activation_handler = NULL;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
static void
|
|
|
WASAPI_CloseDevice(_THIS)
|
|
|
{
|
|
|
+ WASAPI_UnrefDevice(this);
|
|
|
+}
|
|
|
+
|
|
|
+void
|
|
|
+WASAPI_RefDevice(_THIS)
|
|
|
+{
|
|
|
+ SDL_AtomicIncRef(&this->hidden->refcount);
|
|
|
+}
|
|
|
+
|
|
|
+void
|
|
|
+WASAPI_UnrefDevice(_THIS)
|
|
|
+{
|
|
|
+ if (!SDL_AtomicDecRef(&this->hidden->refcount)) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ /* actual closing happens here. */
|
|
|
+
|
|
|
/* don't touch this->hidden->task in here; it has to be reverted from
|
|
|
- our callback thread. We do that in WASAPI_ThreadDeinit().
|
|
|
- (likewise for this->hidden->coinitialized). */
|
|
|
+ our callback thread. We do that in WASAPI_ThreadDeinit().
|
|
|
+ (likewise for this->hidden->coinitialized). */
|
|
|
ReleaseWasapiDevice(this);
|
|
|
+ SDL_free(this->hidden->devid);
|
|
|
SDL_free(this->hidden);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-static int
|
|
|
-PrepWasapiDevice(_THIS, const int iscapture, IMMDevice *device)
|
|
|
+/* This is called once a device is activated, possibly asynchronously. */
|
|
|
+int
|
|
|
+WASAPI_PrepDevice(_THIS, const SDL_bool updatestream)
|
|
|
{
|
|
|
/* !!! FIXME: we could request an exclusive mode stream, which is lower latency;
|
|
|
!!! it will write into the kernel's audio buffer directly instead of
|
|
|
@@ -682,10 +502,11 @@ PrepWasapiDevice(_THIS, const int iscapture, IMMDevice *device)
|
|
|
!!! wins actually look like. Maybe add a hint to force exclusive mode at
|
|
|
!!! some point. To be sure, defaulting to shared mode is the right thing to
|
|
|
!!! do in any case. */
|
|
|
+ const SDL_AudioSpec oldspec = this->spec;
|
|
|
const AUDCLNT_SHAREMODE sharemode = AUDCLNT_SHAREMODE_SHARED;
|
|
|
UINT32 bufsize = 0; /* this is in sample frames, not samples, not bytes. */
|
|
|
REFERENCE_TIME duration = 0;
|
|
|
- IAudioClient *client = NULL;
|
|
|
+ IAudioClient *client = this->hidden->client;
|
|
|
IAudioRenderClient *render = NULL;
|
|
|
IAudioCaptureClient *capture = NULL;
|
|
|
WAVEFORMATEX *waveformat = NULL;
|
|
|
@@ -694,15 +515,7 @@ PrepWasapiDevice(_THIS, const int iscapture, IMMDevice *device)
|
|
|
SDL_bool valid_format = SDL_FALSE;
|
|
|
HRESULT ret = S_OK;
|
|
|
|
|
|
- this->hidden->device = device;
|
|
|
-
|
|
|
- ret = IMMDevice_Activate(device, &SDL_IID_IAudioClient, CLSCTX_ALL, NULL, (void **) &client);
|
|
|
- if (FAILED(ret)) {
|
|
|
- return WIN_SetErrorFromHRESULT("WASAPI can't activate audio endpoint", ret);
|
|
|
- }
|
|
|
-
|
|
|
SDL_assert(client != NULL);
|
|
|
- this->hidden->client = client;
|
|
|
|
|
|
ret = IAudioClient_GetMixFormat(client, &waveformat);
|
|
|
if (FAILED(ret)) {
|
|
|
@@ -763,7 +576,7 @@ PrepWasapiDevice(_THIS, const int iscapture, IMMDevice *device)
|
|
|
}
|
|
|
|
|
|
this->spec.samples = (Uint16) bufsize;
|
|
|
- if (!iscapture) {
|
|
|
+ if (!this->iscapture) {
|
|
|
this->spec.samples /= 2; /* fill half of the DMA buffer on each run. */
|
|
|
}
|
|
|
|
|
|
@@ -772,7 +585,7 @@ PrepWasapiDevice(_THIS, const int iscapture, IMMDevice *device)
|
|
|
|
|
|
this->hidden->framesize = (SDL_AUDIO_BITSIZE(this->spec.format) / 8) * this->spec.channels;
|
|
|
|
|
|
- if (iscapture) {
|
|
|
+ if (this->iscapture) {
|
|
|
this->hidden->capturestream = SDL_NewAudioStream(this->spec.format, this->spec.channels, this->spec.freq, this->spec.format, this->spec.channels, this->spec.freq);
|
|
|
if (!this->hidden->capturestream) {
|
|
|
return -1; /* already set SDL_Error */
|
|
|
@@ -805,15 +618,20 @@ PrepWasapiDevice(_THIS, const int iscapture, IMMDevice *device)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ if (updatestream) {
|
|
|
+ if (UpdateAudioStream(this, &oldspec) == -1) {
|
|
|
+ return -1;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
return 0; /* good to go. */
|
|
|
}
|
|
|
|
|
|
+
|
|
|
static int
|
|
|
WASAPI_OpenDevice(_THIS, void *handle, const char *devname, int iscapture)
|
|
|
{
|
|
|
- const SDL_bool is_default_device = (handle == NULL);
|
|
|
- IMMDevice *device = NULL;
|
|
|
- HRESULT ret = S_OK;
|
|
|
+ LPCWSTR devid = (LPCWSTR) handle;
|
|
|
|
|
|
/* Initialize all variables that we clean on shutdown */
|
|
|
this->hidden = (struct SDL_PrivateAudioData *)
|
|
|
@@ -823,49 +641,42 @@ WASAPI_OpenDevice(_THIS, void *handle, const char *devname, int iscapture)
|
|
|
}
|
|
|
SDL_zerop(this->hidden);
|
|
|
|
|
|
- if (is_default_device) {
|
|
|
- const EDataFlow dataflow = iscapture ? eCapture : eRender;
|
|
|
- this->hidden->default_device_generation = SDL_AtomicGet(iscapture ? &default_capture_generation : &default_playback_generation);
|
|
|
- ret = IMMDeviceEnumerator_GetDefaultAudioEndpoint(enumerator, dataflow, SDL_WASAPI_role, &device);
|
|
|
+ WASAPI_RefDevice(this); /* so CloseDevice() will unref to zero. */
|
|
|
+
|
|
|
+ if (!devid) { /* is default device? */
|
|
|
+ this->hidden->default_device_generation = SDL_AtomicGet(iscapture ? &WASAPI_DefaultCaptureGeneration : &WASAPI_DefaultPlaybackGeneration);
|
|
|
} else {
|
|
|
- ret = IMMDeviceEnumerator_GetDevice(enumerator, (LPCWSTR) handle, &device);
|
|
|
+ this->hidden->devid = WStrDupe(devid);
|
|
|
+ if (!this->hidden->devid) {
|
|
|
+ return SDL_OutOfMemory();
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
- if (FAILED(ret)) {
|
|
|
- return WIN_SetErrorFromHRESULT("WASAPI can't find requested audio endpoint", ret);
|
|
|
+ if (WASAPI_ActivateDevice(this, SDL_FALSE) == -1) {
|
|
|
+ return -1; /* already set error. */
|
|
|
}
|
|
|
|
|
|
- SDL_assert(device != NULL);
|
|
|
- return PrepWasapiDevice(this, iscapture, device);
|
|
|
+ /* Ready, but waiting for async device activation.
|
|
|
+ Until activation is successful, we will report silence from capture
|
|
|
+ devices and ignore data on playback devices.
|
|
|
+ Also, since we don't know the _actual_ device format until after
|
|
|
+ activation, we let the app have whatever it asks for. We set up
|
|
|
+ an SDL_AudioStream to convert, if necessary, once the activation
|
|
|
+ completes. */
|
|
|
+
|
|
|
+ return 0;
|
|
|
}
|
|
|
|
|
|
static void
|
|
|
WASAPI_ThreadInit(_THIS)
|
|
|
{
|
|
|
- /* this thread uses COM. */
|
|
|
- if (SUCCEEDED(WIN_CoInitialize())) { /* can't report errors, hope it worked! */
|
|
|
- this->hidden->coinitialized = SDL_TRUE;
|
|
|
- }
|
|
|
-
|
|
|
- /* Set this thread to very high "Pro Audio" priority. */
|
|
|
- if (pAvSetMmThreadCharacteristicsW) {
|
|
|
- DWORD idx = 0;
|
|
|
- this->hidden->task = pAvSetMmThreadCharacteristicsW(TEXT("Pro Audio"), &idx);
|
|
|
- }
|
|
|
+ WASAPI_PlatformThreadInit(this);
|
|
|
}
|
|
|
|
|
|
static void
|
|
|
WASAPI_ThreadDeinit(_THIS)
|
|
|
{
|
|
|
- /* Set this thread to very high "Pro Audio" priority. */
|
|
|
- if (this->hidden->task && pAvRevertMmThreadCharacteristics) {
|
|
|
- pAvRevertMmThreadCharacteristics(this->hidden->task);
|
|
|
- this->hidden->task = NULL;
|
|
|
- }
|
|
|
-
|
|
|
- if (this->hidden->coinitialized) {
|
|
|
- WIN_CoUninitialize();
|
|
|
- }
|
|
|
+ WASAPI_PlatformThreadDeinit(this);
|
|
|
}
|
|
|
|
|
|
static void
|
|
|
@@ -874,21 +685,7 @@ WASAPI_Deinitialize(void)
|
|
|
DevIdList *devidlist;
|
|
|
DevIdList *next;
|
|
|
|
|
|
- if (enumerator) {
|
|
|
- IMMDeviceEnumerator_UnregisterEndpointNotificationCallback(enumerator, (IMMNotificationClient *) ¬ification_client);
|
|
|
- IMMDeviceEnumerator_Release(enumerator);
|
|
|
- enumerator = NULL;
|
|
|
- }
|
|
|
-
|
|
|
- #ifndef __WINRT__
|
|
|
- if (libavrt) {
|
|
|
- FreeLibrary(libavrt);
|
|
|
- libavrt = NULL;
|
|
|
- }
|
|
|
- #endif
|
|
|
-
|
|
|
- pAvSetMmThreadCharacteristicsW = NULL;
|
|
|
- pAvRevertMmThreadCharacteristics = NULL;
|
|
|
+ WASAPI_PlatformDeinit();
|
|
|
|
|
|
for (devidlist = deviceid_list; devidlist; devidlist = next) {
|
|
|
next = devidlist->next;
|
|
|
@@ -896,51 +693,23 @@ WASAPI_Deinitialize(void)
|
|
|
SDL_free(devidlist);
|
|
|
}
|
|
|
deviceid_list = NULL;
|
|
|
-
|
|
|
- WIN_CoUninitialize();
|
|
|
}
|
|
|
|
|
|
static int
|
|
|
WASAPI_Init(SDL_AudioDriverImpl * impl)
|
|
|
{
|
|
|
- HRESULT ret;
|
|
|
-
|
|
|
- /* just skip the discussion with COM here. */
|
|
|
- if (!WIN_IsWindowsVistaOrGreater()) {
|
|
|
- SDL_SetError("WASAPI support requires Windows Vista or later");
|
|
|
- return 0;
|
|
|
- }
|
|
|
-
|
|
|
- SDL_AtomicSet(&default_playback_generation, 1);
|
|
|
- SDL_AtomicSet(&default_capture_generation, 1);
|
|
|
+ SDL_AtomicSet(&WASAPI_DefaultPlaybackGeneration, 1);
|
|
|
+ SDL_AtomicSet(&WASAPI_DefaultCaptureGeneration, 1);
|
|
|
|
|
|
- if (FAILED(WIN_CoInitialize())) {
|
|
|
- SDL_SetError("WASAPI: CoInitialize() failed");
|
|
|
+ if (WASAPI_PlatformInit() == -1) {
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
- ret = CoCreateInstance(&SDL_CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &SDL_IID_IMMDeviceEnumerator, (LPVOID) &enumerator);
|
|
|
- if (FAILED(ret)) {
|
|
|
- WIN_CoUninitialize();
|
|
|
- WIN_SetErrorFromHRESULT("WASAPI CoCreateInstance(MMDeviceEnumerator)", ret);
|
|
|
- return 0; /* oh well. */
|
|
|
- }
|
|
|
-
|
|
|
- #ifdef __WINRT__
|
|
|
- pAvSetMmThreadCharacteristicsW = AvSetMmThreadCharacteristicsW;
|
|
|
- pAvRevertMmThreadCharacteristics = AvRevertMmThreadCharacteristics;
|
|
|
- #else
|
|
|
- libavrt = LoadLibraryW(L"avrt.dll"); /* this library is available in Vista and later. No WinXP, so have to LoadLibrary to use it for now! */
|
|
|
- if (libavrt) {
|
|
|
- pAvSetMmThreadCharacteristicsW = (pfnAvSetMmThreadCharacteristicsW) GetProcAddress(libavrt, "AvSetMmThreadCharacteristicsW");
|
|
|
- pAvRevertMmThreadCharacteristics = (pfnAvRevertMmThreadCharacteristics) GetProcAddress(libavrt, "AvRevertMmThreadCharacteristics");
|
|
|
- }
|
|
|
- #endif
|
|
|
-
|
|
|
/* Set the function pointers */
|
|
|
impl->DetectDevices = WASAPI_DetectDevices;
|
|
|
impl->ThreadInit = WASAPI_ThreadInit;
|
|
|
impl->ThreadDeinit = WASAPI_ThreadDeinit;
|
|
|
+ impl->BeginLoopIteration = WASAPI_BeginLoopIteration;
|
|
|
impl->OpenDevice = WASAPI_OpenDevice;
|
|
|
impl->PlayDevice = WASAPI_PlayDevice;
|
|
|
impl->WaitDevice = WASAPI_WaitDevice;
|
Ryan C. Gordon