From: "Volker Rümelin" <vr_qemu@t-online.de>
To: Gerd Hoffmann <kraxel@redhat.com>
Cc: qemu-devel <qemu-devel@nongnu.org>,
"Zoltán Kővágó" <dirty.ice.hu@gmail.com>
Subject: [PATCH 6/9] audio: align audio_generic_write with audio_pcm_hw_run_out
Date: Sun, 20 Sep 2020 19:17:26 +0200 [thread overview]
Message-ID: <20200920171729.15861-6-vr_qemu@t-online.de> (raw)
In-Reply-To: <84f1c61a-8399-c75e-96c2-febfc2dd5fab@t-online.de>
The function audio_generic_write should work exactly like
audio_pcm_hw_run_out. It's a very similar function working on a
different buffer.
This patch significantly reduces the number of drop-outs with
the DirectSound backend. To hear the difference start qemu with
-audiodev dsound,id=audio0,out.mixing-engine=off and play a
song in the guest with and without this patch.
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
---
audio/audio.c | 32 +++++++++++++++++++++++++++-----
1 file changed, 27 insertions(+), 5 deletions(-)
diff --git a/audio/audio.c b/audio/audio.c
index 75107a12d0..57eddb3324 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -1484,12 +1484,34 @@ size_t audio_generic_put_buffer_out(HWVoiceOut *hw, void *buf, size_t size)
size_t audio_generic_write(HWVoiceOut *hw, void *buf, size_t size)
{
- size_t dst_size, copy_size;
- void *dst = hw->pcm_ops->get_buffer_out(hw, &dst_size);
- copy_size = MIN(size, dst_size);
+ size_t total = 0;
+
+ while (total < size) {
+ size_t dst_size = size - total;
+ size_t copy_size, proc;
+ void *dst = hw->pcm_ops->get_buffer_out(hw, &dst_size);
- memcpy(dst, buf, copy_size);
- return hw->pcm_ops->put_buffer_out(hw, dst, copy_size);
+ if (dst_size == 0) {
+ break;
+ }
+
+ copy_size = MIN(size - total, dst_size);
+ if (dst) {
+ memcpy(dst, (char *)buf + total, copy_size);
+ }
+ proc = hw->pcm_ops->put_buffer_out(hw, dst, copy_size);
+ total += proc;
+
+ if (proc == 0 || proc < copy_size) {
+ break;
+ }
+ }
+
+ if (hw->pcm_ops->run_buffer_out) {
+ hw->pcm_ops->run_buffer_out(hw);
+ }
+
+ return total;
}
size_t audio_generic_read(HWVoiceIn *hw, void *buf, size_t size)
--
2.26.2
next prev parent reply other threads:[~2020-09-20 17:19 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-20 17:14 [PATCH 0/9] Audio fixes and improvements Volker Rümelin
2020-09-20 17:17 ` [PATCH 1/9] audio: handle buf == NULL in put_buffer_out() Volker Rümelin
2020-09-20 17:17 ` [PATCH 2/9] audio/audio: fix video playback slowdown with spiceaudio Volker Rümelin
2020-09-20 17:17 ` [PATCH 3/9] audio/spiceaudio: always rate limit playback stream Volker Rümelin
2020-09-20 17:17 ` [PATCH 4/9] audio: align audio_generic_read with audio_pcm_hw_run_in Volker Rümelin
2020-09-20 17:17 ` [PATCH 5/9] audio: remove unnecessary calls to put_buffer_in Volker Rümelin
2020-09-20 17:17 ` Volker Rümelin [this message]
2020-09-20 17:17 ` [PATCH 7/9] audio: run downstream playback queue unconditionally Volker Rümelin
2020-09-20 17:17 ` [PATCH 8/9] audio: restore mixing-engine playback buffer size Volker Rümelin
2020-09-23 6:36 ` Gerd Hoffmann
2020-09-24 17:42 ` Volker Rümelin
2020-09-20 17:17 ` [PATCH 9/9] audio: revert tests for pcm_ops table Volker Rümelin
2020-09-23 9:07 ` [PATCH 0/9] Audio fixes and improvements Gerd Hoffmann
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=20200920171729.15861-6-vr_qemu@t-online.de \
--to=vr_qemu@t-online.de \
--cc=dirty.ice.hu@gmail.com \
--cc=kraxel@redhat.com \
--cc=qemu-devel@nongnu.org \
/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).