From nobody Mon Feb 9 17:06:28 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=1610717374; cv=none; d=zohomail.com; s=zohoarc; b=Gxb2vxDaeymaqZYMsvKd88DSQpipyJHjAI4tcrzDcMS/WJy1NQg7xUj++f4fPuqq1EfUcT9kh/f7fYoiCVb/biADmt4Cocr7iBxKq3syluZHmzG0EH2nxMqUMt2eXAVrIlfcmTHDKd4dtP9IfKzXIlqzIGjzc0r7AVL3f0Ggyks= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610717374; 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=AnAXyOZxzryLO3jXO6hO3fVMwALA3DXq8z0PDBwf4Xs=; b=IOjP62rK1G+5JxWMBuehhXAa5vXjnSlN6JDY2rfiXMVSnPrws5oKr+VOGS1cFld604eqGs80MSjB8BionR0tVjThqZ1UL3VI6c+mG+x88SCYNcusycUk1a+R+EhiBDlc0YVI+lE1I8DGJzuuYSJVwtxwAiRd2dX8Lu8xr2Bizcw= 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 1610717374512518.0506453928065; Fri, 15 Jan 2021 05:29:34 -0800 (PST) Received: from localhost ([::1]:57104 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0PAT-0004ZV-AS for importer@patchew.org; Fri, 15 Jan 2021 08:29:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40318) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0P3I-0006uI-KO for qemu-devel@nongnu.org; Fri, 15 Jan 2021 08:22:08 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:28385) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l0P3A-0003Ij-6n for qemu-devel@nongnu.org; Fri, 15 Jan 2021 08:22:08 -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-514-qXXFRQxtNWqQsnAGA5Jt2g-1; Fri, 15 Jan 2021 08:21:53 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BC4A1806663; Fri, 15 Jan 2021 13:21:52 +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 83F676F7EF; Fri, 15 Jan 2021 13:21:52 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 967351800D40; Fri, 15 Jan 2021 14:21:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610716915; 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=AnAXyOZxzryLO3jXO6hO3fVMwALA3DXq8z0PDBwf4Xs=; b=EFesPQFHTI29UwHoM6AjVKXO7tvqir/9JMPHUhyfuCqLjJsppcjGYzxTZfQj1QirpACIln LRcIImzJX/CB89nXh55/YWQLcuqswF6Bqpr5eTKSbtAzKn2pF6WzPHRCuxTG9S+s7rKsde miGsh1edkJ/hNbUFcvqTT8Qx12isPNk= X-MC-Unique: qXXFRQxtNWqQsnAGA5Jt2g-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 10/30] audio: break generic buffer dependency on mixing-engine Date: Fri, 15 Jan 2021 14:21:26 +0100 Message-Id: <20210115132146.1443592-11-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.11 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=63.128.21.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_H4=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 Break the unnecessary dependency of the generic buffer management code on mixing-engine. This is required for the next patch. Signed-off-by: Volker R=C3=BCmelin Message-id: 9315afe5-5958-c0b4-ea1e-14769511a9d5@t-online.de Message-Id: <20210110100239.27588-10-vr_qemu@t-online.de> Signed-off-by: Gerd Hoffmann --- audio/audio.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/audio/audio.c b/audio/audio.c index 480b3cce1ffb..22d769db0c99 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1388,9 +1388,8 @@ void audio_run(AudioState *s, const char *msg) void audio_generic_run_buffer_in(HWVoiceIn *hw) { if (unlikely(!hw->buf_emul)) { - size_t calc_size =3D hw->conv_buf->size * hw->info.bytes_per_frame; - hw->buf_emul =3D g_malloc(calc_size); - hw->size_emul =3D calc_size; + hw->size_emul =3D hw->samples * hw->info.bytes_per_frame; + hw->buf_emul =3D g_malloc(hw->size_emul); hw->pos_emul =3D hw->pending_emul =3D 0; } =20 @@ -1452,10 +1451,8 @@ void audio_generic_run_buffer_out(HWVoiceOut *hw) void *audio_generic_get_buffer_out(HWVoiceOut *hw, size_t *size) { if (unlikely(!hw->buf_emul)) { - size_t calc_size =3D hw->mix_buf->size * hw->info.bytes_per_frame; - - hw->buf_emul =3D g_malloc(calc_size); - hw->size_emul =3D calc_size; + hw->size_emul =3D hw->samples * hw->info.bytes_per_frame; + hw->buf_emul =3D g_malloc(hw->size_emul); hw->pos_emul =3D hw->pending_emul =3D 0; } =20 --=20 2.29.2