From nobody Fri Nov 7 04:15:01 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1545600262129594.8208230156845; Sun, 23 Dec 2018 13:24:22 -0800 (PST) Received: from localhost ([127.0.0.1]:59943 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbBER-0005F7-KQ for importer@patchew.org; Sun, 23 Dec 2018 16:24:19 -0500 Received: from eggs.gnu.org ([208.118.235.92]:52536) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbAkA-0008CS-QB for qemu-devel@nongnu.org; Sun, 23 Dec 2018 15:53:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gbAk9-0003G0-H4 for qemu-devel@nongnu.org; Sun, 23 Dec 2018 15:53:02 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:50633) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gbAk9-0003DS-A4 for qemu-devel@nongnu.org; Sun, 23 Dec 2018 15:53:01 -0500 Received: by mail-wm1-x336.google.com with SMTP id n190so9881731wmd.0 for ; Sun, 23 Dec 2018 12:53:01 -0800 (PST) Received: from nullptr.home.dirty-ice.org (2a01-036c-0113-24a3-0000-0000-0000-0005.pool6.digikabel.hu. [2a01:36c:113:24a3::5]) by smtp.gmail.com with ESMTPSA id g198sm25456920wmd.23.2018.12.23.12.52.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Dec 2018 12:52:59 -0800 (PST) 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=toa5Yj8KNOnf+7+Nol6wtf7GLlK5GhyUi/dB0JzrOnM=; b=g1nA6pcWpuNiJGCJa2Mjp2oromVfwe60SMq3zRUhqzjJx/mvWTQgxONY0aF/cxKGEw /gw8xD5hQxdcvKsR95Yhpyaf3jeCuixc92BOmfWyNebHlRl4FNCb/FbRgljkh4AXNJHV PoYjD1q18s6eWc82K02XvcGCYMXkH6x8WNiXs+1FDYM3bYgCEr8ARhG28W8sg+HwrYhV CT0j893+m2LZgVIf9nO2m9XT3j8b1rtQcFHN4yWBA3RcRaSFzrd+BUECs4Uc8ttMp5qu xJvzKJYiBaDy0XtZk23f40bPSwE5bf0089RrYvcHdEZcxwysTxGIvrVVeJr7gKB/g3Z4 4gkQ== 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=toa5Yj8KNOnf+7+Nol6wtf7GLlK5GhyUi/dB0JzrOnM=; b=DOagKrNx7W0sfG5KcafAsaPEXOxiut9Q+aaULAoxX+ARVXtc4d7fA0Lu4EplhrmTA9 TOVoybTV+wpcheCvZsDdNPd1nkorDPec8JbMO4WyHxVXBwcXh5ZhLu2DVHGfLdYoAIhU u2W+eHltY+gBiisyCvEjo050I+wgXGdvHq94yBd41xqNCILPpQxUmDFfxyZxm9FZAb9i Yy472rl4pSDWEdo0P/Wa6BWkFI0z/Z3bEMjKZ/ivrHMN3DVD8ikbdRcoduyR7eDCx6hO MUtZzsy9CuSfAi3E5mu9r0zDmmeXZ2hkgC2IBSlJ4YNrB3kMe3zP+bnAMooSTkDQkJDl 9Cww== X-Gm-Message-State: AA+aEWZZt9OcCtMQIsRrEEggErXGsqLSUQ6yn7/VHMME0DxeVCLUEAJQ 0MpyyA02+lPBkFEv4uINllbedBgyAbg= X-Google-Smtp-Source: AFSGD/WuubybkomXxZBOSHoBa0b4DiQkZNufCylhmJUsT3flPoiiZ58mj3ROHcHw7QHApjCpdZSuaA== X-Received: by 2002:a1c:282:: with SMTP id 124mr9815208wmc.113.1545598380134; Sun, 23 Dec 2018 12:53:00 -0800 (PST) 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, 23 Dec 2018 21:52:13 +0100 Message-Id: <4a336338eda1c3f6b8d27003d840373ada76a099.1545598229.git.DirtY.iCE.hu@gmail.com> X-Mailer: git-send-email 2.20.1 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::336 Subject: [Qemu-devel] [PATCH v2 37/52] wavaudio: port to the new audio backend api 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: 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 58300663ff..31db03aadb 100644 --- a/audio/wavaudio.c +++ b/audio/wavaudio.c @@ -34,52 +34,28 @@ typedef struct WAVVoiceOut { HWVoiceOut hw; FILE *f; int64_t old_ticks; - void *pcm_buf; int total_samples; } WAVVoiceOut; =20 -static int wav_run_out (HWVoiceOut *hw, int live) +static size_t wav_write_out(HWVoiceOut *hw, void *buf, size_t len) { WAVVoiceOut *wav =3D (WAVVoiceOut *) hw; - int 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); =20 - 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)); - } - - 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. */ @@ -135,13 +111,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); @@ -151,8 +120,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 @@ -206,9 +173,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, ...) @@ -232,7 +196,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.20.1