From nobody Wed Nov 12 10:12:50 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1569877412; cv=none; d=zoho.com; s=zohoarc; b=Uzgs57YwsVkAhT8kfVhMHgZnEYjw8xjLbtIYtzJUUQK8zBGrl4JDnWR/jHwwD31efzA6cwiT9cfQ41a1phvRtAjgVDPimL7J42+alKuKcZAxZrpiHGzFiMu8l7X15hytfFcZ4T2tEopcNHC+adGLDSttvs+hEbHr4up91t52wWc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569877412; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=9lJbQYocXSR3LzW21RYjme2hTgIUpvB0ikUNj0SmxGA=; b=junUfsAW42xF7YxaqMXuMY65G++LTaMYINwXtMGZ8ageDRKzJ77hGZzupm1O7buMt7IiDzzcuO11KyjAKAvGM7CwlulTNhRVq9aQg3RsoFT6FQ/U2r0OMWB/JQ68NNsEjYTI6cTrpDGL4KTwn0BznOo7m/8/p45ycvQpCs3+u88= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1569877412577293.3290249322763; Mon, 30 Sep 2019 14:03:32 -0700 (PDT) Received: from localhost ([::1]:57300 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iF2pP-00084g-3g for importer@patchew.org; Mon, 30 Sep 2019 17:03:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45807) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iF2Hh-00044U-0C for qemu-devel@nongnu.org; Mon, 30 Sep 2019 16:28:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iF2Hf-0002cn-Oe for qemu-devel@nongnu.org; Mon, 30 Sep 2019 16:28:40 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:51244) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iF2Hf-0002bQ-Gq for qemu-devel@nongnu.org; Mon, 30 Sep 2019 16:28:39 -0400 Received: by mail-wm1-x341.google.com with SMTP id 7so874260wme.1 for ; Mon, 30 Sep 2019 13:28:39 -0700 (PDT) Received: from nullptr.home.dirty-ice.org (2a01-036c-0113-e8f4-0000-0000-0000-0005.pool6.digikabel.hu. [2a01:36c:113:e8f4::5]) by smtp.gmail.com with ESMTPSA id o9sm34402911wrh.46.2019.09.30.13.28.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2019 13:28:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9lJbQYocXSR3LzW21RYjme2hTgIUpvB0ikUNj0SmxGA=; b=Byr95vn07831RUV2a4jbCWBZmItFbDeMuDk1Mcju/0Zg+6kj933+VAXsnAWiCIY+B2 Pde3MdmLmdSzbOnC7Y6k6dqDi1XBfYiasdfsvhYMKjUwkI/PJySqZ6DXiRQy+sjQhLki GqWPEgwaFociTSP+fJoz/tbMnPVDncjMVBtcJfqtEF22vUXyEDbEhZ4Rr0CBdfVqi+gy ZHSg9s7hKVZfj00d4zyoJRaIBaCAUMeagFKjlObAL7cg8TKy1Db0QrotPLjIlxCxFu2u aXaSDi6cMgiQ1BL/Xy0x58LLmxIYaBcKmEkFqA6NuA7YtiH3K2kKL2ipHSvAL1vObSzt pzEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9lJbQYocXSR3LzW21RYjme2hTgIUpvB0ikUNj0SmxGA=; b=n5Xol6VIlDLumffXVnx8cvzsXZJTWxKnJ56WMmgaXgGrJxbj7yPTm2AUQoj6iRxVIE NTVWeIYQKe1SzSzLHCnMQtFGNAjnLPMzXHO1Mz4NiRL5F3sjjewhFf91iePj0YxJP333 yMVDCys+e0cQyT7CRWC2g6AlJw5YiwPHyQN04r2omIyzda9KJhoBElX2SkszYRMuhtHA Z0WbI72Lh69Z5WoagTO3cTCQr/jM4+0Dv1WjlCqtVe1N4f3ZVuYVBFdKOQKL8QBtlyjg ziuzU48gEwzUyA1ka+xd15bQWBz9ECl5g2ODk7gDmMX+AcEC0vPRdHowYCRumPu+VxMp a82w== X-Gm-Message-State: APjAAAVx+1KUt+rSss3ZDdqqXfmMzx4E09WZozfU70NmwyAIVhc+8sGr YY8a0BhSgfQ3EOiz6lrGW8u2wihG X-Google-Smtp-Source: APXvYqzM8borh3GRSyhiCmeMRcxrsLXcASHKIBcuvqCaV5QgtreZXQMVWH8tuCvTpFdzdoAsth4rCg== X-Received: by 2002:a7b:ce91:: with SMTP id q17mr712482wmj.25.1569875318269; Mon, 30 Sep 2019 13:28:38 -0700 (PDT) From: "=?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?=" X-Google-Original-From: =?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?= To: qemu-devel@nongnu.org Subject: [PATCH v5 10/10] paaudio: fix channel order for usb-audio 5.1 and 7.1 streams Date: Mon, 30 Sep 2019 22:29:03 +0200 Message-Id: X-Mailer: git-send-email 2.23.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: K=C5=91v=C3=A1g=C3=B3, Zolt=C3=A1n --- audio/paaudio.c | 50 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/audio/paaudio.c b/audio/paaudio.c index d195b1caa8..6ff0d17537 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -338,17 +338,59 @@ static pa_stream *qpa_simple_new ( pa_stream_direction_t dir, const char *dev, const pa_sample_spec *ss, - const pa_channel_map *map, const pa_buffer_attr *attr, int *rerror) { int r; - pa_stream *stream; + pa_stream *stream =3D NULL; pa_stream_flags_t flags; + pa_channel_map map; =20 pa_threaded_mainloop_lock(c->mainloop); =20 - stream =3D pa_stream_new(c->context, name, ss, map); + pa_channel_map_init(&map); + map.channels =3D ss->channels; + + /* + * TODO: This currently expects the only frontend supporting more than= 2 + * channels is the usb-audio. We will need some means to set channel + * order when a new frontend gains multi-channel support. + */ + switch (ss->channels) { + case 1: + map.map[0] =3D PA_CHANNEL_POSITION_MONO; + break; + + case 2: + map.map[0] =3D PA_CHANNEL_POSITION_LEFT; + map.map[1] =3D PA_CHANNEL_POSITION_RIGHT; + break; + + case 6: + map.map[0] =3D PA_CHANNEL_POSITION_FRONT_LEFT; + map.map[1] =3D PA_CHANNEL_POSITION_FRONT_RIGHT; + map.map[2] =3D PA_CHANNEL_POSITION_CENTER; + map.map[3] =3D PA_CHANNEL_POSITION_LFE; + map.map[4] =3D PA_CHANNEL_POSITION_REAR_LEFT; + map.map[5] =3D PA_CHANNEL_POSITION_REAR_RIGHT; + break; + + case 8: + map.map[0] =3D PA_CHANNEL_POSITION_FRONT_LEFT; + map.map[1] =3D PA_CHANNEL_POSITION_FRONT_RIGHT; + map.map[2] =3D PA_CHANNEL_POSITION_CENTER; + map.map[3] =3D PA_CHANNEL_POSITION_LFE; + map.map[4] =3D PA_CHANNEL_POSITION_REAR_LEFT; + map.map[5] =3D PA_CHANNEL_POSITION_REAR_RIGHT; + map.map[6] =3D PA_CHANNEL_POSITION_SIDE_LEFT; + map.map[7] =3D PA_CHANNEL_POSITION_SIDE_RIGHT; + + default: + dolog("Internal error: unsupported channel count %d\n", ss->channe= ls); + goto fail; + } + + stream =3D pa_stream_new(c->context, name, ss, &map); if (!stream) { goto fail; } @@ -421,7 +463,6 @@ static int qpa_init_out(HWVoiceOut *hw, struct audsetti= ngs *as, PA_STREAM_PLAYBACK, ppdo->has_name ? ppdo->name : NULL, &ss, - NULL, /* channel map */ &ba, /* buffering attributes */ &error ); @@ -470,7 +511,6 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsetting= s *as, void *drv_opaque) PA_STREAM_RECORD, ppdo->has_name ? ppdo->name : NULL, &ss, - NULL, /* channel map */ &ba, /* buffering attributes */ &error ); --=20 2.23.0