[Spice-commits] src/spice-gstaudio.c

[GitLab Mirror]

 src/spice-gstaudio.c |   23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

New commits:
commit a44cd29d30cf368e3e1a8b53cf97ec30a9b6dcdd
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Sun Jan 6 00:03:48 2019 +0400

    gst: check pulsesrc version >= 1.15
    
    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.
    
    PulseAudio may not be picked by autoaudiosrc, but looking up the
    actual source or mimicking GstAutoDetect is unnecessarily complicated.
    
    When pulsesrc < 1.15 is detected, let's drop its rank, so it won't be picked.
    
    Signed-off-by: Marc-André Lureau <marcandre.lureau at redhat.com>
    Acked-by: Victor Toso <victortoso at redhat.com>

diff --git a/src/spice-gstaudio.c b/src/spice-gstaudio.c
index 84f452d..c9240d0 100644
--- a/src/spice-gstaudio.c
+++ b/src/spice-gstaudio.c
@@ -527,7 +527,30 @@ SpiceGstaudio *spice_gstaudio_new(SpiceSession *session, GMainContext *context,
                                   const char *name)
 {
     GError *err = NULL;
+
     if (gst_init_check(NULL, NULL, &err)) {
+        GstPluginFeature *pulsesrc;
+
+        pulsesrc = gst_registry_lookup_feature(gst_registry_get(), "pulsesrc");
+        if (pulsesrc) {
+            unsigned maj, min;
+            GstPlugin *plugin = gst_plugin_feature_get_plugin(pulsesrc);
+
+            if (sscanf(gst_plugin_get_version(plugin), "%u.%u", &maj, &min) != 2) {
+                g_warn_if_reached();
+                gst_object_unref(plugin);
+                gst_object_unref(pulsesrc);
+                return NULL;
+            }
+
+            gst_object_unref(plugin);
+            gst_object_unref(pulsesrc);
+            if (maj < 1 || min < 15) {
+                g_warning("Bad pulsesrc version, lowering its rank");
+                gst_plugin_feature_set_rank(pulsesrc, GST_RANK_NONE);
+            }
+        }
+
         return g_object_new(SPICE_TYPE_GSTAUDIO,
                             "session", session,
                             "main-context", context,