mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 13:16:41 +00:00
alsa-lib: cleanup Amlogic card confs
This commit is contained in:
Christian Hewitt
parent
af1286699c
commit
d26da2d24f
@ -1,7 +1,7 @@
|
||||
From 34dbf4272c3036a7e8b208ad8dc35a035918af66 Mon Sep 17 00:00:00 2001
|
||||
From: chewitt <christianshewitt@gmail.com>
|
||||
Date: Thu, 14 May 2020 13:31:34 +0000
|
||||
Subject: [PATCH 1/3] WIP: add confs for gx-sound-card and axg-sound-card
|
||||
Subject: [PATCH 1/2] WIP: add confs for gx-sound-card and axg-sound-card
|
||||
|
||||
---
|
||||
src/conf/cards/axg-sound-card.conf | 87 ++++++++++++++++++++++++++++++
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 2891f697cbfea4f0bf60bc476e78ab25947ac810 Mon Sep 17 00:00:00 2001
|
||||
From: chewitt <christianshewitt@gmail.com>
|
||||
Date: Fri, 15 May 2020 06:12:43 +0000
|
||||
Subject: [PATCH 2/3] WIP: add Amlogic cards to Makefile.am
|
||||
Subject: [PATCH 2/2] WIP: add Amlogic cards to Makefile.am
|
||||
|
||||
---
|
||||
src/conf/cards/Makefile.am | 2 ++
|
||||
|
||||
@ -1,219 +0,0 @@
|
||||
From de0491bc0c62422a9eb018bcfdefeae2eba5dbe8 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Mon, 18 Oct 2021 03:33:58 +0000
|
||||
Subject: [PATCH 3/3] WIP: add analogue surrounds to confs
|
||||
|
||||
---
|
||||
src/conf/cards/axg-sound-card.conf | 92 ++++++++++++++++++++++++++++++
|
||||
src/conf/cards/gx-sound-card.conf | 92 ++++++++++++++++++++++++++++++
|
||||
2 files changed, 184 insertions(+)
|
||||
|
||||
diff --git a/src/conf/cards/axg-sound-card.conf b/src/conf/cards/axg-sound-card.conf
|
||||
index f3caaed0..eb7201e7 100644
|
||||
--- a/src/conf/cards/axg-sound-card.conf
|
||||
+++ b/src/conf/cards/axg-sound-card.conf
|
||||
@@ -25,6 +25,98 @@ axg-sound-card.pcm.default {
|
||||
}
|
||||
}
|
||||
|
||||
+<confdir:pcm/front.conf>
|
||||
+
|
||||
+axg-sound-card.pcm.front.0 cards.axg-sound-card.pcm.default
|
||||
+
|
||||
+# The mapping of ALSA channels to surround channels is very imprecise.
|
||||
+# ALSA uses a different terminology and speaker placement to the CEA
|
||||
+# surround positioning. CEA has the positioning of:
|
||||
+#
|
||||
+# LFE
|
||||
+# FL FLC FC FRC FR
|
||||
+#
|
||||
+# RL RLC RC RRC RR
|
||||
+#
|
||||
+# ALSA's idea is:
|
||||
+#
|
||||
+# LFE
|
||||
+# FL C FR
|
||||
+#
|
||||
+# SL SR
|
||||
+#
|
||||
+# RL RR
|
||||
+#
|
||||
+# We do our best to map between these representations.
|
||||
+
|
||||
+<confdir:pcm/surround40.conf>
|
||||
+
|
||||
+axg-sound-card.pcm.surround40.0 {
|
||||
+ @args [ CARD ]
|
||||
+ @args.CARD { type string }
|
||||
+ type empty
|
||||
+ slave.pcm {
|
||||
+ @func refer
|
||||
+ name {
|
||||
+ @func concat strings [
|
||||
+ "cards.axg-sound-card.pcm.default:CARD="
|
||||
+ $CARD
|
||||
+ ]
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+<confdir:pcm/surround41.conf>
|
||||
+<confdir:pcm/surround50.conf>
|
||||
+<confdir:pcm/surround51.conf>
|
||||
+
|
||||
+axg-sound-card.pcm.surround51.0 {
|
||||
+ @args [ CARD ]
|
||||
+ @args.CARD { type string }
|
||||
+ type route
|
||||
+ slave.pcm {
|
||||
+ @func refer
|
||||
+ name {
|
||||
+ @func concat strings [
|
||||
+ "cards.axg-sound-card.pcm.default:CARD="
|
||||
+ $CARD
|
||||
+ ]
|
||||
+ }
|
||||
+ }
|
||||
+ ttable.0.0 1.0 # FL -> slave 0 -> hdmi 0 FL
|
||||
+ ttable.1.1 1.0 # FR -> slave 1 -> hdmi 1 FR
|
||||
+ ttable.2.4 1.0 # RL -> slave 4 -> hdmi 4 RL
|
||||
+ ttable.3.5 1.0 # RR -> slave 5 -> hdmi 5 RR
|
||||
+ ttable.4.3 1.0 # C -> slave 3 -> hdmi 3 FC
|
||||
+ ttable.5.2 1.0 # LFE -> slave 2 -> hdmi 2 LFE
|
||||
+}
|
||||
+
|
||||
+<confdir:pcm/surround71.conf>
|
||||
+
|
||||
+axg-sound-card.pcm.surround71.0 {
|
||||
+ @args [ CARD ]
|
||||
+ @args.CARD { type string }
|
||||
+ type route
|
||||
+ slave.pcm {
|
||||
+ @func refer
|
||||
+ name {
|
||||
+ @func concat strings [
|
||||
+ "cards.axg-sound-card.pcm.default:CARD="
|
||||
+ $CARD
|
||||
+ ]
|
||||
+ }
|
||||
+ }
|
||||
+ slave.channels 8
|
||||
+ ttable.0.0 1.0 # FL -> slave 0 -> hdmi 0 FL
|
||||
+ ttable.1.1 1.0 # FR -> slave 1 -> hdmi 1 FR
|
||||
+ ttable.2.6 1.0 # RL -> slave 6 -> hdmi 6 RLC/FLC
|
||||
+ ttable.3.7 1.0 # RR -> slave 7 -> hdmi 7 RRC/FRC
|
||||
+ ttable.4.3 1.0 # C -> slave 3 -> hdmi 3 FC
|
||||
+ ttable.5.2 1.0 # LFE -> slave 2 -> hdmi 2 LFE
|
||||
+ ttable.6.4 1.0 # SL -> slave 4 -> hdmi 4 RL
|
||||
+ ttable.7.5 1.0 # SR -> slave 5 -> hdmi 5 RR
|
||||
+}
|
||||
+
|
||||
<confdir:pcm/hdmi.conf>
|
||||
|
||||
axg-sound-card.pcm.hdmi.0 {
|
||||
diff --git a/src/conf/cards/gx-sound-card.conf b/src/conf/cards/gx-sound-card.conf
|
||||
index b669a260..e0662054 100644
|
||||
--- a/src/conf/cards/gx-sound-card.conf
|
||||
+++ b/src/conf/cards/gx-sound-card.conf
|
||||
@@ -25,6 +25,98 @@ gx-sound-card.pcm.default {
|
||||
}
|
||||
}
|
||||
|
||||
+<confdir:pcm/front.conf>
|
||||
+
|
||||
+gx-sound-card.pcm.front.0 cards.gx-sound-card.pcm.default
|
||||
+
|
||||
+# The mapping of ALSA channels to surround channels is very imprecise.
|
||||
+# ALSA uses a different terminology and speaker placement to the CEA
|
||||
+# surround positioning. CEA has the positioning of:
|
||||
+#
|
||||
+# LFE
|
||||
+# FL FLC FC FRC FR
|
||||
+#
|
||||
+# RL RLC RC RRC RR
|
||||
+#
|
||||
+# ALSA's idea is:
|
||||
+#
|
||||
+# LFE
|
||||
+# FL C FR
|
||||
+#
|
||||
+# SL SR
|
||||
+#
|
||||
+# RL RR
|
||||
+#
|
||||
+# We do our best to map between these representations.
|
||||
+
|
||||
+<confdir:pcm/surround40.conf>
|
||||
+
|
||||
+gx-sound-card.pcm.surround40.0 {
|
||||
+ @args [ CARD ]
|
||||
+ @args.CARD { type string }
|
||||
+ type empty
|
||||
+ slave.pcm {
|
||||
+ @func refer
|
||||
+ name {
|
||||
+ @func concat strings [
|
||||
+ "cards.gx-sound-card.pcm.default:CARD="
|
||||
+ $CARD
|
||||
+ ]
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+<confdir:pcm/surround41.conf>
|
||||
+<confdir:pcm/surround50.conf>
|
||||
+<confdir:pcm/surround51.conf>
|
||||
+
|
||||
+gx-sound-card.pcm.surround51.0 {
|
||||
+ @args [ CARD ]
|
||||
+ @args.CARD { type string }
|
||||
+ type route
|
||||
+ slave.pcm {
|
||||
+ @func refer
|
||||
+ name {
|
||||
+ @func concat strings [
|
||||
+ "cards.gx-sound-card.pcm.default:CARD="
|
||||
+ $CARD
|
||||
+ ]
|
||||
+ }
|
||||
+ }
|
||||
+ ttable.0.0 1.0 # FL -> slave 0 -> hdmi 0 FL
|
||||
+ ttable.1.1 1.0 # FR -> slave 1 -> hdmi 1 FR
|
||||
+ ttable.2.4 1.0 # RL -> slave 4 -> hdmi 4 RL
|
||||
+ ttable.3.5 1.0 # RR -> slave 5 -> hdmi 5 RR
|
||||
+ ttable.4.3 1.0 # C -> slave 3 -> hdmi 3 FC
|
||||
+ ttable.5.2 1.0 # LFE -> slave 2 -> hdmi 2 LFE
|
||||
+}
|
||||
+
|
||||
+<confdir:pcm/surround71.conf>
|
||||
+
|
||||
+gx-sound-card.pcm.surround71.0 {
|
||||
+ @args [ CARD ]
|
||||
+ @args.CARD { type string }
|
||||
+ type route
|
||||
+ slave.pcm {
|
||||
+ @func refer
|
||||
+ name {
|
||||
+ @func concat strings [
|
||||
+ "cards.gx-sound-card.pcm.default:CARD="
|
||||
+ $CARD
|
||||
+ ]
|
||||
+ }
|
||||
+ }
|
||||
+ slave.channels 8
|
||||
+ ttable.0.0 1.0 # FL -> slave 0 -> hdmi 0 FL
|
||||
+ ttable.1.1 1.0 # FR -> slave 1 -> hdmi 1 FR
|
||||
+ ttable.2.6 1.0 # RL -> slave 6 -> hdmi 6 RLC/FLC
|
||||
+ ttable.3.7 1.0 # RR -> slave 7 -> hdmi 7 RRC/FRC
|
||||
+ ttable.4.3 1.0 # C -> slave 3 -> hdmi 3 FC
|
||||
+ ttable.5.2 1.0 # LFE -> slave 2 -> hdmi 2 LFE
|
||||
+ ttable.6.4 1.0 # SL -> slave 4 -> hdmi 4 RL
|
||||
+ ttable.7.5 1.0 # SR -> slave 5 -> hdmi 5 RR
|
||||
+}
|
||||
+
|
||||
<confdir:pcm/hdmi.conf>
|
||||
|
||||
gx-sound-card.pcm.hdmi.0 {
|
||||
--
|
||||
2.17.1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user