diff options
author | wm4 <wm4@nowhere> | 2013-05-09 18:06:26 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-05-12 21:24:57 +0200 |
commit | ecc6e379b24dd5e37b864ae599a154880a2bd2d0 (patch) | |
tree | f439d10380a5f234b660cabb236470cabb1d4d0d /audio/out/ao_dsound.c | |
parent | ab8f28a672fbd8d21a98c265976068e80be082a7 (diff) | |
download | mpv-ecc6e379b24dd5e37b864ae599a154880a2bd2d0.tar.bz2 mpv-ecc6e379b24dd5e37b864ae599a154880a2bd2d0.tar.xz |
audio/out: channel map selection
Make all AOs use what has been introduced in the previous commit.
Note that even AOs which can handle all possible layouts (like ao_null)
use the new functions. This might be important if in the future
ao_select_champ() possibly honors global user options about downmixing
and so on.
Diffstat (limited to 'audio/out/ao_dsound.c')
-rw-r--r-- | audio/out/ao_dsound.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/audio/out/ao_dsound.c b/audio/out/ao_dsound.c index b096dd28db..967084d3ae 100644 --- a/audio/out/ao_dsound.c +++ b/audio/out/ao_dsound.c @@ -390,18 +390,14 @@ static int init(int rate, const struct mp_chmap *channels, int format, int flags DSBUFFERDESC dsbpridesc; DSBUFFERDESC dsbdesc; - //check if the channel count and format is supported in general - if (ao_data.channels.num > 8) { - // More than 8 channels might just work, but needs testing - UninitDirectSound(); - mp_msg(MSGT_AO, MSGL_ERR, "ao_dsound: > 8 channel audio not yet supported\n"); - return 0; - } - - if (AF_FORMAT_IS_AC3(format)) + if (AF_FORMAT_IS_AC3(format)) { format = AF_FORMAT_AC3_NE; - else - mp_chmap_reorder_to_waveext(&ao_data.channels); + } else { + struct mp_chmap_sel sel = {0}; + mp_chmap_sel_add_waveext(&sel); + if (!ao_chmap_sel_adjust(&ao_data, &sel, &ao_data.channels)) + return 0; + } switch(format){ case AF_FORMAT_AC3_NE: case AF_FORMAT_S24_LE: |