From nobody Tue Feb 10 04:14:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610718402; cv=none; d=zohomail.com; s=zohoarc; b=jo0J7i1Dc6wTCLHfKD0aULuJ23VlnRHonR6m0IinIqyAT/foxTU8x2zPA0vUvLAsPPW98u5u8XGxHMWKAYISZd1NonfA1+kVSFMwUtme+6AXjpSXS5XUHDiT8IG3RqYS91tg4Bebx8SqIKvw7PgWzWPvJE8pjVMbZUwufMJLPd0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610718402; 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=HYOcwhM19OS83x0r3EaTN7pPiiX5hv/Nyz4UpIeAs5o=; b=iPGEGxeZu3ryShP1hbJ/nF4SLfLl0wRYO80G+VcrHW5nQMpape0Xdd19iB3Blj/h+wryH41YX5+a0YGR+00f9RmN+wDVECjALAqO7ZFyJJ1DhTbLsdiwarB9zfOmwGnHCS/qcEztJsrZ5CEuSkMM9Qzz6G8rpvLzKjrBKm1Qr3Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1610718402682334.73247380245004; Fri, 15 Jan 2021 05:46:42 -0800 (PST) Received: from localhost ([::1]:48856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0PR3-00080S-CG for importer@patchew.org; Fri, 15 Jan 2021 08:46:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40358) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0P3K-0006yo-C7 for qemu-devel@nongnu.org; Fri, 15 Jan 2021 08:22:10 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:22475) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l0P3A-0003JJ-4E for qemu-devel@nongnu.org; Fri, 15 Jan 2021 08:22:10 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-347-pfN2gyj4NounUwctn-2ODA-1; Fri, 15 Jan 2021 08:21:56 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 791B7CE647; Fri, 15 Jan 2021 13:21:55 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-182.ams2.redhat.com [10.36.112.182]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 987635D9E8; Fri, 15 Jan 2021 13:21:54 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 23A3E1800D51; Fri, 15 Jan 2021 14:21:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610716918; 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=HYOcwhM19OS83x0r3EaTN7pPiiX5hv/Nyz4UpIeAs5o=; b=HA1GzWaflkNIpVKsCtViB/oLqe3o9dJdrzptvGpuR/rn6ZZS2CHGAXUstJAaCspPbiZzu2 XwVJ+Dw6BzAkgWyl8dUWsUIY0F1nK6awxBo/s2MudRbI1GTgd3L45qiMB+luuhhEbq/P/N eB5A3N3sj37RraA2AvuoxQ4pdfXdUjY= X-MC-Unique: pfN2gyj4NounUwctn-2ODA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 22/30] dsoundaudio: enable f32 audio sample format Date: Fri, 15 Jan 2021 14:21:38 +0100 Message-Id: <20210115132146.1443592-23-kraxel@redhat.com> In-Reply-To: <20210115132146.1443592-1-kraxel@redhat.com> References: <20210115132146.1443592-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: =?UTF-8?q?Volker=20R=C3=BCmelin?= , Gerd Hoffmann , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Volker R=C3=BCmelin Enable the f32 audio sample format for the DirectSound backend. Signed-off-by: Volker R=C3=BCmelin Message-id: 9315afe5-5958-c0b4-ea1e-14769511a9d5@t-online.de Message-Id: <20210110100239.27588-22-vr_qemu@t-online.de> Signed-off-by: Gerd Hoffmann --- audio/audio_win_int.c | 65 +++++++++++++++++++++++++++++-------------- 1 file changed, 44 insertions(+), 21 deletions(-) diff --git a/audio/audio_win_int.c b/audio/audio_win_int.c index b938fd667bae..b7db34900c7c 100644 --- a/audio/audio_win_int.c +++ b/audio/audio_win_int.c @@ -5,6 +5,7 @@ =20 #define AUDIO_CAP "win-int" #include +#include #include =20 #include "audio.h" @@ -16,7 +17,6 @@ int waveformat_from_audio_settings (WAVEFORMATEX *wfx, { memset (wfx, 0, sizeof (*wfx)); =20 - wfx->wFormatTag =3D WAVE_FORMAT_PCM; wfx->nChannels =3D as->nchannels; wfx->nSamplesPerSec =3D as->freq; wfx->nAvgBytesPerSec =3D as->freq << (as->nchannels =3D=3D 2); @@ -26,11 +26,13 @@ int waveformat_from_audio_settings (WAVEFORMATEX *wfx, switch (as->fmt) { case AUDIO_FORMAT_S8: case AUDIO_FORMAT_U8: + wfx->wFormatTag =3D WAVE_FORMAT_PCM; wfx->wBitsPerSample =3D 8; break; =20 case AUDIO_FORMAT_S16: case AUDIO_FORMAT_U16: + wfx->wFormatTag =3D WAVE_FORMAT_PCM; wfx->wBitsPerSample =3D 16; wfx->nAvgBytesPerSec <<=3D 1; wfx->nBlockAlign <<=3D 1; @@ -38,6 +40,14 @@ int waveformat_from_audio_settings (WAVEFORMATEX *wfx, =20 case AUDIO_FORMAT_S32: case AUDIO_FORMAT_U32: + wfx->wFormatTag =3D WAVE_FORMAT_PCM; + wfx->wBitsPerSample =3D 32; + wfx->nAvgBytesPerSec <<=3D 2; + wfx->nBlockAlign <<=3D 2; + break; + + case AUDIO_FORMAT_F32: + wfx->wFormatTag =3D WAVE_FORMAT_IEEE_FLOAT; wfx->wBitsPerSample =3D 32; wfx->nAvgBytesPerSec <<=3D 2; wfx->nBlockAlign <<=3D 2; @@ -54,12 +64,6 @@ int waveformat_from_audio_settings (WAVEFORMATEX *wfx, int waveformat_to_audio_settings (WAVEFORMATEX *wfx, struct audsettings *as) { - if (wfx->wFormatTag !=3D WAVE_FORMAT_PCM) { - dolog ("Invalid wave format, tag is not PCM, but %d\n", - wfx->wFormatTag); - return -1; - } - if (!wfx->nSamplesPerSec) { dolog ("Invalid wave format, frequency is zero\n"); return -1; @@ -83,23 +87,42 @@ int waveformat_to_audio_settings (WAVEFORMATEX *wfx, return -1; } =20 - switch (wfx->wBitsPerSample) { - case 8: - as->fmt =3D AUDIO_FORMAT_U8; - break; + if (wfx->wFormatTag =3D=3D WAVE_FORMAT_PCM) { + switch (wfx->wBitsPerSample) { + case 8: + as->fmt =3D AUDIO_FORMAT_U8; + break; =20 - case 16: - as->fmt =3D AUDIO_FORMAT_S16; - break; + case 16: + as->fmt =3D AUDIO_FORMAT_S16; + break; =20 - case 32: - as->fmt =3D AUDIO_FORMAT_S32; - break; + case 32: + as->fmt =3D AUDIO_FORMAT_S32; + break; =20 - default: - dolog ("Invalid wave format, bits per sample is not " - "8, 16 or 32, but %d\n", - wfx->wBitsPerSample); + default: + dolog("Invalid PCM wave format, bits per sample is not " + "8, 16 or 32, but %d\n", + wfx->wBitsPerSample); + return -1; + } + } else if (wfx->wFormatTag =3D=3D WAVE_FORMAT_IEEE_FLOAT) { + switch (wfx->wBitsPerSample) { + case 32: + as->fmt =3D AUDIO_FORMAT_F32; + break; + + default: + dolog("Invalid IEEE_FLOAT wave format, bits per sample is not " + "32, but %d\n", + wfx->wBitsPerSample); + return -1; + } + } else { + dolog("Invalid wave format, tag is not PCM and not IEEE_FLOAT, " + "but %d\n", + wfx->wFormatTag); return -1; } =20 --=20 2.29.2