From nobody Tue Feb 10 06:27:14 2026 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; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552639756026299.93131318164797; Fri, 15 Mar 2019 01:49:16 -0700 (PDT) Received: from localhost ([127.0.0.1]:51938 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4iWc-0007mT-S2 for importer@patchew.org; Fri, 15 Mar 2019 04:49:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50096) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4iUc-0006vl-0R for qemu-devel@nongnu.org; Fri, 15 Mar 2019 04:47:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h4iUY-0001B5-7H for qemu-devel@nongnu.org; Fri, 15 Mar 2019 04:47:05 -0400 Received: from [2a01:4f8:141:20d3::2] (port=58396 helo=zapp.schrodt.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h4iUU-00017D-JV for qemu-devel@nongnu.org; Fri, 15 Mar 2019 04:47:00 -0400 Received: from schapa.schrodt.org ([46.237.225.84]:39904 helo=zoidberg.machine.schrodt.org) by zapp.schrodt.org with esmtps (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1h4iUQ-0000zR-8W; Fri, 15 Mar 2019 09:46:54 +0100 Received: from spheenik by zoidberg.machine.schrodt.org with local (Exim 4.92) (envelope-from ) id 1h4iUP-000VGy-VJ; Fri, 15 Mar 2019 09:46:53 +0100 From: Martin Schrodt To: qemu-devel@nongnu.org Date: Fri, 15 Mar 2019 09:46:51 +0100 Message-Id: <20190315084653.120020-2-martin@schrodt.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190315084653.120020-1-martin@schrodt.org> References: <20190315084653.120020-1-martin@schrodt.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a01:4f8:141:20d3::2 Subject: [Qemu-devel] [PATCH V4 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: kraxel@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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 --- audio/paaudio.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/audio/paaudio.c b/audio/paaudio.c index 5d410ed73f..ab2a37bbdb 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.21.0