Takashi Iwai
62cc03c4bc
- Update alsa-info.sh to match dmesg with snd_ - Run spec-cleaner - Add missing Loopback.conf manually - Upstream fixes: minor clean ups, 2.1 PCM channel config support, portability improvements, PCM float format conversion fix, fix for ioplug 32bit hwptr wrap, etc. 0020-minor-malloc-changes.patch 0021-alsa-lib-minor-typo-in-pcm-doc.patch 0022-control_hw-fix-potential-memory-leak.patch 0023-pcm-initialize-pcm_dmix-monotonic-field.patch 0024-pcm-initialize-monotonic-field-for-dshare-and-dsnoop.patch 0025-pcm-use-CLOCK_REALTIME-for-non-monotonic-ts.patch 0026-alsa-lib-heavy-pcm-atomics-cleanup.patch 0027-conf-Add-basic-infrastructure-for-2.1-surround-sound.patch 0028-conf-Add-surround-2.1-support-to-all-cards.patch 0029-Portability-fix-look-for-sys-endian.h-as-well-as-end.patch 0030-autotools-update-style.patch 0031-pcm-Insert-linear-to-float-conversion-when-rate-or-c.patch 0032-pcm-route-Allow-chmap-syntax-for-slave-channels-in-t.patch 0033-pcm-route-Select-slave-chmap-based-on-ttable-informa.patch 0034-conf-Allow-2.1-surround-to-use-different-number-of-c.patch 0035-pcm-Wrap-hw_ptr-to-boundary-in-pcm_ioplug.patch 0036-src-conf-cards-Add-missing-entry-for-Loopback.conf.patch OBS-URL: https://build.opensuse.org/request/show/225572 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=152
120 lines
3.1 KiB
Diff
120 lines
3.1 KiB
Diff
From 57b5076c30b3453ee843912c0aeb3df8dbee3f68 Mon Sep 17 00:00:00 2001
|
|
From: David Henningsson <david.henningsson@canonical.com>
|
|
Date: Tue, 18 Feb 2014 16:41:48 +0100
|
|
Subject: [PATCH] conf: Add basic infrastructure for 2.1 surround sound
|
|
|
|
For now, we do 2.1 over 5.1, because that's what ALSA allows per default.
|
|
|
|
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
src/conf/alsa.conf | 3 +++
|
|
src/conf/pcm/Makefile.am | 2 +-
|
|
src/conf/pcm/surround21.conf | 62 ++++++++++++++++++++++++++++++++++++++++++++
|
|
3 files changed, 66 insertions(+), 1 deletion(-)
|
|
create mode 100644 src/conf/pcm/surround21.conf
|
|
|
|
diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf
|
|
index bc91df3b93a5..5c928e8afbcd 100644
|
|
--- a/src/conf/alsa.conf
|
|
+++ b/src/conf/alsa.conf
|
|
@@ -90,6 +90,8 @@ defaults.pcm.center_lfe.card defaults.pcm.card
|
|
defaults.pcm.center_lfe.device defaults.pcm.device
|
|
defaults.pcm.side.card defaults.pcm.card
|
|
defaults.pcm.side.device defaults.pcm.device
|
|
+defaults.pcm.surround21.card defaults.pcm.card
|
|
+defaults.pcm.surround21.device defaults.pcm.device
|
|
defaults.pcm.surround40.card defaults.pcm.card
|
|
defaults.pcm.surround40.device defaults.pcm.device
|
|
defaults.pcm.surround41.card defaults.pcm.card
|
|
@@ -131,6 +133,7 @@ pcm.front cards.pcm.front
|
|
pcm.rear cards.pcm.rear
|
|
pcm.center_lfe cards.pcm.center_lfe
|
|
pcm.side cards.pcm.side
|
|
+pcm.surround21 cards.pcm.surround21
|
|
pcm.surround40 cards.pcm.surround40
|
|
pcm.surround41 cards.pcm.surround41
|
|
pcm.surround50 cards.pcm.surround50
|
|
diff --git a/src/conf/pcm/Makefile.am b/src/conf/pcm/Makefile.am
|
|
index cc3286e6ddf0..c548660d1696 100644
|
|
--- a/src/conf/pcm/Makefile.am
|
|
+++ b/src/conf/pcm/Makefile.am
|
|
@@ -1,5 +1,5 @@
|
|
cfg_files = default.conf front.conf rear.conf center_lfe.conf side.conf\
|
|
- surround40.conf surround41.conf \
|
|
+ surround21.conf surround40.conf surround41.conf \
|
|
surround50.conf surround51.conf \
|
|
surround71.conf iec958.conf hdmi.conf modem.conf \
|
|
dmix.conf dsnoop.conf \
|
|
diff --git a/src/conf/pcm/surround21.conf b/src/conf/pcm/surround21.conf
|
|
new file mode 100644
|
|
index 000000000000..be29020f24c7
|
|
--- /dev/null
|
|
+++ b/src/conf/pcm/surround21.conf
|
|
@@ -0,0 +1,62 @@
|
|
+#
|
|
+# Hardware output from 2.1 speakers.
|
|
+# Samples must be positioned:
|
|
+# chn0 - front left
|
|
+# chn1 - front right
|
|
+# chn2 - LFE
|
|
+#
|
|
+
|
|
+pcm.!surround21 {
|
|
+ @args [ CARD DEV ]
|
|
+ @args.CARD {
|
|
+ type string
|
|
+ default {
|
|
+ @func getenv
|
|
+ vars [
|
|
+ ALSA_SURROUND21_CARD
|
|
+ ALSA_PCM_CARD
|
|
+ ALSA_CARD
|
|
+ ]
|
|
+ default {
|
|
+ @func refer
|
|
+ name defaults.pcm.surround21.card
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ @args.DEV {
|
|
+ type integer
|
|
+ default {
|
|
+ @func igetenv
|
|
+ vars [
|
|
+ ALSA_SURROUND21_DEVICE
|
|
+ ]
|
|
+ default {
|
|
+ @func refer
|
|
+ name defaults.pcm.surround21.device
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ type route
|
|
+ slave.pcm {
|
|
+ @func refer
|
|
+ name {
|
|
+ @func concat
|
|
+ strings [
|
|
+ "cards."
|
|
+ {
|
|
+ @func card_driver
|
|
+ card $CARD
|
|
+ }
|
|
+ ".pcm.surround51." $DEV ":CARD=" $CARD
|
|
+ ]
|
|
+ }
|
|
+ }
|
|
+ slave.channels 6
|
|
+ ttable.0.0 1
|
|
+ ttable.1.1 1
|
|
+ ttable.2.5 1
|
|
+ hint {
|
|
+ description "2.1 Surround output to Front and Subwoofer speakers"
|
|
+ device $DEV
|
|
+ }
|
|
+}
|
|
--
|
|
1.9.0
|
|
|