From nobody Sun Nov 16 16:27:28 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 ARC-Seal: i=1; a=rsa-sha256; t=1600852333; cv=none; d=zohomail.com; s=zohoarc; b=NWeUZALFZIiVoQkEgU2r+rRgNa/H8JOk8Sh6hrYzq2O1xRvH6b1rcHqfV0gaIQ9tBKsfiaW/RLVlh4reXpV8jUZopCf+gwc+f1RyoOx4iUPw+JOKZ5AvaxI5p8bUZyd5U42Bsq7BieXDrkBErKBOuWB14uFbS0eUzbQT8DSB3ec= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600852333; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Hz6vgAXVN+6iymYK2FXK3DUNVOmvhLDNkub3oy/OyYc=; b=AVLVM+whv+5l8LnQEpG66CJbNbhJY4siIo9KDv4XQJqbMGsDI9L1U9NxoHTOqHFxHN7b3lyRqfrLfmHIQx3/Qma9I0eBmd4UFuqjF+If2aSERa6Wzg4dOu/M8MEhuFXUb5JUBP9OBQpoxtZEJBTpux0UOQqXMzPvC1qHvWboWuM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600852333070700.0626313344533; Wed, 23 Sep 2020 02:12:13 -0700 (PDT) Received: from localhost ([::1]:52242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL0ot-0001Fi-O5 for importer@patchew.org; Wed, 23 Sep 2020 05:12:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52558) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL0n5-0007rw-3r for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:10:19 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:49784 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kL0n3-00023f-2v for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:10:18 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-490-Ye_emMwYMi-aVKwGzrastw-1; Wed, 23 Sep 2020 05:10:13 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A224B190A3EC; Wed, 23 Sep 2020 09:10:12 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-85.ams2.redhat.com [10.36.112.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 936B21002C0B; Wed, 23 Sep 2020 09:10:02 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id D31631FCF6; Wed, 23 Sep 2020 11:10:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600852215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Hz6vgAXVN+6iymYK2FXK3DUNVOmvhLDNkub3oy/OyYc=; b=fzRnQyMKXItPQS4QY0UYCsTlt8oUMG11kbZsDIQC4u6Sw88NsEPB2DXIk95ijU6w0hNXld nPXpvTwuIbEjPSrTQbFhc+LN6g3vXkqvq9mG1XDcvhRnFszz9EsK4Uh9btKevIuyjQ555O 5Yxg6bPruk2rjTKOiNoSAEOzETe1biY= X-MC-Unique: Ye_emMwYMi-aVKwGzrastw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 3/9] audio/spiceaudio: always rate limit playback stream Date: Wed, 23 Sep 2020 11:09:55 +0200 Message-Id: <20200923091001.20814-4-kraxel@redhat.com> In-Reply-To: <20200923091001.20814-1-kraxel@redhat.com> References: <20200923091001.20814-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=205.139.110.61; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/23 03:55:48 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.455, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Volker=20R=C3=BCmelin?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Volker R=C3=BCmelin The playback rate with the spiceaudio backend is currently too fast if there's no spice client connected or the spice client can't play audio. Rate limit the audio playback stream in all cases. To calculate the rate correctly the limiter has to know the maximum buffer size. Fixes: 8c198ff065 ("spiceaudio: port to the new audio backend api") Signed-off-by: Volker R=C3=BCmelin Message-id: 20200920171729.15861-3-vr_qemu@t-online.de Signed-off-by: Gerd Hoffmann --- audio/audio.c | 3 ++- audio/spiceaudio.c | 10 ++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/audio/audio.c b/audio/audio.c index 7b660dd0c4d0..d5891e1928bc 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1089,7 +1089,8 @@ static size_t audio_pcm_hw_run_out(HWVoiceOut *hw, si= ze_t live) size_t clipped =3D 0; =20 while (live) { - size_t size, decr, proc; + size_t size =3D live * hw->info.bytes_per_frame; + size_t decr, proc; void *buf =3D hw->pcm_ops->get_buffer_out(hw, &size); =20 if (size =3D=3D 0) { diff --git a/audio/spiceaudio.c b/audio/spiceaudio.c index c8d81ba44290..c062742622e4 100644 --- a/audio/spiceaudio.c +++ b/audio/spiceaudio.c @@ -130,13 +130,11 @@ static void *line_out_get_buffer(HWVoiceOut *hw, size= _t *size) } =20 if (out->frame) { - *size =3D audio_rate_get_bytes( - &hw->info, &out->rate, - (out->fsize - out->fpos) * hw->info.bytes_per_frame); - } else { - audio_rate_start(&out->rate); - *size =3D LINE_OUT_SAMPLES << 2; + *size =3D MIN((out->fsize - out->fpos) << 2, *size); } + + *size =3D audio_rate_get_bytes(&hw->info, &out->rate, *size); + return out->frame + out->fpos; } =20 --=20 2.27.0