[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/9] audio/audio: fix video playback slowdown with spiceaudio
From: |
Volker Rümelin |
Subject: |
[PATCH 2/9] audio/audio: fix video playback slowdown with spiceaudio |
Date: |
Sun, 20 Sep 2020 19:17:22 +0200 |
This patch allows the audio backends get_buffer_out() functions
to drop audio data and mitigates a bug reported on the qemu-devel
mailing list.
https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg03832.html
The new rules for the variables buf and size returned by
get_buffer_out() are:
size == 0: Downstream playback buffer is full. Retry later.
size > 0, buf != NULL: Copy size bytes to buf for playback.
size > 0, buf == NULL: Drop size bytes.
The audio playback rate with spiceaudio for the no audio case is
too fast, but that's what we had before commit fb35c2cec5
"audio/dsound: fix invalid parameters error". The complete fix
comes with the next patch.
Reported-by: Qi Zhou <atmgnd@outlook.com>
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
---
audio/audio.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/audio/audio.c b/audio/audio.c
index ce8c6dec5f..ad3f57b4c4 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -1091,12 +1091,15 @@ static size_t audio_pcm_hw_run_out(HWVoiceOut *hw,
size_t live)
while (live) {
size_t size, decr, proc;
void *buf = hw->pcm_ops->get_buffer_out(hw, &size);
- if (!buf || size == 0) {
+
+ if (size == 0) {
break;
}
decr = MIN(size / hw->info.bytes_per_frame, live);
- audio_pcm_hw_clip_out(hw, buf, decr);
+ if (buf) {
+ audio_pcm_hw_clip_out(hw, buf, decr);
+ }
proc = hw->pcm_ops->put_buffer_out(hw, buf,
decr * hw->info.bytes_per_frame) /
hw->info.bytes_per_frame;
--
2.26.2
- [PATCH 0/9] Audio fixes and improvements, Volker Rümelin, 2020/09/20
- [PATCH 1/9] audio: handle buf == NULL in put_buffer_out(), Volker Rümelin, 2020/09/20
- [PATCH 3/9] audio/spiceaudio: always rate limit playback stream, Volker Rümelin, 2020/09/20
- [PATCH 2/9] audio/audio: fix video playback slowdown with spiceaudio,
Volker Rümelin <=
- [PATCH 4/9] audio: align audio_generic_read with audio_pcm_hw_run_in, Volker Rümelin, 2020/09/20
- [PATCH 7/9] audio: run downstream playback queue unconditionally, Volker Rümelin, 2020/09/20
- [PATCH 8/9] audio: restore mixing-engine playback buffer size, Volker Rümelin, 2020/09/20
- [PATCH 6/9] audio: align audio_generic_write with audio_pcm_hw_run_out, Volker Rümelin, 2020/09/20
- [PATCH 5/9] audio: remove unnecessary calls to put_buffer_in, Volker Rümelin, 2020/09/20
- [PATCH 9/9] audio: revert tests for pcm_ops table, Volker Rümelin, 2020/09/20
- Re: [PATCH 0/9] Audio fixes and improvements, Gerd Hoffmann, 2020/09/23