From patchwork Mon Feb 6 18:52:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Volker_R=C3=BCmelin?= X-Patchwork-Id: 1738305 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) 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=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P9b4Z51PBz23y2 for ; Tue, 7 Feb 2023 05:53:18 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pP6bk-0004x5-Ui; Mon, 06 Feb 2023 13:52:52 -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 1pP6bf-0004vl-3L for qemu-devel@nongnu.org; Mon, 06 Feb 2023 13:52:50 -0500 Received: from mailout09.t-online.de ([194.25.134.84]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pP6bd-0005SY-7J for qemu-devel@nongnu.org; Mon, 06 Feb 2023 13:52:46 -0500 Received: from fwd76.dcpf.telekom.de (fwd76.aul.t-online.de [10.223.144.102]) by mailout09.t-online.de (Postfix) with SMTP id B4AD14A55; Mon, 6 Feb 2023 19:52:40 +0100 (CET) Received: from linpower.localnet ([79.208.25.151]) by fwd76.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1pP6bY-2RxiiH0; Mon, 6 Feb 2023 19:52:40 +0100 Received: by linpower.localnet (Postfix, from userid 1000) id 746D3200623; Mon, 6 Feb 2023 19:52:37 +0100 (CET) From: =?utf-8?q?Volker_R=C3=BCmelin?= To: Gerd Hoffmann , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Cc: qemu-devel@nongnu.org, Christian Schoenebeck , Mark Cave-Ayland Subject: [PATCH v2 02/17] audio: change type and name of the resample buffer Date: Mon, 6 Feb 2023 19:52:22 +0100 Message-Id: <20230206185237.8358-2-vr_qemu@t-online.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1675709560-E4D742C2-03257CA1/0/0 CLEAN NORMAL X-TOI-MSGID: 41bc744d-f515-417e-aa77-98919390c0f2 Received-SPF: none client-ip=194.25.134.84; envelope-from=volker.ruemelin@t-online.de; helo=mailout09.t-online.de X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Change the type of the resample buffer from struct st_sample * to STSampleBuffer. Also change the name from buf to resample_buf for better readability. The new variables resample_buf.size and resample_buf.pos will be used after the next patches. There is no functional change. Acked-by: Mark Cave-Ayland Signed-off-by: Volker Rümelin Reviewed-by: Marc-André Lureau --- audio/audio.c | 15 ++++++++------- audio/audio_int.h | 4 ++-- audio/audio_template.h | 10 ++++++---- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/audio/audio.c b/audio/audio.c index a0b54e4a2e..a399147486 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -555,7 +555,7 @@ static size_t audio_pcm_sw_read(SWVoiceIn *sw, void *buf, size_t size) { HWVoiceIn *hw = sw->hw; size_t samples, live, ret = 0, swlim, isamp, osamp, rpos, total = 0; - struct st_sample *src, *dst = sw->buf; + struct st_sample *src, *dst = sw->resample_buf.buffer; live = hw->total_samples_captured - sw->total_hw_samples_acquired; if (!live) { @@ -595,10 +595,10 @@ static size_t audio_pcm_sw_read(SWVoiceIn *sw, void *buf, size_t size) } if (!hw->pcm_ops->volume_in) { - mixeng_volume (sw->buf, ret, &sw->vol); + mixeng_volume(sw->resample_buf.buffer, ret, &sw->vol); } - sw->clip (buf, sw->buf, ret); + sw->clip(buf, sw->resample_buf.buffer, ret); sw->total_hw_samples_acquired += total; return ret * sw->info.bytes_per_frame; } @@ -706,10 +706,10 @@ static size_t audio_pcm_sw_write(SWVoiceOut *sw, void *buf, size_t size) samples = ((int64_t)MIN(dead, hw_free) << 32) / sw->ratio; samples = MIN(samples, size / sw->info.bytes_per_frame); if (samples) { - sw->conv(sw->buf, buf, samples); + sw->conv(sw->resample_buf.buffer, buf, samples); if (!sw->hw->pcm_ops->volume_out) { - mixeng_volume(sw->buf, samples, &sw->vol); + mixeng_volume(sw->resample_buf.buffer, samples, &sw->vol); } } @@ -724,7 +724,7 @@ static size_t audio_pcm_sw_write(SWVoiceOut *sw, void *buf, size_t size) osamp = blck; st_rate_flow_mix ( sw->rate, - sw->buf + pos, + sw->resample_buf.buffer + pos, sw->hw->mix_buf.buffer + wpos, &isamp, &osamp @@ -1061,7 +1061,8 @@ static void audio_capture_mix_and_clear(HWVoiceOut *hw, size_t rpos, size_t bytes = to_write * hw->info.bytes_per_frame; size_t written; - sw->buf = hw->mix_buf.buffer + rpos2; + sw->resample_buf.buffer = hw->mix_buf.buffer + rpos2; + sw->resample_buf.size = to_write; written = audio_pcm_sw_write (sw, NULL, bytes); if (written - bytes) { dolog("Could not mix %zu bytes into a capture " diff --git a/audio/audio_int.h b/audio/audio_int.h index 061845dcc2..8b163e1759 100644 --- a/audio/audio_int.h +++ b/audio/audio_int.h @@ -109,7 +109,7 @@ struct SWVoiceOut { struct audio_pcm_info info; t_sample *conv; int64_t ratio; - struct st_sample *buf; + STSampleBuffer resample_buf; void *rate; size_t total_hw_samples_mixed; int active; @@ -129,7 +129,7 @@ struct SWVoiceIn { int64_t ratio; void *rate; size_t total_hw_samples_acquired; - struct st_sample *buf; + STSampleBuffer resample_buf; f_sample *clip; HWVoiceIn *hw; char *name; diff --git a/audio/audio_template.h b/audio/audio_template.h index dd87170cbd..a0b653f52c 100644 --- a/audio/audio_template.h +++ b/audio/audio_template.h @@ -95,13 +95,13 @@ static void glue(audio_pcm_hw_alloc_resources_, TYPE)(HW *hw) static void glue (audio_pcm_sw_free_resources_, TYPE) (SW *sw) { - g_free (sw->buf); + g_free(sw->resample_buf.buffer); + sw->resample_buf.buffer = NULL; + sw->resample_buf.size = 0; if (sw->rate) { st_rate_stop (sw->rate); } - - sw->buf = NULL; sw->rate = NULL; } @@ -138,7 +138,9 @@ static int glue (audio_pcm_sw_alloc_resources_, TYPE) (SW *sw) return -1; } - sw->buf = g_new0(st_sample, samples); + sw->resample_buf.buffer = g_new0(st_sample, samples); + sw->resample_buf.size = samples; + sw->resample_buf.pos = 0; #ifdef DAC sw->rate = st_rate_start (sw->info.freq, sw->hw->info.freq);