paaudio: wait for PA_STREAM_READY in qpa_write()
Don't call pa_stream_writable_size() in qpa_write() 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,out.mixing-engine=off 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-14-vr_qemu@t-online.de> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
parent
bea29e9f2e
commit
e270c54826
@ -269,6 +269,11 @@ static size_t qpa_write(HWVoiceOut *hw, void *data, size_t length)
|
|||||||
|
|
||||||
CHECK_DEAD_GOTO(c, p->stream, unlock_and_fail,
|
CHECK_DEAD_GOTO(c, p->stream, unlock_and_fail,
|
||||||
"pa_threaded_mainloop_lock failed\n");
|
"pa_threaded_mainloop_lock failed\n");
|
||||||
|
if (pa_stream_get_state(p->stream) != PA_STREAM_READY) {
|
||||||
|
/* wait for stream to become ready */
|
||||||
|
l = 0;
|
||||||
|
goto unlock;
|
||||||
|
}
|
||||||
|
|
||||||
l = pa_stream_writable_size(p->stream);
|
l = pa_stream_writable_size(p->stream);
|
||||||
|
|
||||||
@ -282,6 +287,7 @@ static size_t qpa_write(HWVoiceOut *hw, void *data, size_t length)
|
|||||||
r = pa_stream_write(p->stream, data, l, NULL, 0LL, PA_SEEK_RELATIVE);
|
r = pa_stream_write(p->stream, data, l, NULL, 0LL, PA_SEEK_RELATIVE);
|
||||||
CHECK_SUCCESS_GOTO(c, r >= 0, unlock_and_fail, "pa_stream_write failed\n");
|
CHECK_SUCCESS_GOTO(c, r >= 0, unlock_and_fail, "pa_stream_write failed\n");
|
||||||
|
|
||||||
|
unlock:
|
||||||
pa_threaded_mainloop_unlock(c->mainloop);
|
pa_threaded_mainloop_unlock(c->mainloop);
|
||||||
return l;
|
return l;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user