a52: fix reported input channel order

a52 plugin expects the input to be in ALSA order and remaps it to general order when encoding. However it reports that the input it takes should be in general order.

This fix should make programs (e.g. mpv) that is aware of channel layout reported by ALSA remap sources appropriately before sending when necessary.

It should not cause any regression to programs (e.g. mplayer) that does not check the reported channel layout (hence not affected by the issue) and remaps sources anyway.

Signed-off-by: Tom Yan <tom.ty89@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/a52/pcm_a52.c b/a52/pcm_a52.c
index 4e4c5f77aa9234a52e8fc37675dd22b4d2e393b1..88529eb84ace855c463dd02d1479054d902eea7c 100644 (file)
--- a/a52/pcm_a52.c
+++ b/a52/pcm_a52.c
@@ -663,8 +663,8 @@ static unsigned int chmap4[4] = {
 };
 static unsigned int chmap6[6] = {
        SND_CHMAP_FL, SND_CHMAP_FR,
-       SND_CHMAP_FC, SND_CHMAP_LFE,
        SND_CHMAP_RL, SND_CHMAP_RR,
+       SND_CHMAP_FC, SND_CHMAP_LFE,
 };
 
 static snd_pcm_chmap_query_t **a52_query_chmaps(snd_pcm_ioplug_t *io ATTRIBUTE_UNUSED)