From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: "Volker Rümelin" <vr_qemu@t-online.de>,
"Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
laurent@vivier.eu, qemu-devel@nongnu.org,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: Re: [PATCH v2 08/20] asc: generate silence if FIFO empty but engine still running
Date: Sun, 17 Sep 2023 15:42:17 +0200 [thread overview]
Message-ID: <07f1473f-d308-aa8d-ca04-6f2d45e53686@linaro.org> (raw)
In-Reply-To: <1ffc1fab-94ef-445f-9df3-a029bf9e68ef@t-online.de>
On 16/9/23 10:19, Volker Rümelin wrote:
> Am 14.09.23 um 09:56 schrieb Philippe Mathieu-Daudé:
>>
>> On 9/9/23 11:48, Mark Cave-Ayland wrote:
>>> 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>
>>> ---
>>> hw/audio/asc.c | 19 +++++++++++++++++++
>>> include/hw/audio/asc.h | 2 ++
>>> 2 files changed, 21 insertions(+)
>>>
>>> diff --git a/hw/audio/asc.c b/hw/audio/asc.c
>>> index 336ace0cd6..b01b285512 100644
>>> --- a/hw/audio/asc.c
>>> +++ b/hw/audio/asc.c
>>> @@ -334,6 +334,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;
>>> }
>>
>> What about having audio_callback_fn returning a boolean, and using
>> a flag in backends for that silence case? Roughtly:
>>
>
> Hi Philippe,
>
> I don't think there will be many audio devices that need this feature in
> the future. It's probably better to keep the code in hw/audio/asc.c
>
> I plan to change the buffer underflow behavior of the DirectSound
> backend after these patches are commited. I already have a patch
> available. This doesn't mean this patch is unnecessary after my patch.
> It is a mistake when audio devices simply stop writing audio samples
> without changing the status of the audio playback stream to deactivated.
> At the moment the ASC device can't deactivate the audio stream.
OK, thanks for clarifying.
next prev parent reply other threads:[~2023-09-17 13:43 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-09 9:48 [PATCH v2 00/20] q800: add support for booting MacOS Classic - part 2 Mark Cave-Ayland
2023-09-09 9:48 ` [PATCH v2 01/20] q800-glue.c: convert to Resettable interface Mark Cave-Ayland
2023-09-25 17:03 ` Laurent Vivier
2023-09-09 9:48 ` [PATCH v2 02/20] q800: add djMEMC memory controller Mark Cave-Ayland
2023-09-09 9:48 ` [PATCH v2 03/20] q800: add machine id register Mark Cave-Ayland
2023-09-09 9:48 ` [PATCH v2 04/20] q800: implement additional machine id bits on VIA1 port A Mark Cave-Ayland
2023-09-09 9:48 ` [PATCH v2 05/20] q800: add IOSB subsystem Mark Cave-Ayland
2023-09-09 9:48 ` [PATCH v2 06/20] q800: allow accesses to RAM area even if less memory is available Mark Cave-Ayland
2023-09-09 9:48 ` [PATCH v2 07/20] audio: add Apple Sound Chip (ASC) emulation Mark Cave-Ayland
2023-09-14 7:06 ` Volker Rümelin
2023-09-20 15:39 ` Mark Cave-Ayland
2023-09-23 7:09 ` Volker Rümelin
2023-09-09 9:48 ` [PATCH v2 08/20] asc: generate silence if FIFO empty but engine still running Mark Cave-Ayland
2023-09-14 7:56 ` Philippe Mathieu-Daudé
2023-09-14 13:16 ` Philippe Mathieu-Daudé
2023-09-16 8:19 ` Volker Rümelin
2023-09-17 13:42 ` Philippe Mathieu-Daudé [this message]
2023-09-25 17:19 ` Laurent Vivier
2023-09-28 20:40 ` Mark Cave-Ayland
2023-09-09 9:48 ` [PATCH v2 09/20] q800: add Apple Sound Chip (ASC) audio to machine Mark Cave-Ayland
2023-09-09 9:48 ` [PATCH v2 10/20] q800: add easc bool machine class property to switch between ASC and EASC Mark Cave-Ayland
2023-09-26 7:54 ` Laurent Vivier
2023-09-09 9:48 ` [PATCH v2 11/20] swim: add trace events for IWM and ISM registers Mark Cave-Ayland
2023-09-26 7:55 ` Laurent Vivier
2023-09-09 9:48 ` [PATCH v2 12/20] swim: split into separate IWM and ISM register blocks Mark Cave-Ayland
2023-09-26 8:09 ` Laurent Vivier
2023-09-28 20:47 ` Mark Cave-Ayland
2023-09-09 9:48 ` [PATCH v2 13/20] swim: update IWM/ISM register block decoding Mark Cave-Ayland
2023-09-26 8:10 ` Laurent Vivier
2023-09-09 9:48 ` [PATCH v2 14/20] mac_via: work around underflow in TimeDBRA timing loop in SETUPTIMEK Mark Cave-Ayland
2023-09-26 8:04 ` Laurent Vivier
2023-09-09 9:48 ` [PATCH v2 15/20] mac_via: workaround NetBSD ADB bus enumeration issue Mark Cave-Ayland
2023-09-26 8:04 ` Laurent Vivier
2023-09-28 20:45 ` Mark Cave-Ayland
2023-09-09 9:48 ` [PATCH v2 16/20] mac_via: implement ADB_STATE_IDLE state if shift register in input mode Mark Cave-Ayland
2023-09-26 8:05 ` Laurent Vivier
2023-09-09 9:48 ` [PATCH v2 17/20] mac_via: always clear ADB interrupt when switching to A/UX mode Mark Cave-Ayland
2023-09-26 8:06 ` Laurent Vivier
2023-09-09 9:48 ` [PATCH v2 18/20] q800: add ESCC alias at 0xc000 Mark Cave-Ayland
2023-09-26 8:06 ` Laurent Vivier
2023-09-09 9:48 ` [PATCH v2 19/20] q800: add alias for MacOS toolbox ROM at 0x40000000 Mark Cave-Ayland
2023-09-26 8:06 ` Laurent Vivier
2023-09-09 9:48 ` [PATCH v2 20/20] mac_via: extend timer calibration hack to work with A/UX Mark Cave-Ayland
2023-09-26 8:07 ` Laurent Vivier
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=07f1473f-d308-aa8d-ca04-6f2d45e53686@linaro.org \
--to=philmd@linaro.org \
--cc=kraxel@redhat.com \
--cc=laurent@vivier.eu \
--cc=marcandre.lureau@redhat.com \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=qemu-devel@nongnu.org \
--cc=vr_qemu@t-online.de \
/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).