[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 14/30] paaudio: wait for PA_STREAM_READY in qpa_write()
From: |
Gerd Hoffmann |
Subject: |
[PULL 14/30] paaudio: wait for PA_STREAM_READY in qpa_write() |
Date: |
Fri, 15 Jan 2021 14:21:30 +0100 |
From: Volker RĂ¼melin <vr_qemu@t-online.de>
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>
---
audio/paaudio.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/audio/paaudio.c b/audio/paaudio.c
index 229bcfcae838..1a7252b16d6d 100644
--- a/audio/paaudio.c
+++ b/audio/paaudio.c
@@ -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,
"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);
@@ -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);
CHECK_SUCCESS_GOTO(c, r >= 0, unlock_and_fail, "pa_stream_write failed\n");
+unlock:
pa_threaded_mainloop_unlock(c->mainloop);
return l;
--
2.29.2
- [PULL 15/30] paaudio: wait until the playback stream is ready, (continued)
- [PULL 15/30] paaudio: wait until the playback stream is ready, Gerd Hoffmann, 2021/01/15
- [PULL 21/30] dsoundaudio: rename dsound_open(), Gerd Hoffmann, 2021/01/15
- [PULL 09/30] sdlaudio: add recording functions, Gerd Hoffmann, 2021/01/15
- [PULL 07/30] sdlaudio: replace legacy functions with modern ones, Gerd Hoffmann, 2021/01/15
- [PULL 27/30] audio: Fix lines over 90 characters, Gerd Hoffmann, 2021/01/15
- [PULL 06/30] sdlaudio: fill remaining sample buffer with silence, Gerd Hoffmann, 2021/01/15
- [PULL 28/30] audio: Don't use '%#' in format strings, Gerd Hoffmann, 2021/01/15
- [PULL 23/30] dsoundaudio: fix log message, Gerd Hoffmann, 2021/01/15
- [PULL 24/30] audio: Add braces for statements/fix braces' position, Gerd Hoffmann, 2021/01/15
- [PULL 13/30] paaudio: avoid to clip samples multiple times, Gerd Hoffmann, 2021/01/15
- [PULL 14/30] paaudio: wait for PA_STREAM_READY in qpa_write(),
Gerd Hoffmann <=
- [PULL 25/30] audio: Add spaces around operator/delete redundant spaces, Gerd Hoffmann, 2021/01/15
- [PULL 29/30] audio: Suspect code indent for conditional statements, Gerd Hoffmann, 2021/01/15
- [PULL 17/30] paaudio: comment bugs in functions qpa_init_*, Gerd Hoffmann, 2021/01/15
- [PULL 19/30] paaudio: send recorded data in smaller chunks, Gerd Hoffmann, 2021/01/15
- [PULL 26/30] audio: foo* bar" should be "foo *bar"., Gerd Hoffmann, 2021/01/15
- [PULL 30/30] audio: space prohibited between function name and parenthesis'(', Gerd Hoffmann, 2021/01/15
- [PULL 16/30] paaudio: remove unneeded code, Gerd Hoffmann, 2021/01/15
- Re: [PULL 00/30] Audio 20210115 patches, no-reply, 2021/01/15
- Re: [PULL 00/30] Audio 20210115 patches, Peter Maydell, 2021/01/16