[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 15/30] paaudio: wait until the playback stream is ready
From: |
Gerd Hoffmann |
Subject: |
[PULL 15/30] paaudio: wait until the playback stream is ready |
Date: |
Fri, 15 Jan 2021 14:21:31 +0100 |
From: Volker RĂ¼melin <vr_qemu@t-online.de>
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>
---
audio/paaudio.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/audio/paaudio.c b/audio/paaudio.c
index 1a7252b16d6d..4a1ffda753d5 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;
--
2.29.2
- [PULL 10/30] audio: break generic buffer dependency on mixing-engine, (continued)
- [PULL 10/30] audio: break generic buffer dependency on mixing-engine, Gerd Hoffmann, 2021/01/15
- [PULL 20/30] dsoundaudio: replace GetForegroundWindow(), Gerd Hoffmann, 2021/01/15
- [PULL 11/30] sdlaudio: enable (in|out).mixing-engine=off, Gerd Hoffmann, 2021/01/15
- [PULL 08/30] audio: split pcm_ops function get_buffer_in, Gerd Hoffmann, 2021/01/15
- [PULL 18/30] paaudio: limit minreq to 75% of audio timer_rate, Gerd Hoffmann, 2021/01/15
- [PULL 03/30] sdlaudio: add -audiodev sdl,out.buffer-count option, Gerd Hoffmann, 2021/01/15
- [PULL 22/30] dsoundaudio: enable f32 audio sample format, Gerd Hoffmann, 2021/01/15
- [PULL 05/30] sdlaudio: always clear the sample buffer, Gerd Hoffmann, 2021/01/15
- [PULL 04/30] sdlaudio: don't start playback in init routine, Gerd Hoffmann, 2021/01/15
- [PULL 12/30] audio: remove remaining unused plive code, Gerd Hoffmann, 2021/01/15
- [PULL 15/30] paaudio: wait until the playback stream is ready,
Gerd Hoffmann <=
- [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, 2021/01/15