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

[GitLab Mirror]

 src/spice-widget.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9ec913de67276a177b9b36596329685ea430f141
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Tue Jan 15 09:55:19 2019 +0000

    spice-widget: Avoid deadlock for VAAPI
    
    Calling gst_video_overlay_handle_events after
    gst_video_overlay_set_window_handle causes often a deadlock in
    gstreamer-vaapi.
    Reverting the calls fix this issue.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Snir Sheriber <ssheribe at redhat.com>

diff --git a/src/spice-widget.c b/src/spice-widget.c
index af0301c..7e9dc07 100644
--- a/src/spice-widget.c
+++ b/src/spice-widget.c
@@ -2585,8 +2585,8 @@ static void gst_sync_bus_call(GstBus *bus, GstMessage *msg, SpiceDisplay *displa
 
                 GstVideoOverlay *overlay = GST_VIDEO_OVERLAY(GST_MESSAGE_SRC(msg));
                 g_weak_ref_set(&d->overlay_weak_ref, overlay);
-                gst_video_overlay_set_window_handle(overlay, (uintptr_t)GDK_WINDOW_XID(window));
                 gst_video_overlay_handle_events(overlay, false);
+                gst_video_overlay_set_window_handle(overlay, (uintptr_t)GDK_WINDOW_XID(window));
                 return;
             }
         }