From: "Kővágó, Zoltán" <dirty.ice.hu@gmail.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PATCH v2 10/24] wavaudio: port to the new audio backend api
Date: Sun, 8 Sep 2019 23:22:10 +0200 [thread overview]
Message-ID: <f13da4b48e7220b186037fdc75d6b13a9174519d.1567965065.git.DirtY.iCE.hu@gmail.com> (raw)
In-Reply-To: <cover.1567965065.git.DirtY.iCE.hu@gmail.com>
Signed-off-by: Kővágó, Zoltán <DirtY.iCE.hu@gmail.com>
---
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;
-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 = (WAVVoiceOut *) hw;
- size_t rpos, decr, samples;
- uint8_t *dst;
- struct st_sample *src;
int64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
int64_t ticks = now - wav->old_ticks;
int64_t bytes =
muldiv64(ticks, hw->info.bytes_per_second, NANOSECONDS_PER_SECOND);
- if (bytes > INT_MAX) {
- samples = INT_MAX >> hw->info.shift;
- }
- else {
- samples = bytes >> hw->info.shift;
- }
-
+ bytes = MIN(bytes, len);
+ bytes = bytes >> hw->info.shift << hw->info.shift;
wav->old_ticks = now;
- decr = MIN (live, samples);
- samples = decr;
- rpos = hw->rpos;
- while (samples) {
- int left_till_end_samples = hw->samples - rpos;
- int convert_samples = MIN (samples, left_till_end_samples);
-
- src = hw->mix_buf + rpos;
- dst = 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) != 1) {
- dolog ("wav_run_out: fwrite of %d bytes failed\nReaons: %s\n",
- convert_samples << hw->info.shift, strerror (errno));
- }
- rpos = (rpos + convert_samples) % hw->samples;
- samples -= convert_samples;
- wav->total_samples += convert_samples;
+ if (bytes && fwrite(buf, bytes, 1, wav->f) != 1) {
+ dolog("wav_write_out: fwrite of %zu bytes failed\nReaons: %s\n",
+ bytes, strerror(errno));
}
- hw->rpos = rpos;
- return decr;
+ wav->total_samples += bytes >> hw->info.shift;
+ return bytes;
}
/* VICE code: Store number as little endian. */
@@ -137,13 +113,6 @@ static int wav_init_out(HWVoiceOut *hw, struct audsettings *as,
audio_pcm_init_info (&hw->info, &wav_as);
hw->samples = 1024;
- wav->pcm_buf = audio_calloc(__func__, hw->samples, 1 << hw->info.shift);
- 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 audsettings *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 = NULL;
return -1;
}
@@ -208,9 +175,6 @@ static void wav_fini_out (HWVoiceOut *hw)
wav->f, strerror (errno));
}
wav->f = NULL;
-
- g_free (wav->pcm_buf);
- wav->pcm_buf = NULL;
}
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 = {
.init_out = wav_init_out,
.fini_out = wav_fini_out,
- .run_out = wav_run_out,
+ .write = wav_write_out,
.ctl_out = wav_ctl_out,
};
--
2.23.0
next prev parent reply other threads:[~2019-09-08 21:36 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-08 21:22 [Qemu-devel] [PATCH v2 00/24] Audio: Mixeng-free 5.1/7.1 audio support Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 01/24] audio: api for mixeng code free backends Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 02/24] alsaaudio: port to the new audio backend api Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 03/24] coreaudio: " Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 04/24] dsoundaudio: " Kővágó, Zoltán
2019-09-11 7:00 ` Gerd Hoffmann
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 05/24] noaudio: " Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 06/24] ossaudio: " Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 07/24] paaudio: " Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 08/24] sdlaudio: " Kővágó, Zoltán
2019-09-08 21:22 ` Kővágó, Zoltán [this message]
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 11/24] audio: remove remains of the old " Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 12/24] audio: unify input and output mixeng buffer management Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 13/24] audio: common rate control code for timer based outputs Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 14/24] audio: split ctl_* functions into enable_* and volume_* Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 15/24] audio: add mixeng option (documentation) Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 16/24] audio: make mixeng optional Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 18/24] audio: support more than two channels in volume setting Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 19/24] audio: replace shift in audio_pcm_info with bytes_per_frame Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 20/24] audio: basic support for multichannel audio Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 21/24] paaudio: channel-map option Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 22/24] usb-audio: do not count on avail bytes actually available Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 24/24] usbaudio: change playback counters to 64 bit Kővágó, Zoltán
2019-09-12 10:20 ` [Qemu-devel] [PATCH v2 00/24] Audio: Mixeng-free 5.1/7.1 audio support Gerd Hoffmann
2019-09-15 1:08 ` Zoltán Kővágó
2019-09-17 11:38 ` Gerd Hoffmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f13da4b48e7220b186037fdc75d6b13a9174519d.1567965065.git.DirtY.iCE.hu@gmail.com \
--to=dirty.ice.hu@gmail.com \
--cc=kraxel@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).