From nobody Sat Jul 12 06:02:37 2025 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678085813; cv=none; d=zohomail.com; s=zohoarc; b=RMPNhIcm4cREMelGe6pNiqO+ZmjXtCT/JOTbMUEpgYnhmFmqidoe7HLcutfUcREXptjl2miwHY579FebgEdQ9K63k8zSl/MQeU4/AZPSIibMYlvDeZv1BcuJU3U0JHvICNIM67SJ7ObPKz/fPTJG1wSqyYuDvb/k96kDlug/8qM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678085813; 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=8NqWQI79MCAj9hoRz4fbSI9k2RbTZEpAHjv0JP+qiFE=; b=maK8uzxcdsWaRAldEoj37ymRbVNzn+4Zvf95l+Vsneszc8Sn1YngJSlKTNFdbD9h9EpGqkOkVGOBuWAAoxJ/haVw+tpdXWLhBJG5qiLX+l0Wt4+q95mfIGApk1SM+vL7V0+LUm0Yr9hkjN/9xc0kS4ZfDk7LgTAckRp1mA7/7og= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1678085813610900.6113333364202; Sun, 5 Mar 2023 22:56:53 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZ4jK-0007tP-2U; Mon, 06 Mar 2023 01:53:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZ4jH-0007g5-Pg for qemu-devel@nongnu.org; Mon, 06 Mar 2023 01:53:51 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZ4jG-0000jD-2y for qemu-devel@nongnu.org; Mon, 06 Mar 2023 01:53:51 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-271-94OgoeOXNtq1KQ3nNXd-KA-1; Mon, 06 Mar 2023 01:53:48 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B9A7985A588; Mon, 6 Mar 2023 06:53:47 +0000 (UTC) Received: from localhost (unknown [10.39.208.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0337D492C3E; Mon, 6 Mar 2023 06:53:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678085629; 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=8NqWQI79MCAj9hoRz4fbSI9k2RbTZEpAHjv0JP+qiFE=; b=XezDOlpBZMjlqSsqpO0bPNr7cA6s4eTBv4QiVEQGrrXNoGDqqqIsvReFAcKz1aZe1M8KRT eCQBAtRahfznTRmzYk3eW7ospUC19iRhGNIRlcnXYctmxeH+1z6Kc/pK48AVDA+3CN4Md7 2dtqjnV+rdMFgkSGJDGAA05Iw+7LVJo= X-MC-Unique: 94OgoeOXNtq1KQ3nNXd-KA-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Schoenebeck , =?UTF-8?q?Volker=20R=C3=BCmelin?= Subject: [PULL 23/27] audio: rename variables in audio_pcm_sw_read() Date: Mon, 6 Mar 2023 10:51:58 +0400 Message-Id: <20230306065202.2160066-24-marcandre.lureau@redhat.com> In-Reply-To: <20230306065202.2160066-1-marcandre.lureau@redhat.com> References: <20230306065202.2160066-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1678085815173100001 From: Volker R=C3=BCmelin The audio_pcm_sw_read() function uses a few very unspecific variable names. Rename them for better readability. ret =3D> total_out total =3D> total_in size =3D> buf_len samples =3D> frames_out_max Acked-by: Mark Cave-Ayland Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Volker R=C3=BCmelin Message-Id: <20230224190555.7409-11-vr_qemu@t-online.de> --- audio/audio.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/audio/audio.c b/audio/audio.c index 9e9c03a42e..22c36d6660 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -576,10 +576,10 @@ static void audio_pcm_sw_resample_in(SWVoiceIn *sw, } } =20 -static size_t audio_pcm_sw_read(SWVoiceIn *sw, void *buf, size_t size) +static size_t audio_pcm_sw_read(SWVoiceIn *sw, void *buf, size_t buf_len) { HWVoiceIn *hw =3D sw->hw; - size_t samples, live, ret, swlim, total; + size_t live, frames_out_max, swlim, total_in, total_out; =20 live =3D hw->total_samples_captured - sw->total_hw_samples_acquired; if (!live) { @@ -590,20 +590,20 @@ static size_t audio_pcm_sw_read(SWVoiceIn *sw, void *= buf, size_t size) return 0; } =20 - samples =3D size / sw->info.bytes_per_frame; + frames_out_max =3D buf_len / sw->info.bytes_per_frame; =20 swlim =3D (live * sw->ratio) >> 32; - swlim =3D MIN (swlim, samples); + swlim =3D MIN(swlim, frames_out_max); =20 - audio_pcm_sw_resample_in(sw, live, swlim, &total, &ret); + audio_pcm_sw_resample_in(sw, live, swlim, &total_in, &total_out); =20 if (!hw->pcm_ops->volume_in) { - mixeng_volume(sw->resample_buf.buffer, ret, &sw->vol); + mixeng_volume(sw->resample_buf.buffer, total_out, &sw->vol); } + sw->clip(buf, sw->resample_buf.buffer, total_out); =20 - sw->clip(buf, sw->resample_buf.buffer, ret); - sw->total_hw_samples_acquired +=3D total; - return ret * sw->info.bytes_per_frame; + sw->total_hw_samples_acquired +=3D total_in; + return total_out * sw->info.bytes_per_frame; } =20 /* --=20 2.39.2