diff options
| author | Kevin Mitchell <kevmitch@gmail.com> | 2015-03-22 02:19:36 -0700 |
|---|---|---|
| committer | Kevin Mitchell <kevmitch@gmail.com> | 2015-03-26 05:33:57 -0700 |
| commit | 41c10c3ec2c8706841e72100d715e064d78e0cdb (patch) | |
| tree | 822b013bf012109065201d9fb75ee794eb8b3369 /audio/out/ao_wasapi.c | |
| parent | fb61858b630dacbb071d41b1286b94cde47f581d (diff) | |
| download | mpv-41c10c3ec2c8706841e72100d715e064d78e0cdb.tar.bz2 mpv-41c10c3ec2c8706841e72100d715e064d78e0cdb.tar.xz | |
ao/wasapi: rewrite format search
More clearly separate the exclusive and shared mode format discovery.
Make the exclusive mode search more systematic in particular about
channel maps (i.e., use chmap_sel). Assume that the same sample format
/ sample rates work for all channels to narrow the search space.
Diffstat (limited to 'audio/out/ao_wasapi.c')
| -rw-r--r-- | audio/out/ao_wasapi.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/audio/out/ao_wasapi.c b/audio/out/ao_wasapi.c index 75318c22ee..fb045d1858 100644 --- a/audio/out/ao_wasapi.c +++ b/audio/out/ao_wasapi.c @@ -248,13 +248,6 @@ static int init(struct ao *ao) MP_DBG(ao, "Init wasapi\n"); CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - ao->format = af_fmt_from_planar(ao->format); - struct mp_chmap_sel sel = {0}; - mp_chmap_sel_add_waveext(&sel); - if (!ao_chmap_sel_adjust(ao, &sel, &ao->channels)) { - MP_ERR(ao, "Error adjusting channel map to waveext channel order\n"); - return -1; - } struct wasapi_state *state = (struct wasapi_state *)ao->priv; state->log = ao->log; if(!wasapi_fill_VistaBlob(state)) |