wayland: switch to separate queue for wp_image_description_v1

This will ensure the block we do here doesn't affect anything else
besides the image description

Author: llyyr

video/out/wayland_common.c

@@ -2107,6 +2107,7 @@ static void image_description_failed(void *data, struct wp_image_description_v1
                                      uint32_t cause, const char *msg)
 {
     struct vo_wayland_state *wl = data;
+    wl->image_desc_done = true;
     MP_VERBOSE(wl, "Image description failed: %d, %s\n", cause, msg);
     wp_color_management_surface_v1_unset_image_description(wl->color_surface);
     wp_image_description_v1_destroy(image_description);
@@ -2116,8 +2117,9 @@ static void image_description_ready(void *data, struct wp_image_description_v1 *
                                     uint32_t identity)
 {
     struct vo_wayland_state *wl = data;
-    wp_color_management_surface_v1_set_image_description(wl->color_surface, image_description, 0);
+    wl->image_desc_done = true;
     MP_VERBOSE(wl, "Image description set on color surface.\n");
+    wp_color_management_surface_v1_set_image_description(wl->color_surface, image_description, 0);
     wp_image_description_v1_destroy(image_description);
 }
 
@@ -3452,6 +3454,7 @@ static void set_color_management(struct vo_wayland_state *wl)
         return;
 
     struct pl_color_space color = wl->target_params.color;
+    struct wl_event_queue *cm_queue = NULL;
     int primaries = wl->primaries_map[color.primaries];
     int transfer = wl->transfer_map[color.transfer];
     if (!primaries)
@@ -3489,12 +3492,23 @@ static void set_color_management(struct vo_wayland_state *wl)
         wp_image_description_creator_params_v1_set_max_cll(image_creator_params, lrintf(hdr.max_cll));
         wp_image_description_creator_params_v1_set_max_fall(image_creator_params, lrintf(hdr.max_fall));
     }
+
     struct wp_image_description_v1 *image_description = wp_image_description_creator_params_v1_create(image_creator_params);
+#if HAVE_WL_DISPLAY_CREATE_QUEUE_WITH_NAME
+    cm_queue = wl_display_create_queue_with_name(wl->display, "mpv color management");
+#else
+    cm_queue = wl_display_create_queue(wl->display);
+#endif
+    wl_proxy_set_queue((struct wl_proxy *)image_description, cm_queue);
+    wl->image_desc_done = false;
     wp_image_description_v1_add_listener(image_description, &image_description_listener, wl);
 
-    /* Do a round trip to ensure the image description gets set before
-     * vo->driver->flip_page calls wl_surface_commit on us */
-    wl_display_roundtrip_queue(wl->display, wl->queue);
+    /* Block here to ensure the compositor is ready to receive the
+     * image_description before we do anything else. */
+    while (wl->image_desc_done == false)
+        wl_display_dispatch_queue(wl->display, cm_queue);
+
+    wl_event_queue_destroy(cm_queue);
 #endif
 }
 

video/out/wayland_common.h

@@ -107,6 +107,7 @@ struct vo_wayland_state {
     void *icc_file;
     uint32_t icc_size;
     struct pl_color_space preferred_csp;
+    bool image_desc_done;
 
     /* color-representation */
     struct wp_color_representation_manager_v1 *color_representation_manager;