RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-09 16:37:24 +00:00
Code Issues Releases Wiki Activity

ao/wasapi: make sure that < 16-bit pcm never happens

Browse Source 
it just sucks. noone should have to listen to that.
This commit is contained in:
Kevin Mitchell 2014-12-01 00:38:59 -08:00
parent 9a0b97d214
commit 96fa3ebd1a
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
audio/out/ao_wasapi_utils.c
View File

@ -21,6 +21,7 @@
#define _WIN32_WINNT 0x600 #define _WIN32_WINNT 0x600
#include <math.h> #include <math.h>
#include <libavutil/common.h>
#include <initguid.h> #include <initguid.h>
#include <audioclient.h> #include <audioclient.h>
#include <endpointvolume.h> #include <endpointvolume.h>
@ -210,6 +211,12 @@ static bool set_ao_format(struct ao *ao,
WAVEFORMATEXTENSIBLE wformat) WAVEFORMATEXTENSIBLE wformat)
{ {
struct wasapi_state *state = (struct wasapi_state *)ao->priv; struct wasapi_state *state = (struct wasapi_state *)ao->priv;
// explicitly disallow 8 bits - this will catch if the
// closestMatch returned by IsFormatSupported in try_format below returns
// a bit depth of less than 16
if (wformat.Format.wBitsPerSample < 16)
return false;
bool is_float = bool is_float =
!mp_GUID_compare(&mp_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, &wformat.SubFormat); !mp_GUID_compare(&mp_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, &wformat.SubFormat);
@ -240,6 +247,13 @@ static bool try_format(struct ao *ao,
const struct mp_chmap channels) const struct mp_chmap channels)
{ {
struct wasapi_state *state = (struct wasapi_state *)ao->priv; struct wasapi_state *state = (struct wasapi_state *)ao->priv;
/* If for some reason we get 8-bits, try 16-bit equivalent instead.
This can happen if 8-bits is initially requested in ao->format
or in the unlikely event that GetMixFormat return 8-bits.
If someone with a "vintage" sound card or something complains
this can be reconsidered */
bits = FFMAX(16, bits);
WAVEFORMATEXTENSIBLE wformat; WAVEFORMATEXTENSIBLE wformat;
set_format(&wformat, bits / 8, samplerate, channels.num, mp_chmap_to_waveext(&channels)); set_format(&wformat, bits / 8, samplerate, channels.num, mp_chmap_to_waveext(&channels));
@ -346,13 +360,9 @@ static bool find_formats(struct ao *ao)
/* See if the format works as-is */ /* See if the format works as-is */
int bits = af_fmt2bits(ao->format); int bits = af_fmt2bits(ao->format);
/* don't try 8bits -- there are various 8bit modes other than PCM (*-law et al); if (try_format(ao, bits, ao->samplerate, ao->channels))
let's just stick to PCM or float here. */
if (bits == 8) {
bits = 16;
} else if (try_format(ao, bits, ao->samplerate, ao->channels)) {
return true; return true;
}
if (!state->opt_exclusive) { if (!state->opt_exclusive) {
/* shared mode, we can use the system default mix format. */ /* shared mode, we can use the system default mix format. */
if (try_mix_format(ao)) { if (try_mix_format(ao)) {