[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 44/49] wavaudio: port to the new audio backend ap
From: |
Kővágó, Zoltán |
Subject: |
[Qemu-devel] [PATCH v2 44/49] wavaudio: port to the new audio backend api |
Date: |
Fri, 21 Aug 2015 17:37:40 +0200 |
Signed-off-by: Kővágó, Zoltán <address@hidden>
---
audio/wavaudio.c | 55 +++++++++----------------------------------------------
1 file changed, 9 insertions(+), 46 deletions(-)
diff --git a/audio/wavaudio.c b/audio/wavaudio.c
index edc78d5..e905911 100644
--- a/audio/wavaudio.c
+++ b/audio/wavaudio.c
@@ -33,52 +33,27 @@ 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, get_ticks_per_sec ());
-
- 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. */
@@ -134,13 +109,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 (AUDIO_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);
@@ -150,8 +118,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;
}
@@ -205,9 +171,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, ...)
@@ -231,7 +194,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.5.0
- [Qemu-devel] [PATCH v2 33/49] audio: remove read and write pcm_ops, (continued)
- [Qemu-devel] [PATCH v2 33/49] audio: remove read and write pcm_ops, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 26/49] audio: audiodev= parameters no longer optional when -audiodev present, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 30/49] audio: remove audio_MIN, audio_MAX, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 35/49] audio: api for mixeng code free backends, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 37/49] coreaudio: port to the new audio backend api, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 39/49] noaudio: port to the new audio backend api, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 34/49] audio: use size_t where makes sense, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 38/49] dsoundaudio: port to the new audio backend api, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 40/49] ossaudio: port to the new audio backend api, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 42/49] sdlaudio: port to the new audio backend api, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 44/49] wavaudio: port to the new audio backend api,
Kővágó, Zoltán <=
- [Qemu-devel] [PATCH v2 45/49] audio: remove remains of the old backend api, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 41/49] paaudio: port to the new audio backend api, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 36/49] alsaaudio: port to the new audio backend api, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 46/49] audio: unify input and output mixeng buffer management, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 47/49] audio: remove hw->samples, buffer_size_in/out pcm_ops, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 48/49] audio: common rate control code for timer based outputs, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 49/49] audio: split ctl_* functions into enable_* and volume_*, Kővágó, Zoltán, 2015/08/21