]> git.alsa-project.org Git - alsa-utils.git/commit
speaker-test: Fix chmap wav file selection.
authorArnaud Pouliquen <arnaud.pouliquen@st.com>
Wed, 7 Dec 2016 16:44:26 +0000 (17:44 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 7 Dec 2016 17:17:05 +0000 (18:17 +0100)
commit55421afe9c6af1b86159103650d0307b4120237f
tree56a16e44891d9f0bf653b796713acdab3df07f69
parentd24a60b7818fafddb3ad27cc05cda82636880f64
speaker-test: Fix chmap wav file selection.

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@st.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
speaker-test/speaker-test.c