[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/20] asc: generate silence if FIFO empty but engine still runnin
From: |
Laurent Vivier |
Subject: |
[PULL 08/20] asc: generate silence if FIFO empty but engine still running |
Date: |
Sun, 8 Oct 2023 08:23:37 +0200 |
From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
MacOS (un)helpfully leaves the FIFO engine running even when all the samples
have
been written to the hardware, and expects the FIFO status flags and IRQ to be
updated continuously.
There is an additional problem in that not all audio backends guarantee an
all-zero output when there is no FIFO data available, in particular the Windows
dsound backend which re-uses its internal circular buffer causing the last
played
sound to loop indefinitely.
Whilst this is effectively a bug in the Windows dsound backend, work around it
for now using a simple heuristic: if the FIFO remains empty for half a cycle
(~23ms) then continuously fill the generated buffer with empty silence.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-ID: <20231004083806.757242-9-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
include/hw/audio/asc.h | 2 ++
hw/audio/asc.c | 19 +++++++++++++++++++
2 files changed, 21 insertions(+)
diff --git a/include/hw/audio/asc.h b/include/hw/audio/asc.h
index d9412815c324..4741f92c4613 100644
--- a/include/hw/audio/asc.h
+++ b/include/hw/audio/asc.h
@@ -68,6 +68,8 @@ struct ASCState {
int samples;
int shift;
+ uint8_t *silentbuf;
+
/* Time when we were last able to generate samples */
int64_t fifo_empty_ns;
diff --git a/hw/audio/asc.c b/hw/audio/asc.c
index 9084708eafab..0f36b4ce9b6f 100644
--- a/hw/audio/asc.c
+++ b/hw/audio/asc.c
@@ -341,6 +341,21 @@ static void asc_out_cb(void *opaque, int free_b)
}
if (!generated) {
+ /* Workaround for audio underflow bug on Windows dsound backend */
+ int64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
+ int silent_samples = muldiv64(now - s->fifo_empty_ns,
+ NANOSECONDS_PER_SECOND, ASC_FREQ);
+
+ if (silent_samples > ASC_FIFO_CYCLE_TIME / 2) {
+ /*
+ * No new FIFO data within half a cycle time (~23ms) so fill the
+ * entire available buffer with silence. This prevents an issue
+ * with the Windows dsound backend whereby the sound appears to
+ * loop because the FIFO has run out of data, and the driver
+ * reuses the stale content in its circular audio buffer.
+ */
+ AUD_write(s->voice, s->silentbuf, samples << s->shift);
+ }
return;
}
@@ -618,6 +633,7 @@ static void asc_unrealize(DeviceState *dev)
ASCState *s = ASC(dev);
g_free(s->mixbuf);
+ g_free(s->silentbuf);
AUD_remove_card(&s->card);
}
@@ -642,6 +658,9 @@ static void asc_realize(DeviceState *dev, Error **errp)
s->samples = AUD_get_buffer_size_out(s->voice) >> s->shift;
s->mixbuf = g_malloc0(s->samples << s->shift);
+ s->silentbuf = g_malloc0(s->samples << s->shift);
+ memset(s->silentbuf, 0x80, s->samples << s->shift);
+
/* Add easc registers if required */
if (s->type == ASC_TYPE_EASC) {
memory_region_add_subregion(&s->asc, ASC_EXTREG_OFFSET,
--
2.41.0
- [PULL 00/20] Q800 for 8.2 patches, Laurent Vivier, 2023/10/08
- [PULL 04/20] q800: implement additional machine id bits on VIA1 port A, Laurent Vivier, 2023/10/08
- [PULL 02/20] q800: add djMEMC memory controller, Laurent Vivier, 2023/10/08
- [PULL 01/20] q800-glue.c: convert to Resettable interface, Laurent Vivier, 2023/10/08
- [PULL 05/20] q800: add IOSB subsystem, Laurent Vivier, 2023/10/08
- [PULL 06/20] q800: allow accesses to RAM area even if less memory is available, Laurent Vivier, 2023/10/08
- [PULL 08/20] asc: generate silence if FIFO empty but engine still running,
Laurent Vivier <=
- [PULL 03/20] q800: add machine id register, Laurent Vivier, 2023/10/08
- [PULL 07/20] audio: add Apple Sound Chip (ASC) emulation, Laurent Vivier, 2023/10/08
- [PULL 09/20] q800: add Apple Sound Chip (ASC) audio to machine, Laurent Vivier, 2023/10/08
- [PULL 10/20] q800: add easc bool machine class property to switch between ASC and EASC, Laurent Vivier, 2023/10/08
- [PULL 11/20] swim: add trace events for IWM and ISM registers, Laurent Vivier, 2023/10/08
- [PULL 12/20] swim: split into separate IWM and ISM register blocks, Laurent Vivier, 2023/10/08
- [PULL 13/20] swim: update IWM/ISM register block decoding, Laurent Vivier, 2023/10/08
- [PULL 14/20] mac_via: work around underflow in TimeDBRA timing loop in SETUPTIMEK, Laurent Vivier, 2023/10/08
- [PULL 15/20] mac_via: workaround NetBSD ADB bus enumeration issue, Laurent Vivier, 2023/10/08
- [PULL 16/20] mac_via: implement ADB_STATE_IDLE state if shift register in input mode, Laurent Vivier, 2023/10/08