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_sdl.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_sdl.c')
-rw-r--r-- | audio/out/ao_sdl.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/audio/out/ao_sdl.c b/audio/out/ao_sdl.c index 4235a7c26c..6678cd3bd3 100644 --- a/audio/out/ao_sdl.c +++ b/audio/out/ao_sdl.c @@ -160,6 +160,13 @@ static int init(struct ao *ao, char *params) return -1; } + struct mp_chmap_sel sel = {0}; + mp_chmap_sel_add_waveext_def(&sel); + if (!ao_chmap_sel_adjust(ao, &sel, &ao->channels)) { + uninit(ao, true); + return -1; + } + SDL_AudioSpec desired, obtained; int bytes = 0; @@ -236,9 +243,12 @@ static int init(struct ao *ao, char *params) return -1; } + if (!ao_chmap_sel_get_def(ao, &sel, &ao->channels, obtained.channels)) { + uninit(ao, true); + return -1; + } + ao->samplerate = obtained.freq; - mp_chmap_from_channels(&ao->channels, obtained.channels); - mp_chmap_reorder_to_alsa(&ao->channels); ao->bps = ao->channels.num * ao->samplerate * bytes; ao->buffersize = obtained.size * bufcnt; ao->outburst = obtained.size; |