From nobody Wed Nov 12 07:06:59 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1568576244; cv=none; d=zoho.com; s=zohoarc; b=QYKOe1x3YPXW8BR2XPUyZTAZDdj+UPCUADzgI0Ajbf5T3ghyBldaTxEhfFjwpHLcdkM9ew/x3dh6lIcVeoGrR0sbFcHC4gWAR9Xa2+D0hUsa0pqcuydKlYdd8Wlsf3QWz07zGckdW7rUNzZpRSUfMpOVe/Puqn5xtdCJBnwbUvA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568576244; 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:ARC-Authentication-Results; bh=DUW7OK1573+eRJ/c4anJ7nOB3W09/QGNLs1FK1NrsmM=; b=PKjOjVlskGANu7Mf4WFhDE/tTVEgFRPMCFeZBWm7Bws/+OvZ2Ko8dPwDnr/PW4iiWWWnDdCg+kc1n+2feKBSumh46hIodrXrejmufmFxAyD8OYG0C/xiYbalVz/qppYbrezSZ851WP/nrproXa29Zt2Wd5IZKzXllCxCaqB3LV0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.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 1568576244416215.68984965548032; Sun, 15 Sep 2019 12:37:24 -0700 (PDT) Received: from localhost ([::1]:56648 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i9aKo-00022q-GJ for importer@patchew.org; Sun, 15 Sep 2019 15:37:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40021) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i9a7i-00063Y-Hm for qemu-devel@nongnu.org; Sun, 15 Sep 2019 15:23:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i9a7h-0001zi-Cv for qemu-devel@nongnu.org; Sun, 15 Sep 2019 15:23:50 -0400 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]:43400) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i9a7h-0001zM-6j for qemu-devel@nongnu.org; Sun, 15 Sep 2019 15:23:49 -0400 Received: by mail-ed1-x52e.google.com with SMTP id r9so2479925edl.10 for ; Sun, 15 Sep 2019 12:23:49 -0700 (PDT) Received: from nullptr.home.dirty-ice.org (2a01-036c-0113-74ef-0000-0000-0000-0005.pool6.digikabel.hu. [2a01:36c:113:74ef::5]) by smtp.gmail.com with ESMTPSA id j20sm6480562edy.95.2019.09.15.12.23.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Sep 2019 12:23:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DUW7OK1573+eRJ/c4anJ7nOB3W09/QGNLs1FK1NrsmM=; b=QNZxXXirzCh84qU7P008e9TrdHG7H8baMWI5cC2oiOEY5fhNcH5EO/oVh8/BAtUv+i mh0Beo2rCIs/dTCmsmrntzYXbDK5YbcikYI9f5ihq8V6diJBQf3+mlJAg9kEXLlHk1WU 6mHH9VwISkO0whrE62c2h3r4SgGU+WuiDj3jcSHtHJiwj9+izLP3UrcXQhilmS2wZ+sx el30o2ud4//CobqA5wJrpCUYDFT5oYY+qEAv7dk3gJMTKnkeEweN82+uH8GNndzF+lZn DXfrmj5j9XNWT6yXnQ1zga/bmws4pxTJc8c29pH2lz0SDfXFBmNA1bjZBRKSq4EwPhhg U13g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DUW7OK1573+eRJ/c4anJ7nOB3W09/QGNLs1FK1NrsmM=; b=iXAC8bthHCDnQSmc5niXWkmGP9IPKbRbgjSi9WXm6SqV+ppG5h/UK0NRSx7Tl/HTlt 9s6l/upfnIVz4WSXoe/frb8D7J+cZcuinzUUdJLUkQ17615a9B2iqb37VBbUXKrVCS7c OPi19pV0OGqYNuGT31v6WxT/MDwS8fD11OqRd52Klq26c+DSWo77TgnxC2BHdusSLKa1 zOJj49lqqtgl7obqRs3WzSctWYkSR87w5wme3eiTwkRzar6KgfmFjjl8saMWr2/UVH8a jZWfkF7UI96kRcyMiGTRva0/eN0hbmI67FViKKXbw5WkOBKdSqVi2LnSymcHOP05pwTM fMnw== X-Gm-Message-State: APjAAAVrr8Y3K1TxpKlwiWJZlKbTjyaNwI9oCGx53CwhX9mn8vKdzs6f 4FTaxMKwDlrlN+VtjxepL61V0Jue X-Google-Smtp-Source: APXvYqxvBWzfMm4bklRWvLGZs4PBpU8jspd4l4CpH4XcJubhFGAxgmevGQAb3+rG5oUtJrqrc4yfkw== X-Received: by 2002:aa7:db05:: with SMTP id t5mr59331743eds.242.1568575428029; Sun, 15 Sep 2019 12:23:48 -0700 (PDT) From: "=?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?=" X-Google-Original-From: =?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?= To: qemu-devel@nongnu.org Date: Sun, 15 Sep 2019 21:23:26 +0200 Message-Id: X-Mailer: git-send-email 2.23.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::52e Subject: [Qemu-devel] [PATCH v3 10/24] wavaudio: port to the new audio backend api 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: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Signed-off-by: K=C5=91v=C3=A1g=C3=B3, Zolt=C3=A1n --- audio/wavaudio.c | 54 ++++++++---------------------------------------- 1 file changed, 9 insertions(+), 45 deletions(-) diff --git a/audio/wavaudio.c b/audio/wavaudio.c index b6eeeb4e26..7816097db8 100644 --- a/audio/wavaudio.c +++ b/audio/wavaudio.c @@ -36,52 +36,28 @@ typedef struct WAVVoiceOut { HWVoiceOut hw; FILE *f; int64_t old_ticks; - void *pcm_buf; int total_samples; } WAVVoiceOut; =20 -static size_t wav_run_out(HWVoiceOut *hw, size_t live) +static size_t wav_write_out(HWVoiceOut *hw, void *buf, size_t len) { WAVVoiceOut *wav =3D (WAVVoiceOut *) hw; - size_t rpos, decr, samples; - uint8_t *dst; - struct st_sample *src; int64_t now =3D qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); int64_t ticks =3D now - wav->old_ticks; int64_t bytes =3D muldiv64(ticks, hw->info.bytes_per_second, NANOSECONDS_PER_SECOND); =20 - if (bytes > INT_MAX) { - samples =3D INT_MAX >> hw->info.shift; - } - else { - samples =3D bytes >> hw->info.shift; - } - + bytes =3D MIN(bytes, len); + bytes =3D bytes >> hw->info.shift << hw->info.shift; wav->old_ticks =3D now; - decr =3D MIN (live, samples); - samples =3D decr; - rpos =3D hw->rpos; - while (samples) { - int left_till_end_samples =3D hw->samples - rpos; - int convert_samples =3D MIN (samples, left_till_end_samples); - - src =3D hw->mix_buf + rpos; - dst =3D advance (wav->pcm_buf, rpos << hw->info.shift); - - hw->clip (dst, src, convert_samples); - if (fwrite (dst, convert_samples << hw->info.shift, 1, wav->f) != =3D 1) { - dolog ("wav_run_out: fwrite of %d bytes failed\nReaons: %s\n", - convert_samples << hw->info.shift, strerror (errno)); - } =20 - rpos =3D (rpos + convert_samples) % hw->samples; - samples -=3D convert_samples; - wav->total_samples +=3D convert_samples; + if (bytes && fwrite(buf, bytes, 1, wav->f) !=3D 1) { + dolog("wav_write_out: fwrite of %zu bytes failed\nReaons: %s\n", + bytes, strerror(errno)); } =20 - hw->rpos =3D rpos; - return decr; + wav->total_samples +=3D bytes >> hw->info.shift; + return bytes; } =20 /* VICE code: Store number as little endian. */ @@ -137,13 +113,6 @@ static int wav_init_out(HWVoiceOut *hw, struct audsett= ings *as, audio_pcm_init_info (&hw->info, &wav_as); =20 hw->samples =3D 1024; - wav->pcm_buf =3D audio_calloc(__func__, hw->samples, 1 << hw->info.shi= ft); - if (!wav->pcm_buf) { - dolog("Could not allocate buffer (%zu bytes)\n", - hw->samples << hw->info.shift); - return -1; - } - le_store (hdr + 22, hw->info.nchannels, 2); le_store (hdr + 24, hw->info.freq, 4); le_store (hdr + 28, hw->info.freq << (bits16 + stereo), 4); @@ -153,8 +122,6 @@ static int wav_init_out(HWVoiceOut *hw, struct audsetti= ngs *as, if (!wav->f) { dolog ("Failed to open wave file `%s'\nReason: %s\n", wav_path, strerror(errno)); - g_free (wav->pcm_buf); - wav->pcm_buf =3D NULL; return -1; } =20 @@ -208,9 +175,6 @@ static void wav_fini_out (HWVoiceOut *hw) wav->f, strerror (errno)); } wav->f =3D NULL; - - g_free (wav->pcm_buf); - wav->pcm_buf =3D NULL; } =20 static int wav_ctl_out (HWVoiceOut *hw, int cmd, ...) @@ -234,7 +198,7 @@ static void wav_audio_fini (void *opaque) static struct audio_pcm_ops wav_pcm_ops =3D { .init_out =3D wav_init_out, .fini_out =3D wav_fini_out, - .run_out =3D wav_run_out, + .write =3D wav_write_out, .ctl_out =3D wav_ctl_out, }; =20 --=20 2.23.0