[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 37/52] wavaudio: port to the new audio backend ap
From: |
Kővágó, Zoltán |
Subject: |
[Qemu-devel] [PATCH v2 37/52] wavaudio: port to the new audio backend api |
Date: |
Sun, 23 Dec 2018 21:52:13 +0100 |
Signed-off-by: Kővágó, Zoltán <address@hidden>
---
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;
-static int wav_run_out (HWVoiceOut *hw, int live)
+static size_t wav_write_out(HWVoiceOut *hw, void *buf, size_t len)
{
WAVVoiceOut *wav = (WAVVoiceOut *) hw;
- int 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. */
@@ -135,13 +111,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);
@@ -151,8 +120,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;
}
@@ -206,9 +173,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, ...)
@@ -232,7 +196,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.20.1
- [Qemu-devel] [PATCH v2 36/52] spiceaudio: port to the new audio backend api, (continued)
- [Qemu-devel] [PATCH v2 36/52] spiceaudio: port to the new audio backend api, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 32/52] noaudio: port to the new audio backend api, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 31/52] dsoundaudio: port to the new audio backend api, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 33/52] ossaudio: port to the new audio backend api, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 39/52] audio: unify input and output mixeng buffer management, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 30/52] coreaudio: port to the new audio backend api, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 40/52] audio: remove hw->samples, buffer_size_in/out pcm_ops, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 44/52] audio: make mixeng optional, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 46/52] audio: support more than two channels in volume setting, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 48/52] audio: basic support for multichannel audio, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 37/52] wavaudio: port to the new audio backend api,
Kővágó, Zoltán <=
- [Qemu-devel] [PATCH v2 35/52] sdlaudio: port to the new audio backend api, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 38/52] audio: remove remains of the old backend api, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 41/52] audio: common rate control code for timer based outputs, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 29/52] alsaaudio: port to the new audio backend api, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 34/52] paaudio: port to the new audio backend api, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 42/52] audio: split ctl_* functions into enable_* and volume_*, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 47/52] audio: replace shift in audio_pcm_info with bytes_per_frame, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 43/52] audio: add mixeng option (documentation), Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 50/52] usb-audio: do not count on avail bytes actually available, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 49/52] paaudio: channel-map option, Kővágó, Zoltán, 2018/12/23