提交 94908a39 编写于 作者: A Anssi Hannula 提交者: Takashi Iwai

ALSA: hda - hdmi: Use TFx channel positions instead of FxH

Channel map positions FLH, FCH, FRH duplicate positions TFL, TFC, TFR.
Both are the speakers above the front speakers (CEA uses "high" and USB
audio uses "top" nomenclature).

Since the USB audio code has used the TFx positions since v3.8
(04324ccc, "ALSA: usb-audio: add channel map support") but the HDMI
code only just started using FxH in a5b7d510 ("ALSA: hda -
hdmi: Fix channel maps with less common speakers") which is not yet in
any released kernel, standardize on TFx instead.
Signed-off-by: NAnssi Hannula <anssi.hannula@iki.fi>
Signed-off-by: NTakashi Iwai <tiwai@suse.de>
上级 a522409e
...@@ -763,12 +763,12 @@ static struct channel_map_table map_tables[] = { ...@@ -763,12 +763,12 @@ static struct channel_map_table map_tables[] = {
{ SNDRV_CHMAP_RC, RC }, { SNDRV_CHMAP_RC, RC },
{ SNDRV_CHMAP_FLC, FLC }, { SNDRV_CHMAP_FLC, FLC },
{ SNDRV_CHMAP_FRC, FRC }, { SNDRV_CHMAP_FRC, FRC },
{ SNDRV_CHMAP_FLH, FLH }, { SNDRV_CHMAP_TFL, FLH },
{ SNDRV_CHMAP_FRH, FRH }, { SNDRV_CHMAP_TFR, FRH },
{ SNDRV_CHMAP_FLW, FLW }, { SNDRV_CHMAP_FLW, FLW },
{ SNDRV_CHMAP_FRW, FRW }, { SNDRV_CHMAP_FRW, FRW },
{ SNDRV_CHMAP_TC, TC }, { SNDRV_CHMAP_TC, TC },
{ SNDRV_CHMAP_FCH, FCH }, { SNDRV_CHMAP_TFC, FCH },
{} /* terminator */ {} /* terminator */
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册