RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-24 08:33:34 +00:00
Code Issues Releases Wiki Activity

ao_jack: remove "alsa" std-channel-layout choice

Browse Source 
Same deal as with previous commit. "waveext" is less arbitrary and at
least supports 3/7 channels.
This commit is contained in:
wm4 2015-11-07 15:20:34 +01:00
parent 5a7c22a1ac
commit a7f51f8fd4
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
DOCS/man/ao.rst
View File

@ -139,16 +139,13 @@ Available audio output drivers are:
Automatically create connections to output ports (default: enabled). Automatically create connections to output ports (default: enabled).
When enabled, the maximum number of output channels will be limited to When enabled, the maximum number of output channels will be limited to
the number of available output ports. the number of available output ports.
``std-channel-layout=alsa|waveext|any`` ``std-channel-layout=waveext|any``
Select the standard channel layout (default: alsa). JACK itself has no Select the standard channel layout (default: waveext). JACK itself has no
notion of channel layouts (i.e. assigning which speaker a given notion of channel layouts (i.e. assigning which speaker a given
channel is supposed to map to) - it just takes whatever the application channel is supposed to map to) - it just takes whatever the application
outputs, and reroutes it to whatever the user defines. This means the outputs, and reroutes it to whatever the user defines. This means the
user and the application are in charge of dealing with the channel user and the application are in charge of dealing with the channel
layout. ``alsa`` uses the old MPlayer layout, which is inspired by layout. ``waveext`` uses WAVE_FORMAT_EXTENSIBLE order, which, even
ALSA's standard layouts. In this mode, ao_jack will refuse to play 3
or 7 channels (because these do not really have a defined meaning in
MPlayer). ``waveext`` uses WAVE_FORMAT_EXTENSIBLE order, which, even
though it was defined by Microsoft, is the standard on many systems. though it was defined by Microsoft, is the standard on many systems.
The value ``any`` makes JACK accept whatever comes from the audio The value ``any`` makes JACK accept whatever comes from the audio
filter chain, regardless of channel layout and without reordering. This filter chain, regardless of channel layout and without reordering. This

6
audio/out/ao_jack.c
View File

@ -162,10 +162,6 @@ static int init(struct ao *ao)
mp_chmap_sel_add_waveext(&sel); mp_chmap_sel_add_waveext(&sel);
break; break;
case 1:
mp_chmap_sel_add_alsa_def(&sel);
break;
default: default:
mp_chmap_sel_add_any(&sel); mp_chmap_sel_add_any(&sel);
} }
@ -236,7 +232,7 @@ const struct ao_driver audio_out_jack = {
OPT_FLAG("autostart", autostart, 0), OPT_FLAG("autostart", autostart, 0),
OPT_FLAG("connect", connect, 0), OPT_FLAG("connect", connect, 0),
OPT_CHOICE("std-channel-layout", stdlayout, 0, OPT_CHOICE("std-channel-layout", stdlayout, 0,
({"waveext", 0}, {"alsa", 1}, {"any", 2})), ({"waveext", 0}, {"any", 1})),
{0} {0}
}, },
}; };