Miroirs/smithay
1
0
Fork 0
mirror of https://github.com/Smithay/smithay.git synced 2024-09-28 03:21:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

color_management: update protocol

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-10-26 23:59:21 +02:00
parent 0f1d6c8b51
commit d4b8fdd844
2 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
protocols/color-management-v1.xml
View file

@ -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 @@
<arg name="max_lum" type="uint" summary="max L (cd/m²)"/>
</request>
<request name="set_maxCLL">
<request name="set_max_cll">
<description summary="maximum content light level">
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.
</description>
<arg name="maxCLL" type="uint" summary="maxCLL (cd/m²)"/>
<arg name="max_cll" type="uint" summary="Maximum content light level (cd/m²)"/>
</request>
<request name="set_maxFALL">
<request name="set_max_fall">
<description summary="maximum frame-average light level">
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.
</description>
<arg name="maxFALL" type="uint" summary="maxFALL (cd/m²)"/>
<arg name="max_fall" type="uint" summary="Maximum frame-average light level (cd/m²)"/>
</request>
</interface>
@ -1024,32 +1024,32 @@
<arg name="max_lum" type="uint" summary="max L (cd/m²)"/>
</event>
<event name="target_maxCLL">
<event name="target_max_cll">
<description summary="target maximum content light level">
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.
</description>
<arg name="maxCLL" type="uint" summary="maxCLL (cd/m²)"/>
<arg name="max_cll" type="uint" summary="Maximum content light-level (cd/m²)"/>
</event>
<event name="target_maxFALL">
<event name="target_max_fall">
<description summary="target maximum frame-average light level">
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.
</description>
<arg name="maxFALL" type="uint" summary="maxFALL (cd/m²)"/>
<arg name="max_fall" type="uint" summary="Maximum frame-average light level (cd/m²)"/>
</event>
</interface>
</protocol>

12
src/wayland/color/management/dispatch.rs
View file

@ -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",