ALSA: usb-audio: Correct surround channels in UAC1 channel map

USB-audio driver puts SNDRV_CHMAP_SL and _SR as left and right
surround channels for UAC1 channel map, respectively.  But they should
have been SNDRV_CHMAP_RL and _RR; the current value *_SL and _SR are
rather "side" channels, not "surround".  I guess I took those
mistakenly when I read the spec mentioning "surround left".

This patch corrects those entries to be the right channels.

Suggested-by: Sylvain BERTRAND <[email protected]>
Closes: https://lore.kernel.orgZ/qIyJD8lhd8hFhlC@freedom
Fixes: 04324ccc75f9 ("ALSA: usb-audio: add channel map support")
Cc: <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Takashi Iwai <[email protected]>

diff --git a/sound/usb/stream.c b/sound/usb/stream.c
index d5409f3879455961182713d24327836219e73457..e14c725acebf2c1dbf69f56b421081a3beb1b1cb 100644 (file)
--- a/sound/usb/stream.c
+++ b/sound/usb/stream.c
@@ -244,8 +244,8 @@ static struct snd_pcm_chmap_elem *convert_chmap(int channels, unsigned int bits,
                SNDRV_CHMAP_FR,         /* right front */
                SNDRV_CHMAP_FC,         /* center front */
                SNDRV_CHMAP_LFE,        /* LFE */
-               SNDRV_CHMAP_SL,         /* left surround */
-               SNDRV_CHMAP_SR,         /* right surround */
+               SNDRV_CHMAP_RL,         /* left surround */
+               SNDRV_CHMAP_RR,         /* right surround */
                SNDRV_CHMAP_FLC,        /* left of center */
                SNDRV_CHMAP_FRC,        /* right of center */
                SNDRV_CHMAP_RC,         /* surround */