[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/15] paaudio: properly disconnect streams in fini_*
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 09/15] paaudio: properly disconnect streams in fini_* |
Date: |
Wed, 21 Aug 2019 10:41:07 +0200 |
From: Kővágó, Zoltán <address@hidden>
Currently this needs a workaround due to bug #247 in pulseaudio.
Signed-off-by: Kővágó, Zoltán <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
audio/paaudio.c | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/audio/paaudio.c b/audio/paaudio.c
index 24d98b344a37..1d68173636ed 100644
--- a/audio/paaudio.c
+++ b/audio/paaudio.c
@@ -685,6 +685,27 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings
*as, void *drv_opaque)
return -1;
}
+static void qpa_simple_disconnect(PAConnection *c, pa_stream *stream)
+{
+ int err;
+
+ pa_threaded_mainloop_lock(c->mainloop);
+ /*
+ * wait until actually connects. workaround pa bug #247
+ * https://gitlab.freedesktop.org/pulseaudio/pulseaudio/issues/247
+ */
+ while (pa_stream_get_state(stream) == PA_STREAM_CREATING) {
+ pa_threaded_mainloop_wait(c->mainloop);
+ }
+
+ err = pa_stream_disconnect(stream);
+ if (err != 0) {
+ dolog("Failed to disconnect! err=%d\n", err);
+ }
+ pa_stream_unref(stream);
+ pa_threaded_mainloop_unlock(c->mainloop);
+}
+
static void qpa_fini_out (HWVoiceOut *hw)
{
void *ret;
@@ -696,7 +717,7 @@ static void qpa_fini_out (HWVoiceOut *hw)
audio_pt_join(&pa->pt, &ret, __func__);
if (pa->stream) {
- pa_stream_unref (pa->stream);
+ qpa_simple_disconnect(pa->g->conn, pa->stream);
pa->stream = NULL;
}
@@ -716,7 +737,7 @@ static void qpa_fini_in (HWVoiceIn *hw)
audio_pt_join(&pa->pt, &ret, __func__);
if (pa->stream) {
- pa_stream_unref (pa->stream);
+ qpa_simple_disconnect(pa->g->conn, pa->stream);
pa->stream = NULL;
}
--
2.18.1
[Qemu-devel] [PULL 04/15] audio: add audiodev property to vnc and wav_capture, Gerd Hoffmann, 2019/08/21
[Qemu-devel] [PULL 15/15] audio: fix memory leak reported by ASAN, Gerd Hoffmann, 2019/08/21
[Qemu-devel] [PULL 02/15] audio: reduce glob_audio_state usage, Gerd Hoffmann, 2019/08/21
[Qemu-devel] [PULL 03/15] audio: basic support for multi backend audio, Gerd Hoffmann, 2019/08/21