mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-06-13 14:32:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'hdr-metadata' into 'master'

Browse source 
output: expose EDID HDR static metadata

See merge request wlroots/wlroots!5369
This commit is contained in:
Christopher Snowhill 2026-06-13 10:01:26 +00:00
commit 68138cf031
3 changed files with 138 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

19
include/wlr/types/wlr_output.h
View file

@ -85,6 +85,22 @@ enum wlr_output_state_mode_type {
WLR_OUTPUT_STATE_MODE_CUSTOM,
};
/**
* HDR static metadata block 1 values, as advertised by the display via EDID.
*
* Luminances are given in cd/m². desired_content_min_luminance is always
* available (defaults to 0 when the EDID block does not provide a value).
* desired_content_max_luminance and desired_content_max_frame_average_luminance
* are optional and only meaningful when their corresponding has_* flag is set.
*/
struct wlr_output_hdr_metadata {
double desired_content_min_luminance;
bool has_desired_content_max_luminance;
double desired_content_max_luminance;
bool has_desired_content_max_frame_average_luminance;
double desired_content_max_frame_average_luminance;
};
/**
* Colorimetric image description.
*
@ -194,6 +210,8 @@ struct wlr_output {
char *make, *model, *serial; // may be NULL
int32_t phys_width, phys_height; // mm
const struct wlr_color_primaries *default_primaries; // may be NULL
// HDR static metadata block 1 values from the EDID, NULL if not advertised
const struct wlr_output_hdr_metadata *hdr_metadata;
// Note: some backends may have zero modes
struct wl_list modes; // wlr_output_mode.link
@ -278,6 +296,7 @@ struct wlr_output {
struct wlr_output_image_description image_description_value;
struct wlr_color_transform *color_transform;
struct wlr_color_primaries default_primaries_value;
struct wlr_output_hdr_metadata hdr_metadata_value;
} WLR_PRIVATE;
};