diff options
| author | wm4 <wm4@nowhere> | 2013-04-05 23:06:22 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-05-12 21:24:54 +0200 |
| commit | aea2328906fc754c0d0cdea57c60d71522ae99a5 (patch) | |
| tree | b57c9ebbfa2a787a16ff90fdd97e2de7f6a420f8 /audio/out/ao_portaudio.c | |
| parent | 37325f2796afd914ee729cafc3a1624f333a9ae7 (diff) | |
| download | mpv-aea2328906fc754c0d0cdea57c60d71522ae99a5.tar.bz2 mpv-aea2328906fc754c0d0cdea57c60d71522ae99a5.tar.xz | |
audio/out: switch to channel map
This actually breaks audio for 5/6/8 channels. There's no reordering
done yet. The actual reordering will be done inside of af_lavrresample
and has to be made part of the format negotiation.
Diffstat (limited to 'audio/out/ao_portaudio.c')
| -rw-r--r-- | audio/out/ao_portaudio.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/audio/out/ao_portaudio.c b/audio/out/ao_portaudio.c index b0744e8f8a..0141e4796d 100644 --- a/audio/out/ao_portaudio.c +++ b/audio/out/ao_portaudio.c @@ -273,9 +273,11 @@ static int init(struct ao *ao, char *params) if (pa_device == paNoDevice) goto error_exit; + mp_chmap_reorder_to_alsa(&ao->channels); + PaStreamParameters sp = { .device = pa_device, - .channelCount = ao->channels, + .channelCount = ao->channels.num, .suggestedLatency = Pa_GetDeviceInfo(pa_device)->defaultHighOutputLatency, }; @@ -298,7 +300,7 @@ static int init(struct ao *ao, char *params) ao->format = fmt->mp_format; sp.sampleFormat = fmt->pa_format; - priv->framelen = ao->channels * (af_fmt2bits(ao->format) / 8); + priv->framelen = ao->channels.num * (af_fmt2bits(ao->format) / 8); ao->bps = ao->samplerate * priv->framelen; if (!check_pa_ret(Pa_IsFormatSupported(NULL, &sp, ao->samplerate))) |