[alsa-devel] [PATCH] speaker-test: Fix chmap wav file selection.

[Takashi Iwai]

On Wed, 07 Dec 2016 17:44:26 +0100,
Arnaud Pouliquen wrote:
> 
> The channel selection currently does not work properly when a channel
> map control is provided but no manual channel map was explicitly
> requested with "-m".
> 
> For example, the CEA/HDMI 6ch (surround 5.1) map is:
>  FL, FR, LFE, FC, RL, RR.
> 
> Tested command: speaker-test -D hdmi -c 6 -t wav
> 
> Speaker-test tries to play channels in this following order:
>  0 - Front Left
>  3 - Front Center
>  1 - Front Right
>  5 - Rear Right
>  4 - Rear Left
>  2 - LFE
> 
> But wav file played on associated speakers are not aligned. Here are
> the real files played:
>  0- /usr/share/sounds/alsa/Front_Left.wav => OK
>  3- /usr/share/sounds/alsa/Rear_Right.wav  => OK
>  1- /usr/share/sounds/alsa/Front_Right.wav  => OK
>  5- /usr/share/sounds/alsa/Rear_Center.wav => KO
>  4- found file /usr/share/sounds/alsa/Front_Center.wav => KO
>  2- /usr/share/sounds/alsa/Rear_Left.wav  => KO
> 
> Issue is that associated wav files ordering is reworked only if
> channel_map_set variable is set.
> 
> Fix consists in allowing wavs re-ordering if a channel mapping as been
> get or set, i.e. channel_map is not null.
> 
> Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen at st.com>

Applied, thanks.


Takashi