From nobody Mon Feb 9 10:48:34 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552911053412997.5218490333245; Mon, 18 Mar 2019 05:10:53 -0700 (PDT) Received: from localhost ([127.0.0.1]:40630 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h5r6P-0002dy-Aq for importer@patchew.org; Mon, 18 Mar 2019 08:10:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35466) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h5r4p-0001us-Ho for qemu-devel@nongnu.org; Mon, 18 Mar 2019 08:09:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h5r4o-0002lF-Lb for qemu-devel@nongnu.org; Mon, 18 Mar 2019 08:09:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33092) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h5r4o-0002km-BC for qemu-devel@nongnu.org; Mon, 18 Mar 2019 08:09:10 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A40398762D; Mon, 18 Mar 2019 12:09:09 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-24.ams2.redhat.com [10.36.116.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id EE8CC60C54; Mon, 18 Mar 2019 12:09:06 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id CFE9917534; Mon, 18 Mar 2019 13:09:05 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 18 Mar 2019 13:09:03 +0100 Message-Id: <20190318120905.15478-2-kraxel@redhat.com> In-Reply-To: <20190318120905.15478-1-kraxel@redhat.com> References: <20190318120905.15478-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 18 Mar 2019 12:09:09 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 1/3] audio/paaudio: fix ignored buffer_length setting X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Martin Schrodt , Gerd Hoffmann , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Martin Schrodt Audiodev configuration allows to set the length of the buffered data. The setting was ignored and a constant value used instead. This patch makes the code apply the setting properly, and uses the previous default if nothing is supplied. Signed-off-by: Martin Schrodt Message-id: 20190315084653.120020-2-martin@schrodt.org Signed-off-by: Gerd Hoffmann --- audio/paaudio.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/audio/paaudio.c b/audio/paaudio.c index 5d410ed73f50..ab2a37bbdba3 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -577,7 +577,8 @@ static int qpa_init_out(HWVoiceOut *hw, struct audsetti= ngs *as, =20 audio_pcm_init_info (&hw->info, &obt_as); hw->samples =3D pa->samples =3D audio_buffer_samples( - qapi_AudiodevPaPerDirectionOptions_base(ppdo), &obt_as, 46440); + qapi_AudiodevPaPerDirectionOptions_base(ppdo), + &obt_as, ppdo->buffer_length); pa->pcm_buf =3D audio_calloc(__func__, hw->samples, 1 << hw->info.shif= t); pa->rpos =3D hw->rpos; if (!pa->pcm_buf) { @@ -637,7 +638,8 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsetting= s *as, void *drv_opaque) =20 audio_pcm_init_info (&hw->info, &obt_as); hw->samples =3D pa->samples =3D audio_buffer_samples( - qapi_AudiodevPaPerDirectionOptions_base(ppdo), &obt_as, 46440); + qapi_AudiodevPaPerDirectionOptions_base(ppdo), + &obt_as, ppdo->buffer_length); pa->pcm_buf =3D audio_calloc(__func__, hw->samples, 1 << hw->info.shif= t); pa->wpos =3D hw->wpos; if (!pa->pcm_buf) { @@ -809,7 +811,16 @@ static int qpa_ctl_in (HWVoiceIn *hw, int cmd, ...) return 0; } =20 -/* common */ +static int qpa_validate_per_direction_opts(Audiodev *dev, + AudiodevPaPerDirectionOptions *= pdo) +{ + if (!pdo->has_buffer_length) { + pdo->has_buffer_length =3D true; + pdo->buffer_length =3D 46440; + } + return 1; +} + static void *qpa_audio_init(Audiodev *dev) { paaudio *g; @@ -836,6 +847,13 @@ static void *qpa_audio_init(Audiodev *dev) g =3D g_malloc(sizeof(paaudio)); server =3D popts->has_server ? popts->server : NULL; =20 + if (!qpa_validate_per_direction_opts(dev, popts->in)) { + goto fail; + } + if (!qpa_validate_per_direction_opts(dev, popts->out)) { + goto fail; + } + g->dev =3D dev; g->mainloop =3D NULL; g->context =3D NULL; --=20 2.18.1