[Spice-devel] [PATCH spice-gtk 32/34] gst: check pulseaudio plugin version >= 1.15

marcandre.lureau at redhat.com marcandre.lureau at redhat.com
Mon Jan 7 08:01:01 UTC 2019


From: Marc-André Lureau <marcandre.lureau at redhat.com>

There is a racy bug in pulsesrc that we can't easily workaround:
https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/merge_requests/69

It will hopefully be fixed with 1.15.

In theory, pulseaudio may not be picked by autoaudiosink, but looking
up the actual sink or mimicking GstAutoDetect is unnecessarily complicated.

Signed-off-by: Marc-André Lureau <marcandre.lureau at redhat.com>
---
 src/spice-gstaudio.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/spice-gstaudio.c b/src/spice-gstaudio.c
index d0cfbc6..d7bfc97 100644
--- a/src/spice-gstaudio.c
+++ b/src/spice-gstaudio.c
@@ -527,7 +527,26 @@ SpiceGstaudio *spice_gstaudio_new(SpiceSession *session, GMainContext *context,
                                   const char *name)
 {
     GError *err = NULL;
+
     if (gst_init_check(NULL, NULL, &err)) {
+        GstPlugin *plugin;
+
+        plugin = gst_registry_find_plugin(gst_registry_get(), "pulseaudio");
+        if (plugin) {
+            unsigned maj, min;
+            if (sscanf(gst_plugin_get_version(plugin), "%u.%u", &maj, &min) != 2) {
+                g_warn_if_reached();
+                gst_object_unref(plugin);
+                return NULL;
+            }
+
+            gst_object_unref(plugin);
+            if (maj < 1 || min < 15) {
+                g_warning("Disabling GStreamer audio: bad pulseaudio plugin version");
+                return NULL;
+            }
+        }
+
         return g_object_new(SPICE_TYPE_GSTAUDIO,
                             "session", session,
                             "main-context", context,
-- 
2.20.1.2.gb21ebb671b



More information about the Spice-devel mailing list