Skip to content

wayland: move info_done variable to vo_wayland #17284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Dudemanguy merged 1 commit into from
Jan 18, 2026
Merged

wayland: move info_done variable to vo_wayland #17284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions video/out/wayland_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,6 @@ struct vo_wayland_text_input {

struct vo_wayland_preferred_description_info {
struct vo_wayland_state *wl;
bool info_done;
struct pl_color_space csp;
float min_luma;
float max_luma;
Expand Down Expand Up @@ -2140,7 +2139,7 @@ static void info_done(void *data, struct wp_image_description_info_v1 *image_des
{
struct vo_wayland_preferred_description_info *wd = data;
struct vo_wayland_state *wl = wd->wl;
wd->info_done = true;
wl->image_description_info_done = true;
wp_image_description_info_v1_destroy(image_description_info);
if (!wd->icc_file) {
MP_VERBOSE(wl, "Preferred surface feedback received:\n");
Expand Down Expand Up @@ -3110,10 +3109,11 @@ static void get_compositor_preferred_description(struct vo_wayland_state *wl)
struct wp_image_description_info_v1 *description_info =
wp_image_description_v1_get_information(image_description);
struct wl_event_queue *image_description_info_queue = wl_display_create_queue_with_name(wl->display, "image description info queue");
wl->image_description_info_done = false;
wl_proxy_set_queue((struct wl_proxy *)description_info, image_description_info_queue);
wp_image_description_info_v1_add_listener(description_info, &image_description_info_listener, wd);
while (wl_display_dispatch_queue(wl->display, image_description_info_queue) > 0)
if (wd->info_done)
if (wl->image_description_info_done)
break;
wp_image_description_v1_destroy(image_description);
wl_event_queue_destroy(image_description_info_queue);
Expand Down
1 change: 1 addition & 0 deletions video/out/wayland_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ struct vo_wayland_state {
void *icc_file;
uint32_t icc_size;
struct pl_color_space preferred_csp;
bool image_description_info_done;

/* color-representation */
struct wp_color_representation_manager_v1 *color_representation_manager;
Expand Down