diff options
| author | Volker Rümelin | 2021-01-10 11:02:31 +0100 |
|---|---|---|
| committer | Gerd Hoffmann | 2021-01-15 11:25:22 +0100 |
| commit | 7007cd3fc89f6357db8f4d3161c02d3af2274c33 (patch) | |
| tree | b7cd67561498ac096f810cf3e41d4f5b1063776d /audio | |
| parent | paaudio: wait for PA_STREAM_READY in qpa_write() (diff) | |
| download | qemu-7007cd3fc89f6357db8f4d3161c02d3af2274c33.tar.gz qemu-7007cd3fc89f6357db8f4d3161c02d3af2274c33.tar.xz qemu-7007cd3fc89f6357db8f4d3161c02d3af2274c33.zip | |
paaudio: wait until the playback stream is ready
Don't call pa_stream_writable_size() in qpa_get_buffer_out()
before the playback stream is ready. This prevents a lot of the
following pulseaudio error messages.
pulseaudio: pa_stream_writable_size failed
pulseaudio: Reason: Bad state
To reproduce start qemu with
-parallel none -device gus,audiodev=audio0 -audiodev pa,id=audio0
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
Message-id: 9315afe5-5958-c0b4-ea1e-14769511a9d5@t-online.de
Message-Id: <20210110100239.27588-15-vr_qemu@t-online.de>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/paaudio.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/audio/paaudio.c b/audio/paaudio.c index 1a7252b16d..4a1ffda753 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -214,6 +214,12 @@ static void *qpa_get_buffer_out(HWVoiceOut *hw, size_t *size) CHECK_DEAD_GOTO(c, p->stream, unlock_and_fail, "pa_threaded_mainloop_lock failed\n"); + if (pa_stream_get_state(p->stream) != PA_STREAM_READY) { + /* wait for stream to become ready */ + l = 0; + ret = NULL; + goto unlock; + } l = pa_stream_writable_size(p->stream); CHECK_SUCCESS_GOTO(c, l != (size_t) -1, unlock_and_fail, @@ -224,6 +230,7 @@ static void *qpa_get_buffer_out(HWVoiceOut *hw, size_t *size) CHECK_SUCCESS_GOTO(c, r >= 0, unlock_and_fail, "pa_stream_begin_write failed\n"); +unlock: pa_threaded_mainloop_unlock(c->mainloop); if (*size > l) { *size = l; |