From patchwork Thu Mar 14 14:26:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Schrodt X-Patchwork-Id: 1056568 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=schrodt.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Ks582518z9s3l for ; Fri, 15 Mar 2019 01:47:56 +1100 (AEDT) Received: from localhost ([127.0.0.1]:38951 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4ReE-0000iC-8N for incoming@patchwork.ozlabs.org; Thu, 14 Mar 2019 10:47:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36985) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4RYP-0004je-50 for qemu-devel@nongnu.org; Thu, 14 Mar 2019 10:41:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h4RJj-0001zP-LL for qemu-devel@nongnu.org; Thu, 14 Mar 2019 10:26:45 -0400 Received: from [2a01:4f8:141:20d3::2] (port=54468 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 1h4RJj-0001iN-Ax for qemu-devel@nongnu.org; Thu, 14 Mar 2019 10:26:43 -0400 Received: from schapa.schrodt.org ([46.237.225.84]:37614 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 1h4RJb-0005dh-6e; Thu, 14 Mar 2019 15:26:35 +0100 Received: from spheenik by zoidberg.machine.schrodt.org with local (Exim 4.92) (envelope-from ) id 1h4RJa-00093e-UR; Thu, 14 Mar 2019 15:26:34 +0100 From: Martin Schrodt To: qemu-devel@nongnu.org Date: Thu, 14 Mar 2019 15:26:32 +0100 Message-Id: <20190314142634.34537-2-martin@schrodt.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190314142634.34537-1-martin@schrodt.org> References: <20190314142634.34537-1-martin@schrodt.org> MIME-Version: 1.0 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 V2 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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. Signed-off-by: Martin Schrodt --- audio/paaudio.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/audio/paaudio.c b/audio/paaudio.c index 5d410ed73f..1a799ca3e7 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -577,7 +577,7 @@ static int qpa_init_out(HWVoiceOut *hw, struct audsettings *as, audio_pcm_init_info (&hw->info, &obt_as); hw->samples = pa->samples = audio_buffer_samples( - qapi_AudiodevPaPerDirectionOptions_base(ppdo), &obt_as, 46440); + qapi_AudiodevPaPerDirectionOptions_base(ppdo), &obt_as, ppdo->buffer_length); pa->pcm_buf = audio_calloc(__func__, hw->samples, 1 << hw->info.shift); pa->rpos = hw->rpos; if (!pa->pcm_buf) { @@ -637,7 +637,7 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque) audio_pcm_init_info (&hw->info, &obt_as); hw->samples = pa->samples = audio_buffer_samples( - qapi_AudiodevPaPerDirectionOptions_base(ppdo), &obt_as, 46440); + qapi_AudiodevPaPerDirectionOptions_base(ppdo), &obt_as, ppdo->buffer_length); pa->pcm_buf = audio_calloc(__func__, hw->samples, 1 << hw->info.shift); pa->wpos = hw->wpos; if (!pa->pcm_buf) { @@ -809,7 +809,15 @@ static int qpa_ctl_in (HWVoiceIn *hw, int cmd, ...) return 0; } -/* common */ +static int qpa_validate_per_direction_opts (Audiodev *dev, AudiodevPaPerDirectionOptions *pdo) +{ + if (!pdo->has_buffer_length) { + pdo->has_buffer_length = true; + pdo->buffer_length = dev->timer_period * 4; + } + return 1; +} + static void *qpa_audio_init(Audiodev *dev) { paaudio *g; @@ -836,6 +844,13 @@ static void *qpa_audio_init(Audiodev *dev) g = g_malloc(sizeof(paaudio)); server = popts->has_server ? popts->server : NULL; + if (!qpa_validate_per_direction_opts(dev, popts->in)) { + goto fail; + } + if (!qpa_validate_per_direction_opts(dev, popts->out)) { + goto fail; + } + g->dev = dev; g->mainloop = NULL; g->context = NULL; From patchwork Thu Mar 14 14:26:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Schrodt X-Patchwork-Id: 1056569 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=schrodt.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Ks626FgLz9s4Y for ; Fri, 15 Mar 2019 01:48:42 +1100 (AEDT) Received: from localhost ([127.0.0.1]:38959 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4Rey-0001A8-Qv for incoming@patchwork.ozlabs.org; Thu, 14 Mar 2019 10:48:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36985) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4RYT-0004je-1K for qemu-devel@nongnu.org; Thu, 14 Mar 2019 10:41:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h4RJj-0001zY-MW for qemu-devel@nongnu.org; Thu, 14 Mar 2019 10:26:45 -0400 Received: from [2a01:4f8:141:20d3::2] (port=54472 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 1h4RJj-0001iP-Ah for qemu-devel@nongnu.org; Thu, 14 Mar 2019 10:26:43 -0400 Received: from schapa.schrodt.org ([46.237.225.84]:37612 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 1h4RJb-0005dg-6r; Thu, 14 Mar 2019 15:26:35 +0100 Received: from spheenik by zoidberg.machine.schrodt.org with local (Exim 4.92) (envelope-from ) id 1h4RJa-00093g-Ux; Thu, 14 Mar 2019 15:26:34 +0100 From: Martin Schrodt To: qemu-devel@nongnu.org Date: Thu, 14 Mar 2019 15:26:33 +0100 Message-Id: <20190314142634.34537-3-martin@schrodt.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190314142634.34537-1-martin@schrodt.org> References: <20190314142634.34537-1-martin@schrodt.org> MIME-Version: 1.0 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 V2 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: kraxel@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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. Signed-off-by: Martin Schrodt --- audio/paaudio.c | 18 +++++++----------- qapi/audio.json | 6 +++++- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/audio/paaudio.c b/audio/paaudio.c index 1a799ca3e7..c9007fdb01 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -500,16 +500,12 @@ static pa_stream *qpa_simple_new ( if (dir == PA_STREAM_PLAYBACK) { r = pa_stream_connect_playback (stream, dev, attr, PA_STREAM_INTERPOLATE_TIMING -#ifdef PA_STREAM_ADJUST_LATENCY |PA_STREAM_ADJUST_LATENCY -#endif |PA_STREAM_AUTO_TIMING_UPDATE, NULL, NULL); } else { r = pa_stream_connect_record (stream, dev, attr, PA_STREAM_INTERPOLATE_TIMING -#ifdef PA_STREAM_ADJUST_LATENCY |PA_STREAM_ADJUST_LATENCY -#endif |PA_STREAM_AUTO_TIMING_UPDATE); } @@ -549,12 +545,8 @@ static int qpa_init_out(HWVoiceOut *hw, struct audsettings *as, ss.channels = as->nchannels; ss.rate = as->freq; - /* - * 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 = pa_usec_to_bytes (10 * 1000, &ss); - ba.minreq = pa_usec_to_bytes (5 * 1000, &ss); + ba.tlength = pa_usec_to_bytes (ppdo->latency, &ss); + ba.minreq = -1; ba.maxlength = -1; ba.prebuf = -1; @@ -813,7 +805,11 @@ static int qpa_validate_per_direction_opts (Audiodev *dev, AudiodevPaPerDirectio { if (!pdo->has_buffer_length) { pdo->has_buffer_length = true; - pdo->buffer_length = dev->timer_period * 4; + pdo->buffer_length = dev->timer_period * 9 / 2; + } + if (!pdo->has_latency) { + pdo->has_latency = true; + pdo->latency = 15000; } return 1; } diff --git a/qapi/audio.json b/qapi/audio.json index 97aee37288..9fefdf5186 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' } } ## # @AudiodevPaOptions: From patchwork Thu Mar 14 14:26:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Schrodt X-Patchwork-Id: 1056566 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=schrodt.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Ks215grQz9s5c for ; Fri, 15 Mar 2019 01:45:13 +1100 (AEDT) Received: from localhost ([127.0.0.1]:38873 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4Rbb-00072X-NA for incoming@patchwork.ozlabs.org; Thu, 14 Mar 2019 10:45:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36987) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4RYC-0004jj-Qm for qemu-devel@nongnu.org; Thu, 14 Mar 2019 10:41:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h4RJj-000203-VJ for qemu-devel@nongnu.org; Thu, 14 Mar 2019 10:26:46 -0400 Received: from [2a01:4f8:141:20d3::2] (port=54476 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 1h4RJj-0001iW-Ln for qemu-devel@nongnu.org; Thu, 14 Mar 2019 10:26:43 -0400 Received: from schapa.schrodt.org ([46.237.225.84]:37616 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 1h4RJb-0005di-73; Thu, 14 Mar 2019 15:26:35 +0100 Received: from spheenik by zoidberg.machine.schrodt.org with local (Exim 4.92) (envelope-from ) id 1h4RJa-00093j-Va; Thu, 14 Mar 2019 15:26:34 +0100 From: Martin Schrodt To: qemu-devel@nongnu.org Date: Thu, 14 Mar 2019 15:26:34 +0100 Message-Id: <20190314142634.34537-4-martin@schrodt.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190314142634.34537-1-martin@schrodt.org> References: <20190314142634.34537-1-martin@schrodt.org> MIME-Version: 1.0 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 V2 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: kraxel@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 --- audio/paaudio.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/audio/paaudio.c b/audio/paaudio.c index c9007fdb01..e4370c3113 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -600,6 +600,7 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque) { int error; pa_sample_spec ss; + pa_buffer_attr ba; struct audsettings obt_as = *as; PAVoiceIn *pa = (PAVoiceIn *) hw; paaudio *g = pa->g = drv_opaque; @@ -610,6 +611,11 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque) ss.channels = as->nchannels; ss.rate = as->freq; + ba.fragsize = pa_usec_to_bytes (ppdo->latency, &ss); + ba.maxlength = -1; + ba.minreq = -1; + ba.prebuf = -1; + obt_as.fmt = pa_to_audfmt (ss.format, &obt_as.endianness); pa->stream = qpa_simple_new ( @@ -619,7 +625,7 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque) ppdo->has_name ? ppdo->name : NULL, &ss, NULL, /* channel map */ - NULL, /* buffering attributes */ + &ba, /* buffering attributes */ &error ); if (!pa->stream) {