[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 22/52] paaudio: properly disconnect streams in fi
From: |
Kővágó, Zoltán |
Subject: |
[Qemu-devel] [PATCH v2 22/52] paaudio: properly disconnect streams in fini_* |
Date: |
Sun, 23 Dec 2018 21:51:58 +0100 |
Currently this needs a workaround due to bug #74624 in pulseaudio.
Reviewed-by: Marc-André Lureau <address@hidden>
Signed-off-by: Kővágó, Zoltán <address@hidden>
---
audio/paaudio.c | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/audio/paaudio.c b/audio/paaudio.c
index 21ffbf7f6e..fa867a8065 100644
--- a/audio/paaudio.c
+++ b/audio/paaudio.c
@@ -680,6 +680,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 #74624
+ * https://bugs.freedesktop.org/show_bug.cgi?id=74624
+ */
+ 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 dissconnect! err=%d\n", err);
+ }
+ pa_stream_unref(stream);
+ pa_threaded_mainloop_unlock(c->mainloop);
+}
+
static void qpa_fini_out (HWVoiceOut *hw)
{
void *ret;
@@ -691,7 +712,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;
}
@@ -711,7 +732,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.20.1
- [Qemu-devel] [PATCH v2 13/52] sdlaudio: port to -audiodev config, (continued)
- [Qemu-devel] [PATCH v2 13/52] sdlaudio: port to -audiodev config, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 06/52] audio: -audiodev command line option basic implementation, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 14/52] spiceaudio: port to -audiodev config, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 12/52] paaudio: port to -audiodev config, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 10/52] noaudio: port to -audiodev config, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 15/52] wavaudio: port to -audiodev config, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 16/52] audio: -audiodev command line option: cleanup, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 11/52] ossaudio: port to -audiodev config, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 17/52] audio: reduce glob_audio_state usage, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 21/52] paaudio: do not move stream when sink/source name is specified, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 22/52] paaudio: properly disconnect streams in fini_*,
Kővágó, Zoltán <=
- [Qemu-devel] [PATCH v2 20/52] audio: audiodev= parameters no longer optional when -audiodev present, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 18/52] audio: basic support for multi backend audio, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 24/52] audio: do not run each backend in audio_run, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 19/52] audio: add audiodev properties to frontends, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 25/52] paaudio: fix playback glitches, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 26/52] audio: remove read and write pcm_ops, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 28/52] audio: api for mixeng code free backends, Kővágó, Zoltán, 2018/12/23
- [Qemu-devel] [PATCH v2 27/52] audio: use size_t where makes sense, Kővágó, Zoltán, 2018/12/23