mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

audio/spiceaudio: always rate limit playback stream

Browse Source 
The playback rate with the spiceaudio backend is currently too
fast if there's no spice client connected or the spice client
can't play audio. Rate limit the audio playback stream in all
cases. To calculate the rate correctly the limiter has to know
the maximum buffer size.

Fixes: 8c198ff065 ("spiceaudio: port to the new audio backend api")
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
Message-id: 20200920171729.15861-3-vr_qemu@t-online.de
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Volker Rümelin 2020-09-20 19:17:23 +02:00 committed by Gerd Hoffmann
parent 4c3356f965
commit aec6d0dc4e
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
audio/audio.c
View File

@ -1089,7 +1089,8 @@ static size_t audio_pcm_hw_run_out(HWVoiceOut *hw, size_t live)
size_t clipped = 0; size_t clipped = 0;
while (live) { while (live) {
size_t size, decr, proc; size_t size = live * hw->info.bytes_per_frame;
size_t decr, proc;
void *buf = hw->pcm_ops->get_buffer_out(hw, &size); void *buf = hw->pcm_ops->get_buffer_out(hw, &size);
if (size == 0) { if (size == 0) {

10
audio/spiceaudio.c
View File

@ -130,13 +130,11 @@ static void *line_out_get_buffer(HWVoiceOut *hw, size_t *size)
} }
if (out->frame) { if (out->frame) {
*size = audio_rate_get_bytes( *size = MIN((out->fsize - out->fpos) << 2, *size);
&hw->info, &out->rate,
(out->fsize - out->fpos) * hw->info.bytes_per_frame);
} else {
audio_rate_start(&out->rate);
*size = LINE_OUT_SAMPLES << 2;
} }
*size = audio_rate_get_bytes(&hw->info, &out->rate, *size);
return out->frame + out->fpos; return out->frame + out->fpos;
} }