motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-08 16:07:39 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

wavaudio: port to the new audio backend api

Browse source 
Signed-off-by: Kővágó, Zoltán <DirtY.iCE.hu@gmail.com>
Message-id: eede77aeb9c17b379948b0b6d2ac10f45d74fa62.1568927990.git.DirtY.iCE.hu@gmail.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Kővágó, Zoltán 2019-09-19 23:24:18 +02:00 • committed by Gerd Hoffmann
parent 8c198ff065
commit ef3612e11b
1 changed files with 9 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

54
audio/wavaudio.c
View file

@ -36,52 +36,28 @@ typedef struct WAVVoiceOut {
HWVoiceOut hw; HWVoiceOut hw;
FILE *f; FILE *f;
int64_t old_ticks; int64_t old_ticks;
void *pcm_buf;
int total_samples; int total_samples;
} WAVVoiceOut; } 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; 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 now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
int64_t ticks = now - wav->old_ticks; int64_t ticks = now - wav->old_ticks;
int64_t bytes = int64_t bytes =
muldiv64(ticks, hw->info.bytes_per_second, NANOSECONDS_PER_SECOND); muldiv64(ticks, hw->info.bytes_per_second, NANOSECONDS_PER_SECOND);
if (bytes > INT_MAX) { bytes = MIN(bytes, len);
samples = INT_MAX >> hw->info.shift; bytes = bytes >> hw->info.shift << hw->info.shift;
}
else {
samples = bytes >> hw->info.shift;
}
wav->old_ticks = now; 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; if (bytes && fwrite(buf, bytes, 1, wav->f) != 1) {
dst = advance (wav->pcm_buf, rpos << hw->info.shift); dolog("wav_write_out: fwrite of %" PRId64 " bytes failed\nReason: %s\n",
bytes, strerror(errno));
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;
} }
hw->rpos = rpos; wav->total_samples += bytes >> hw->info.shift;
return decr; return bytes;
} }
/* VICE code: Store number as little endian. */ /* 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); audio_pcm_init_info (&hw->info, &wav_as);
hw->samples = 1024; 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 + 22, hw->info.nchannels, 2);
le_store (hdr + 24, hw->info.freq, 4); le_store (hdr + 24, hw->info.freq, 4);
le_store (hdr + 28, hw->info.freq << (bits16 + stereo), 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) { if (!wav->f) {
dolog ("Failed to open wave file `%s'\nReason: %s\n", dolog ("Failed to open wave file `%s'\nReason: %s\n",
wav_path, strerror(errno)); wav_path, strerror(errno));
g_free (wav->pcm_buf);
wav->pcm_buf = NULL;
return -1; return -1;
} }
@ -208,9 +175,6 @@ static void wav_fini_out (HWVoiceOut *hw)
wav->f, strerror (errno)); wav->f, strerror (errno));
} }
wav->f = NULL; wav->f = NULL;
g_free (wav->pcm_buf);
wav->pcm_buf = NULL;
} }
static int wav_ctl_out (HWVoiceOut *hw, int cmd, ...) 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 = { static struct audio_pcm_ops wav_pcm_ops = {
.init_out = wav_init_out, .init_out = wav_init_out,
.fini_out = wav_fini_out, .fini_out = wav_fini_out,
.run_out = wav_run_out, .write = wav_write_out,
.ctl_out = wav_ctl_out, .ctl_out = wav_ctl_out,
}; };