From patchwork Mon Mar 18 12:09:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 10857527 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B12F51390 for ; Mon, 18 Mar 2019 12:14:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9529A28DD5 for ; Mon, 18 Mar 2019 12:14:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 88FCF292FE; Mon, 18 Mar 2019 12:14:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 211E528DD5 for ; Mon, 18 Mar 2019 12:14:50 +0000 (UTC) Received: from localhost ([127.0.0.1]:40666 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h5rAI-0005Sy-5Y for patchwork-qemu-devel@patchwork.kernel.org; Mon, 18 Mar 2019 08:14:50 -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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 out better timings in scenarios where the emulation allows it. I also removed setting of the minreq parameter to (seemingly arbitrary) half the latency, since it showed worse audio quality during my tests. Allowing 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 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; @@ -818,6 +814,10 @@ static int qpa_validate_per_direction_opts(Audiodev *dev, pdo->has_buffer_length = true; pdo->buffer_length = 46440; } + if (!pdo->has_latency) { + pdo->has_latency = true; + pdo->latency = 15000; + } return 1; } 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' } } ## # @AudiodevPaOptions: