| Message ID | 0b2e43a405816f04fd3e603a263fdf901a42e900.1547681517.git.DirtY.iCE.hu@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Audio 5.1 patches | expand |
Hi On Thu, Jan 17, 2019 at 3:37 AM Kővágó, Zoltán <dirty.ice.hu@gmail.com> wrote: > > Currently this needs a workaround due to bug #74624 in pulseaudio. > > Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > Signed-off-by: Kővágó, Zoltán <DirtY.iCE.hu@gmail.com> > --- > audio/paaudio.c | 25 +++++++++++++++++++++++-- > 1 file changed, 23 insertions(+), 2 deletions(-) > > diff --git a/audio/paaudio.c b/audio/paaudio.c > index 108d3158a6..428c848863 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 Now that they moved to gitlab, you could update the link & # in commit message 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 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 >
diff --git a/audio/paaudio.c b/audio/paaudio.c index 108d3158a6..428c848863 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; }