GithubStar/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2026-10-22 02:36:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

wayland: add some sanity checking when setting mastering luminance

Browse Source 
Actually found a file in the wild that violated this which is a protocol
error (fatal).
This commit is contained in:
Dudemanguy
2025-02-17 22:34:39 -06:00
parent d26131e158
commit 1a70de259d
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
video/out/wayland_common.c
+9 -3
View File
@@ -2509,9 +2509,15 @@ static void set_color_management(struct vo_wayland_state *wl)
hdr.prim.red.x * WAYLAND_COLOR_FACTOR, hdr.prim.red.y * WAYLAND_COLOR_FACTOR, hdr.prim.green.x * WAYLAND_COLOR_FACTOR,
hdr.prim.green.y * WAYLAND_COLOR_FACTOR, hdr.prim.blue.x * WAYLAND_COLOR_FACTOR, hdr.prim.blue.y * WAYLAND_COLOR_FACTOR,
hdr.prim.white.x * WAYLAND_COLOR_FACTOR, hdr.prim.white.y * WAYLAND_COLOR_FACTOR);
wp_image_description_creator_params_v1_set_mastering_luminance(image_creator_params, hdr.min_luma * WAYLAND_MIN_LUM_FACTOR, hdr.max_luma);
wp_image_description_creator_params_v1_set_max_cll(image_creator_params, hdr.max_cll);
wp_image_description_creator_params_v1_set_max_fall(image_creator_params, hdr.max_fall);
if (hdr.min_luma < hdr.max_luma)
wp_image_description_creator_params_v1_set_mastering_luminance(image_creator_params, hdr.min_luma * WAYLAND_MIN_LUM_FACTOR, hdr.max_luma);
if (hdr.max_cll > hdr.min_luma && hdr.max_cll <= hdr.max_luma)
wp_image_description_creator_params_v1_set_max_cll(image_creator_params, hdr.max_cll);
if (hdr.max_fall > hdr.min_luma && hdr.max_fall <= hdr.max_luma && hdr.max_fall <= hdr.max_cll)
wp_image_description_creator_params_v1_set_max_fall(image_creator_params, hdr.max_fall);
}
struct wp_image_description_v1 *image_description = wp_image_description_creator_params_v1_create(image_creator_params);
wp_image_description_v1_add_listener(image_description, &image_description_listener, wl);