Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

ao/wasapi: use built in KSDATAFORMATs

Browse Source 
Rather than defining them ourselves. Thanks to rossy for figuring out
the headers.
This commit is contained in:
Kevin Mitchell
2015-03-27 16:09:22 -07:00
parent cfaa6e9155
commit 36d1b28849
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
audio/out/ao_wasapi_utils.c
View File

@@ -19,7 +19,9 @@
#include <math.h> #include <math.h>
#include <libavutil/common.h> #include <libavutil/common.h>
#include <initguid.h> #include <windows.h>
#include <ksguid.h>
#include <ksmedia.h>
#include <audioclient.h> #include <audioclient.h>
#include <endpointvolume.h> #include <endpointvolume.h>
#include <mmdeviceapi.h> #include <mmdeviceapi.h>
@@ -40,13 +42,6 @@ DEFINE_PROPERTYKEY(mp_PKEY_Device_DeviceDesc,
0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20,
0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 2); 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 2);
DEFINE_GUID(mp_KSDATAFORMAT_SUBTYPE_PCM,
0x00000001, 0x0000, 0x0010, 0x80, 0x00,
0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
DEFINE_GUID(mp_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT,
0x00000003, 0x0000, 0x0010, 0x80, 0x00,
0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
char *mp_GUID_to_str_buf(char *buf, size_t buf_size, const GUID *guid) char *mp_GUID_to_str_buf(char *buf, size_t buf_size, const GUID *guid)
{ {
snprintf(buf, buf_size, snprintf(buf, buf_size,
@@ -163,9 +158,9 @@ static void set_waveformat(WAVEFORMATEXTENSIBLE *wformat,
wformat->Format.wBitsPerSample = bits; wformat->Format.wBitsPerSample = bits;
wformat->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); wformat->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX);
if (is_float) { if (is_float) {
wformat->SubFormat = mp_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; wformat->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT;
} else { } else {
wformat->SubFormat = mp_KSDATAFORMAT_SUBTYPE_PCM; wformat->SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
} }
wformat->Samples.wValidBitsPerSample = valid_bits; wformat->Samples.wValidBitsPerSample = valid_bits;
wformat->dwChannelMask = mp_chmap_to_waveext(channels); wformat->dwChannelMask = mp_chmap_to_waveext(channels);
@@ -218,7 +213,7 @@ static bool waveformat_is_float(WAVEFORMATEX *wf)
case WAVE_FORMAT_EXTENSIBLE: case WAVE_FORMAT_EXTENSIBLE:
{ {
WAVEFORMATEXTENSIBLE *wformat = (WAVEFORMATEXTENSIBLE *)wf; WAVEFORMATEXTENSIBLE *wformat = (WAVEFORMATEXTENSIBLE *)wf;
return IsEqualGUID(&mp_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, &wformat->SubFormat); return IsEqualGUID(&KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, &wformat->SubFormat);
} }
case WAVE_FORMAT_IEEE_FLOAT: case WAVE_FORMAT_IEEE_FLOAT:
return true; return true;
@@ -233,7 +228,7 @@ static bool waveformat_is_pcm_int(WAVEFORMATEX *wf)
case WAVE_FORMAT_EXTENSIBLE: case WAVE_FORMAT_EXTENSIBLE:
{ {
WAVEFORMATEXTENSIBLE *wformat = (WAVEFORMATEXTENSIBLE *)wf; WAVEFORMATEXTENSIBLE *wformat = (WAVEFORMATEXTENSIBLE *)wf;
return IsEqualGUID(&mp_KSDATAFORMAT_SUBTYPE_PCM, &wformat->SubFormat); return IsEqualGUID(&KSDATAFORMAT_SUBTYPE_PCM, &wformat->SubFormat);
} }
case WAVE_FORMAT_PCM: case WAVE_FORMAT_PCM:
return true; return true;
@@ -551,7 +546,7 @@ static bool try_passthrough(struct ao *ao)
}, },
.Samples.wValidBitsPerSample = 16, .Samples.wValidBitsPerSample = 16,
.dwChannelMask = mp_chmap_to_waveext(&ao->channels), .dwChannelMask = mp_chmap_to_waveext(&ao->channels),
.SubFormat = mp_KSDATAFORMAT_SUBTYPE_PCM, .SubFormat = KSDATAFORMAT_SUBTYPE_PCM,
}; };
wformat.SubFormat.Data1 = WAVE_FORMAT_DOLBY_AC3_SPDIF; // see INIT_WAVEFORMATEX_GUID macro wformat.SubFormat.Data1 = WAVE_FORMAT_DOLBY_AC3_SPDIF; // see INIT_WAVEFORMATEX_GUID macro