From nobody Sun May 5 03:36:03 2024 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 From nobody Sun May 5 03:36:03 2024 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; 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 1552911319657121.84629566992737; Mon, 18 Mar 2019 05:15:19 -0700 (PDT) Received: from localhost ([127.0.0.1]:40666 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h5rAX-0005Sy-Dg for importer@patchew.org; Mon, 18 Mar 2019 08:15:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35473) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h5r4x-0001zY-UR for qemu-devel@nongnu.org; Mon, 18 Mar 2019 08:09:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h5r4w-0002oe-HU for qemu-devel@nongnu.org; Mon, 18 Mar 2019 08:09:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39764) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h5r4w-0002oD-7S for qemu-devel@nongnu.org; Mon, 18 Mar 2019 08:09:18 -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 9004F3084215; Mon, 18 Mar 2019 12:09:17 +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 07B1060C4C; Mon, 18 Mar 2019 12:09:17 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id D952C17535; Mon, 18 Mar 2019 13:09:05 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 18 Mar 2019 13:09:04 +0100 Message-Id: <20190318120905.15478-3-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.40]); Mon, 18 Mar 2019 12:09:17 +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 2/3] audio/paaudio: prolong and make latency configurable 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 The latency of a connection to the PulseAudio server is determined by the tlength parameter. This was hardcoded to 10ms, which is a bit too tight on my machine, causing audio on host and guest to malfunction. A setting of 15ms works fine here. To allow tweaking, I also made the setting configurable via the new -audiodev config. This allows to squeeze o= ut better timings in scenarios where the emulation allows it. I also removed setting of the minreq parameter to (seemingly arbitrary) hal= f the latency, since it showed worse audio quality during my tests. Allowin= g PulseAudio to request smaller chunks helped. Signed-off-by: Martin Schrodt Message-id: 20190315084653.120020-3-martin@schrodt.org Signed-off-by: Gerd Hoffmann --- audio/paaudio.c | 12 ++++++------ qapi/audio.json | 6 +++++- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/audio/paaudio.c b/audio/paaudio.c index ab2a37bbdba3..be27c73f094a 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -549,12 +549,8 @@ static int qpa_init_out(HWVoiceOut *hw, struct audsett= ings *as, ss.channels =3D as->nchannels; ss.rate =3D as->freq; =20 - /* - * qemu audio tick runs at 100 Hz (by default), so processing - * data chunks worth 10 ms of sound should be a good fit. - */ - ba.tlength =3D pa_usec_to_bytes (10 * 1000, &ss); - ba.minreq =3D pa_usec_to_bytes (5 * 1000, &ss); + ba.tlength =3D pa_usec_to_bytes(ppdo->latency, &ss); + ba.minreq =3D -1; ba.maxlength =3D -1; ba.prebuf =3D -1; =20 @@ -818,6 +814,10 @@ static int qpa_validate_per_direction_opts(Audiodev *d= ev, pdo->has_buffer_length =3D true; pdo->buffer_length =3D 46440; } + if (!pdo->has_latency) { + pdo->has_latency =3D true; + pdo->latency =3D 15000; + } return 1; } =20 diff --git a/qapi/audio.json b/qapi/audio.json index 97aee3728835..9fefdf5186dd 100644 --- a/qapi/audio.json +++ b/qapi/audio.json @@ -206,12 +206,16 @@ # # @name: name of the sink/source to use # +# @latency: latency you want PulseAudio to achieve in microseconds +# (default 15000) +# # Since: 4.0 ## { 'struct': 'AudiodevPaPerDirectionOptions', 'base': 'AudiodevPerDirectionOptions', 'data': { - '*name': 'str' } } + '*name': 'str', + '*latency': 'uint32' } } =20 ## # @AudiodevPaOptions: --=20 2.18.1 From nobody Sun May 5 03:36:03 2024 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; 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 1552911231633445.79877721040384; Mon, 18 Mar 2019 05:13:51 -0700 (PDT) Received: from localhost ([127.0.0.1]:40657 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h5r9H-0004qZ-MU for importer@patchew.org; Mon, 18 Mar 2019 08:13:47 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35460) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h5r4n-0001rt-6Z for qemu-devel@nongnu.org; Mon, 18 Mar 2019 08:09:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h5r4m-0002jz-Fi for qemu-devel@nongnu.org; Mon, 18 Mar 2019 08:09:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54420) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h5r4m-0002jX-57 for qemu-devel@nongnu.org; Mon, 18 Mar 2019 08:09:08 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id 7369337E8B; Mon, 18 Mar 2019 12:09:07 +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 1381F600C7; Mon, 18 Mar 2019 12:09:07 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id E16FE17536; Mon, 18 Mar 2019 13:09:05 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 18 Mar 2019 13:09:05 +0100 Message-Id: <20190318120905.15478-4-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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 18 Mar 2019 12:09:07 +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 3/3] audio/paaudio: fix microphone input being unusable 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 The current code does not specify the metrics of the buffers for the input device. This makes PulseAudio choose very bad defaults, which causes input to be unusable: Audio put in gets out 30 seconds later. This patch fixes that and makes the latency configurable as well. Signed-off-by: Martin Schrodt Message-id: 20190315084653.120020-4-martin@schrodt.org Signed-off-by: Gerd Hoffmann --- audio/paaudio.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/audio/paaudio.c b/audio/paaudio.c index be27c73f094a..45295b4e5ecb 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -605,6 +605,7 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsetting= s *as, void *drv_opaque) { int error; pa_sample_spec ss; + pa_buffer_attr ba; struct audsettings obt_as =3D *as; PAVoiceIn *pa =3D (PAVoiceIn *) hw; paaudio *g =3D pa->g =3D drv_opaque; @@ -615,6 +616,11 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettin= gs *as, void *drv_opaque) ss.channels =3D as->nchannels; ss.rate =3D as->freq; =20 + ba.fragsize =3D pa_usec_to_bytes(ppdo->latency, &ss); + ba.maxlength =3D -1; + ba.minreq =3D -1; + ba.prebuf =3D -1; + obt_as.fmt =3D pa_to_audfmt (ss.format, &obt_as.endianness); =20 pa->stream =3D qpa_simple_new ( @@ -624,7 +630,7 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsetting= s *as, void *drv_opaque) ppdo->has_name ? ppdo->name : NULL, &ss, NULL, /* channel map */ - NULL, /* buffering attributes */ + &ba, /* buffering attributes */ &error ); if (!pa->stream) { --=20 2.18.1