From d4b8fdd844d1020f16db226a5acee91c8e057fe4 Mon Sep 17 00:00:00 2001 From: Victoria Brekenfeld Date: Thu, 26 Oct 2023 23:59:21 +0200 Subject: [PATCH] color_management: update protocol --- protocols/color-management-v1.xml | 32 ++++++++++++------------ src/wayland/color/management/dispatch.rs | 12 ++++----- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/protocols/color-management-v1.xml b/protocols/color-management-v1.xml index 9b255a6b12..28e5e0f7d2 100644 --- a/protocols/color-management-v1.xml +++ b/protocols/color-management-v1.xml @@ -515,8 +515,8 @@ if not explicitly set: - mastering display primaries and white point (target color volume) - mastering luminance range - - maxCLL - - maxFALL + - maximum content light level + - maximum frame-average light level Each required property must be set exactly once if the client is to create an image description. The set requests verify that a property was not @@ -743,24 +743,24 @@ - + - Sets the maximum content light level (maxCLL) as defined by CTA-861-H. + Sets the maximum content light level (max_cll) as defined by CTA-861-H. This can only be set when set_tf_cicp is used to set the transfer characteristic to Rec. ITU-R BT.2100-2 perceptual quantization system. Otherwise, 'create' request shall raise inconsistent_set protocol error. - MaxCLL is undefined by default. + max_cll is undefined by default. - + - + - Sets the maximum frame-average light level (maxFALL) as defined by + Sets the maximum frame-average light level (max_fall) as defined by CTA-861-H. This can only be set when set_tf_cicp is used to set the transfer @@ -768,10 +768,10 @@ Otherwise, 'create' request shall raise inconsistent_set protocol error. - MaxFALL is undefined by default. + max_fall is undefined by default. - + @@ -1024,32 +1024,32 @@ - + This is an information event, see get_information. - Provides the targeted maxCLL of the image description. MaxCLL is + Provides the targeted max_cll of the image description. max_cll is defined by CTA-861-H. This luminance is only theoretical and may not correspond to the luminance of light emitted on an actual display. - + - + This is an information event, see get_information. - Provides the targeted maxFALL of the image description. MaxFALL is + Provides the targeted max_fall of the image description. max_fall is defined by CTA-861-H. This luminance is only theoretical and may not correspond to the luminance of light emitted on an actual display. - + diff --git a/src/wayland/color/management/dispatch.rs b/src/wayland/color/management/dispatch.rs index 0198448dd3..b14889627f 100644 --- a/src/wayland/color/management/dispatch.rs +++ b/src/wayland/color/management/dispatch.rs @@ -475,10 +475,10 @@ where } } if let Some(max_ccl) = max_ccl { - resource.target_maxCLL(*max_ccl); + resource.target_max_cll(*max_ccl); } if let Some(max_fall) = max_fall { - resource.target_maxFALL(*max_fall); + resource.target_max_fall(*max_fall); } } } @@ -854,7 +854,7 @@ where return; } } - wp_image_description_creator_params_v1::Request::SetMaxCLL { maxCLL } => { + wp_image_description_creator_params_v1::Request::SetMaxCll { max_cll } => { let mut data_guard = data.lock().unwrap(); let Some(data) = data_guard.as_mut() else { resource.post_error(wp_image_description_creator_params_v1::Error::AlreadyUsed, "Creator was already used"); @@ -871,7 +871,7 @@ where return; } - if data.set_max_cll(maxCLL) { + if data.set_max_cll(max_cll) { resource.post_error( wp_image_description_creator_params_v1::Error::AlreadySet, "Max CCL was already set", @@ -879,7 +879,7 @@ where return; } } - wp_image_description_creator_params_v1::Request::SetMaxFALL { maxFALL } => { + wp_image_description_creator_params_v1::Request::SetMaxFall { max_fall } => { let mut data_guard = data.lock().unwrap(); let Some(data) = data_guard.as_mut() else { resource.post_error(wp_image_description_creator_params_v1::Error::AlreadyUsed, "Creator was already used"); @@ -896,7 +896,7 @@ where return; } - if data.set_max_fall(maxFALL) { + if data.set_max_fall(max_fall) { resource.post_error( wp_image_description_creator_params_v1::Error::AlreadySet, "Max CCL was already set",