From nobody Tue Feb 10 06:58:54 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1689598342; cv=none; d=zohomail.com; s=zohoarc; b=LBk8Eit1VDhwC/5unAn1PkbqiR/pTeDebTY+LWzZIHzZn+ad6z/5DU1TFATSe6++pE8Bw7sBa2slPoeOMHj8sETaZysBX/MFHHbyHttN37tcYCuagtoP+QE2anb+K1ywJPaXxDBqK1urHhznCUtVdDDLG6y67++P+zgv3TMGynM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1689598342; 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; bh=oKlS5hRDGOMxyXKDJpllQ4xZZoY7yU8FDeO5tvaBJ64=; b=CBy14X4nui8nwXcnySsIDArENZ5o9+f9hgFEwbVfHvdTzf/L5rW7GuUdS5t2q9pAZQ8Flq7A/ofC6b+VfHFyTDD09zh/JnPExTJyP2zj2W9j5wg2HmHKVcxIRG7Gn3+DbL5/TcMGvC+9psjbHYXrbR51723QAaQGq1Ru3cWpO40= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1689598342939840.6375426271114; Mon, 17 Jul 2023 05:52:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLNgl-0002Qg-Q7; Mon, 17 Jul 2023 08:50:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qLNdJ-0007uf-3O for qemu-devel@nongnu.org; Mon, 17 Jul 2023 08:47:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qLNdG-0008PD-H9 for qemu-devel@nongnu.org; Mon, 17 Jul 2023 08:47:20 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-587-VGGsooOBMjCFJfaTvUmRuQ-1; Mon, 17 Jul 2023 08:47:13 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 42F368966C4; Mon, 17 Jul 2023 12:47:13 +0000 (UTC) Received: from localhost (unknown [10.39.208.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id A1EF740C206F; Mon, 17 Jul 2023 12:47:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689598037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oKlS5hRDGOMxyXKDJpllQ4xZZoY7yU8FDeO5tvaBJ64=; b=gXtEHlWSrmZ+c5VJzvE0BZBMD2lkx81uEnilWOvFPURP4f6FCdH7ZgRMkUy8IzidDSBS1n DTwjhn0QzzrR49S/HtFZ+t9G3UAiWkgw1eX9ki2tMGO2ezCKb9WLosQENcjccyQ52KqjV1 OUfF189nVO970ZdaQM348KvOLocQvcM= X-MC-Unique: VGGsooOBMjCFJfaTvUmRuQ-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Markus Armbruster , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Beraldo Leal , richard.henderson@linaro.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Gerd Hoffmann , "Michael S. Tsirkin" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Wainer dos Santos Moschetta , Thomas Huth , Eric Blake Subject: [PULL 19/19] audio/pw: improve channel position code Date: Mon, 17 Jul 2023 16:45:44 +0400 Message-ID: <20230717124545.177236-20-marcandre.lureau@redhat.com> In-Reply-To: <20230717124545.177236-1-marcandre.lureau@redhat.com> References: <20230717124545.177236-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1689598343616100001 From: Marc-Andr=C3=A9 Lureau Follow PulseAudio backend comment and code, and only implement the channels QEMU actually supports at this point, and add the same comment about limits and future mappings. Simplify a bit the code. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Volker R=C3=BCmelin Message-Id: <20230506163735.3481387-13-marcandre.lureau@redhat.com> --- audio/pwaudio.c | 75 +++++++++++++++++-------------------------------- 1 file changed, 26 insertions(+), 49 deletions(-) diff --git a/audio/pwaudio.c b/audio/pwaudio.c index a101ffeff1..b6a38738ee 100644 --- a/audio/pwaudio.c +++ b/audio/pwaudio.c @@ -417,8 +417,8 @@ pw_to_audfmt(enum spa_audio_format fmt, int *endianness, } =20 static int -create_stream(pwaudio *c, PWVoice *v, const char *stream_name, - const char *name, enum spa_direction dir) +qpw_stream_new(pwaudio *c, PWVoice *v, const char *stream_name, + const char *name, enum spa_direction dir) { int res; uint32_t n_params; @@ -482,62 +482,37 @@ create_stream(pwaudio *c, PWVoice *v, const char *str= eam_name, return 0; } =20 -static int -qpw_stream_new(pwaudio *c, PWVoice *v, const char *stream_name, - const char *name, enum spa_direction dir) +static void +qpw_set_position(uint32_t channels, uint32_t position[SPA_AUDIO_MAX_CHANNE= LS]) { - switch (v->info.channels) { + memcpy(position, (uint32_t[SPA_AUDIO_MAX_CHANNELS]) { SPA_AUDIO_CHANNE= L_UNKNOWN, }, + sizeof(uint32_t) * SPA_AUDIO_MAX_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 (channels) { case 8: - v->info.position[0] =3D SPA_AUDIO_CHANNEL_FL; - v->info.position[1] =3D SPA_AUDIO_CHANNEL_FR; - v->info.position[2] =3D SPA_AUDIO_CHANNEL_FC; - v->info.position[3] =3D SPA_AUDIO_CHANNEL_LFE; - v->info.position[4] =3D SPA_AUDIO_CHANNEL_RL; - v->info.position[5] =3D SPA_AUDIO_CHANNEL_RR; - v->info.position[6] =3D SPA_AUDIO_CHANNEL_SL; - v->info.position[7] =3D SPA_AUDIO_CHANNEL_SR; - break; + position[6] =3D SPA_AUDIO_CHANNEL_SL; + position[7] =3D SPA_AUDIO_CHANNEL_SR; + /* fallthrough */ case 6: - v->info.position[0] =3D SPA_AUDIO_CHANNEL_FL; - v->info.position[1] =3D SPA_AUDIO_CHANNEL_FR; - v->info.position[2] =3D SPA_AUDIO_CHANNEL_FC; - v->info.position[3] =3D SPA_AUDIO_CHANNEL_LFE; - v->info.position[4] =3D SPA_AUDIO_CHANNEL_RL; - v->info.position[5] =3D SPA_AUDIO_CHANNEL_RR; - break; - case 5: - v->info.position[0] =3D SPA_AUDIO_CHANNEL_FL; - v->info.position[1] =3D SPA_AUDIO_CHANNEL_FR; - v->info.position[2] =3D SPA_AUDIO_CHANNEL_FC; - v->info.position[3] =3D SPA_AUDIO_CHANNEL_LFE; - v->info.position[4] =3D SPA_AUDIO_CHANNEL_RC; - break; - case 4: - v->info.position[0] =3D SPA_AUDIO_CHANNEL_FL; - v->info.position[1] =3D SPA_AUDIO_CHANNEL_FR; - v->info.position[2] =3D SPA_AUDIO_CHANNEL_FC; - v->info.position[3] =3D SPA_AUDIO_CHANNEL_RC; - break; - case 3: - v->info.position[0] =3D SPA_AUDIO_CHANNEL_FL; - v->info.position[1] =3D SPA_AUDIO_CHANNEL_FR; - v->info.position[2] =3D SPA_AUDIO_CHANNEL_LFE; - break; + position[2] =3D SPA_AUDIO_CHANNEL_FC; + position[3] =3D SPA_AUDIO_CHANNEL_LFE; + position[4] =3D SPA_AUDIO_CHANNEL_RL; + position[5] =3D SPA_AUDIO_CHANNEL_RR; + /* fallthrough */ case 2: - v->info.position[0] =3D SPA_AUDIO_CHANNEL_FL; - v->info.position[1] =3D SPA_AUDIO_CHANNEL_FR; + position[0] =3D SPA_AUDIO_CHANNEL_FL; + position[1] =3D SPA_AUDIO_CHANNEL_FR; break; case 1: - v->info.position[0] =3D SPA_AUDIO_CHANNEL_MONO; + position[0] =3D SPA_AUDIO_CHANNEL_MONO; break; default: - for (size_t i =3D 0; i < v->info.channels; i++) { - v->info.position[i] =3D SPA_AUDIO_CHANNEL_UNKNOWN; - } - break; + dolog("Internal error: unsupported channel count %d\n", channels); } - - return create_stream(c, v, stream_name, name, dir); } =20 static int @@ -555,6 +530,7 @@ qpw_init_out(HWVoiceOut *hw, struct audsettings *as, vo= id *drv_opaque) =20 v->info.format =3D audfmt_to_pw(as->fmt, as->endianness); v->info.channels =3D as->nchannels; + qpw_set_position(as->nchannels, v->info.position); v->info.rate =3D as->freq; =20 obt_as.fmt =3D @@ -601,6 +577,7 @@ qpw_init_in(HWVoiceIn *hw, struct audsettings *as, void= *drv_opaque) =20 v->info.format =3D audfmt_to_pw(as->fmt, as->endianness); v->info.channels =3D as->nchannels; + qpw_set_position(as->nchannels, v->info.position); v->info.rate =3D as->freq; =20 obt_as.fmt =3D --=20 2.41.0