From patchwork Sun Jan 17 13:44:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Yan X-Patchwork-Id: 8050571 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0A3119F859 for ; Sun, 17 Jan 2016 13:44:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6E89620295 for ; Sun, 17 Jan 2016 13:44:39 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 474B120263 for ; Sun, 17 Jan 2016 13:44:35 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 35E3F26067F; Sun, 17 Jan 2016 14:44:33 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 7EE0426047B; Sun, 17 Jan 2016 14:44:28 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 20826260481; Sun, 17 Jan 2016 14:44:27 +0100 (CET) Received: from mail-pa0-f42.google.com (mail-pa0-f42.google.com [209.85.220.42]) by alsa0.perex.cz (Postfix) with ESMTP id 6AA2B260438; Sun, 17 Jan 2016 14:44:22 +0100 (CET) Received: by mail-pa0-f42.google.com with SMTP id uo6so404927159pac.1; Sun, 17 Jan 2016 05:44:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:from:to:cc:subject:date; bh=d6nwUfQueGVMWTSTmK19el9KX1pZou84tW/2qUOz6CA=; b=ZcHy8g9PUjOVW9YV2+skQPKOsBRtZxQjmJiF7faXNbN4Z6i/ui1x7T7VD6SmapKNlR uYTld1LI/DZNSMV9H5Fxk8R0uipq5HvVWcBFoO5YbJWSv6fN57h7yC0Tf5txm9RnTIEH CGuCMBWlX8XJ0zvKcTIgJMWMn02Lw/NV1nxTVyeGT6GmpyF02khDWPCstAsYZ8CH3Ywh BmBwtEFmSNqoHJldChjvjkzW5BNMECfeaGjZnj8m8FNk3bmYHLsNoF2XPfYmzpaIebKG uGD86/SPALnYrCj7yKFwfFZuUODfEsm+j9E3YtPbwhBsz+OkEsISOPT0MZjzGqcY0whl RBWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:from:to:cc:subject:date; bh=d6nwUfQueGVMWTSTmK19el9KX1pZou84tW/2qUOz6CA=; b=k7ODzw/FxLQmXcet09BT8IyHlEUDx4c0CZ/vO/PgvI48DE76EZv7PeKVcjBYU6CSr4 kxyPkc+lcH+xaboCvDxpejmaauVfKi0hc4IDb/pYlbgOpDar+GB8LB3pm/uyMvA+LFAf jtJ9pPK/ElHbe6OuQIkpJGki7NuwB0HCoQzsj4wx1m4XhggkNhbbyOsL2gXDyUCCOCTP Yf2M9vxeLLITyfjzqmGObGKRNbo7+ODNd1HAJH0XhgsQoTW+GWaOGLVOFFTIbunwRjco es69dZaJIK1Rn4Wn6sXDJLoLF4uHnm6iYVj6svRNfNf5J4pr67NG6JqJ+vppVrXMc4vX aIYA== X-Gm-Message-State: ALoCoQkfzRaujIWziDQ/cN6JtEpVFvqxhiKlcavpE0iOhSuKc6OwBSIn2YEGqy34ci3bPbpYDziId8Z14AlVq1YKTRwx34Ykqw== X-Received: by 10.66.177.193 with SMTP id cs1mr29356088pac.132.1453038258559; Sun, 17 Jan 2016 05:44:18 -0800 (PST) Received: from localhost.localdomain (123202047244.ctinets.com. [123.202.47.244]) by smtp.gmail.com with ESMTPSA id m86sm27426589pfi.27.2016.01.17.05.44.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 17 Jan 2016 05:44:18 -0800 (PST) Message-ID: <569b9ab2.d944620a.28b6f.ffffc25b@mx.google.com> X-Google-Original-Message-ID: <1453038246-5240-1-git-send-email-me> From: tom.ty89@gmail.com X-Google-Original-From: me To: patch@alsa-project.org Date: Sun, 17 Jan 2016 21:44:04 +0800 X-Mailer: git-send-email 2.7.0 Cc: alsa-devel@alsa-project.org, Tom Yan Subject: [alsa-devel] [PATCH - alsa-lib 1/3] add surround70 definition X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Tom Yan i see no reason not to add this if we are keeping surround50. adding it to all card confs that have surround71 definition. Signed-off-by: Tom Yan diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf index f22918f..2ea7cb0 100644 --- a/src/conf/alsa.conf +++ b/src/conf/alsa.conf @@ -100,6 +100,8 @@ defaults.pcm.surround50.card defaults.pcm.card defaults.pcm.surround50.device defaults.pcm.device defaults.pcm.surround51.card defaults.pcm.card defaults.pcm.surround51.device defaults.pcm.device +defaults.pcm.surround70.card defaults.pcm.card +defaults.pcm.surround70.device defaults.pcm.device defaults.pcm.surround71.card defaults.pcm.card defaults.pcm.surround71.device defaults.pcm.device defaults.pcm.iec958.card defaults.pcm.card @@ -138,6 +140,7 @@ pcm.surround40 cards.pcm.surround40 pcm.surround41 cards.pcm.surround41 pcm.surround50 cards.pcm.surround50 pcm.surround51 cards.pcm.surround51 +pcm.surround70 cards.pcm.surround70 pcm.surround71 cards.pcm.surround71 pcm.iec958 cards.pcm.iec958 pcm.spdif iec958 diff --git a/src/conf/cards/Audigy2.conf b/src/conf/cards/Audigy2.conf index cbec783..e4544a6 100644 --- a/src/conf/cards/Audigy2.conf +++ b/src/conf/cards/Audigy2.conf @@ -199,6 +199,7 @@ Audigy2.pcm.side.0 { + Audigy2.pcm.surround40.0 { @args [ CARD ] diff --git a/src/conf/cards/Aureon71.conf b/src/conf/cards/Aureon71.conf index a43ce2c..1f08b34 100644 --- a/src/conf/cards/Aureon71.conf +++ b/src/conf/cards/Aureon71.conf @@ -101,6 +101,7 @@ Aureon71.pcm.surround51.0 { channels 6 } + Aureon71.pcm.surround71.0 { diff --git a/src/conf/cards/CA0106.conf b/src/conf/cards/CA0106.conf index 2f0eaf0..c06adfc 100644 --- a/src/conf/cards/CA0106.conf +++ b/src/conf/cards/CA0106.conf @@ -112,6 +112,7 @@ CA0106.pcm.surround40.0 { + CA0106.pcm.surround51.0 { diff --git a/src/conf/cards/CMI8738-MC8.conf b/src/conf/cards/CMI8738-MC8.conf index ddff753..b74e476 100644 --- a/src/conf/cards/CMI8738-MC8.conf +++ b/src/conf/cards/CMI8738-MC8.conf @@ -142,6 +142,7 @@ CMI8738-MC8.pcm.surround51.0 { } } + CMI8738-MC8.pcm.surround71.0 { diff --git a/src/conf/cards/CMI8788.conf b/src/conf/cards/CMI8788.conf index edcb0c9..1d52512 100644 --- a/src/conf/cards/CMI8788.conf +++ b/src/conf/cards/CMI8788.conf @@ -63,6 +63,7 @@ CMI8788.pcm.surround51.0 { channels 6 } + CMI8788.pcm.surround71.0 { diff --git a/src/conf/cards/Echo_Echo3G.conf b/src/conf/cards/Echo_Echo3G.conf index 766f13f..4a29c4e 100644 --- a/src/conf/cards/Echo_Echo3G.conf +++ b/src/conf/cards/Echo_Echo3G.conf @@ -221,6 +221,62 @@ Echo_Echo3G.pcm.surround51.0 { ] } + +Echo_Echo3G.pcm.surround70.0 { + @args [ CARD ] + @args.CARD { + type string + } + type multi + slaves [ + { + pcm { + @func concat + strings [ + "cards.Echo_Echo3G.pcm.front.0:CARD=" $CARD + ] + } + channels 2 + } + { + pcm { + @func concat + strings [ + "cards.Echo_Echo3G.pcm.rear.0:CARD=" $CARD + ] + } + channels 2 + } + { + pcm { + @func concat + strings [ + "cards.Echo_Echo3G.pcm.center_lfe.0:CARD=" $CARD + ] + } + channels 2 + } + { + pcm { + @func concat + strings [ + "cards.Echo_Echo3G.pcm.side.0:CARD=" $CARD + ] + } + channels 2 + } + ] + bindings [ + { slave 0 channel 0 } + { slave 0 channel 1 } + { slave 1 channel 0 } + { slave 1 channel 1 } + { slave 2 channel 1 } + { slave 3 channel 0 } + { slave 3 channel 1 } + ] +} + Echo_Echo3G.pcm.surround71.0 { @args [ CARD ] diff --git a/src/conf/cards/HDA-Intel.conf b/src/conf/cards/HDA-Intel.conf index fa9f694..f04fae0 100644 --- a/src/conf/cards/HDA-Intel.conf +++ b/src/conf/cards/HDA-Intel.conf @@ -76,6 +76,7 @@ HDA-Intel.pcm.default { + HDA-Intel.pcm.surround40.0 cards.HDA-Intel.pcm.front.0 diff --git a/src/conf/cards/ICE1712.conf b/src/conf/cards/ICE1712.conf index db62684..16d793a 100644 --- a/src/conf/cards/ICE1712.conf +++ b/src/conf/cards/ICE1712.conf @@ -78,6 +78,7 @@ ICE1712.pcm.surround40.0 { + ICE1712.pcm.surround51.0 { diff --git a/src/conf/cards/ICE1724.conf b/src/conf/cards/ICE1724.conf index 61cac01..6072eab 100644 --- a/src/conf/cards/ICE1724.conf +++ b/src/conf/cards/ICE1724.conf @@ -121,6 +121,7 @@ ICE1724.pcm.surround51.0 { } } + ICE1724.pcm.surround71.0 { diff --git a/src/conf/cards/Loopback.conf b/src/conf/cards/Loopback.conf index 1ae6d45..ab76670 100644 --- a/src/conf/cards/Loopback.conf +++ b/src/conf/cards/Loopback.conf @@ -68,6 +68,7 @@ Loopback.pcm.default { + Loopback.pcm.surround40.0 cards.Loopback.pcm.front.0 diff --git a/src/conf/cards/NFORCE.conf b/src/conf/cards/NFORCE.conf index 64d1547..4ccf58e 100644 --- a/src/conf/cards/NFORCE.conf +++ b/src/conf/cards/NFORCE.conf @@ -172,6 +172,7 @@ NFORCE.pcm.surround51.0 { } } + NFORCE.pcm.surround71.0 { diff --git a/src/conf/cards/SB-XFi.conf b/src/conf/cards/SB-XFi.conf index eb2218b..25fe7b7 100644 --- a/src/conf/cards/SB-XFi.conf +++ b/src/conf/cards/SB-XFi.conf @@ -58,6 +58,7 @@ SB-XFi.pcm.side.0 { + SB-XFi.pcm.surround40.0 cards.SB-XFi.pcm.front.0 diff --git a/src/conf/cards/USB-Audio.conf b/src/conf/cards/USB-Audio.conf index e365f29..c8a21c5 100644 --- a/src/conf/cards/USB-Audio.conf +++ b/src/conf/cards/USB-Audio.conf @@ -364,6 +364,7 @@ USB-Audio.pcm.surround51.0 { } } + USB-Audio.pcm.surround71.0 { diff --git a/src/conf/pcm/Makefile.am b/src/conf/pcm/Makefile.am index c548660..b1f87fe 100644 --- a/src/conf/pcm/Makefile.am +++ b/src/conf/pcm/Makefile.am @@ -1,6 +1,6 @@ cfg_files = default.conf front.conf rear.conf center_lfe.conf side.conf\ surround21.conf surround40.conf surround41.conf \ - surround50.conf surround51.conf \ + surround50.conf surround51.conf surround70.conf \ surround71.conf iec958.conf hdmi.conf modem.conf \ dmix.conf dsnoop.conf \ dpl.conf diff --git a/src/conf/pcm/surround70.conf b/src/conf/pcm/surround70.conf new file mode 100644 index 0000000..482a7f7 --- /dev/null +++ b/src/conf/pcm/surround70.conf @@ -0,0 +1,69 @@ +# +# Hardware output from 7.0 speakers. +# Samples must be positioned: +# chn0 - front left +# chn1 - front right +# chn2 - rear left +# chn3 - rear right +# chn4 - center +# chn5 - side left +# chn6 - side right +# + +pcm.!surround70 { + @args [ CARD DEV ] + @args.CARD { + type string + default { + @func getenv + vars [ + ALSA_SURROUND70_CARD + ALSA_PCM_CARD + ALSA_CARD + ] + default { + @func refer + name defaults.pcm.surround70.card + } + } + } + @args.DEV { + type integer + default { + @func igetenv + vars [ + ALSA_SURROUND70_DEVICE + ] + default { + @func refer + name defaults.pcm.surround70.device + } + } + } + type route + slave.pcm { + @func refer + name { + @func concat + strings [ + "cards." + { + @func card_driver + card $CARD + } + ".pcm.surround71." $DEV ":CARD=" $CARD + ] + } + } + ttable.0.FL 1 + ttable.1.FR 1 + ttable.2.RL 1 + ttable.3.RR 1 + ttable.4.FC 1 + ttable.5.SL 1 + ttable.6.SR 1 + hint { + description "7.0 Surround output to Front, Center, Side and Rear speakers" + device $DEV + } +}