From 308c9d1c6c657ae664873a726dd13bb831965d31 Mon Sep 17 00:00:00 2001 From: Thomas Mansencal Date: Wed, 28 Aug 2024 22:01:49 +1200 Subject: [PATCH] Implement various aliasing and naming updates. Signed-off-by: Thomas Mansencal --- opencolorio_config_aces/clf/transforms/ocio/generate.py | 8 ++++---- ... => OCIO.Utility.AP0_to_Display_P3-Scene-referred.clf} | 4 ++-- ...G and Studio Transforms - v2 - CG Config - Mapping.csv | 4 ++-- opencolorio_config_aces/config/reference/aces-system | 1 + .../config/reference/generate/config.py | 3 ++- ...d Studio Transforms - v2 - Studio Config - Mapping.csv | 4 ++-- 6 files changed, 13 insertions(+), 11 deletions(-) rename opencolorio_config_aces/clf/transforms/ocio/utility/{OCIO.Utility.AP0_to_sRGB_Encoded_P3-D65-Scene-referred.clf => OCIO.Utility.AP0_to_Display_P3-Scene-referred.clf} (74%) create mode 160000 opencolorio_config_aces/config/reference/aces-system diff --git a/opencolorio_config_aces/clf/transforms/ocio/generate.py b/opencolorio_config_aces/clf/transforms/ocio/generate.py index a3a7daa..b7b0d21 100644 --- a/opencolorio_config_aces/clf/transforms/ocio/generate.py +++ b/opencolorio_config_aces/clf/transforms/ocio/generate.py @@ -261,19 +261,19 @@ def generate_clf_transforms_ocio(output_directory): "sRGB Encoded AP1 primaries, ACES ~=D60 white point", ) - name = "AP0_to_sRGB_Encoded_P3-D65-Scene-referred" + name = "AP0_to_Display_P3-Scene-referred" clf_transform_id = format_clf_transform_id(FAMILY, GENUS, name, VERSION) filename = output_directory / clf_basename(clf_transform_id) clf_transforms[filename] = generate_clf_transform( filename, [ - matrix_RGB_to_RGB_transform("ACES2065-1", "P3-D65"), + matrix_RGB_to_RGB_transform("ACES2065-1", "Display P3"), gamma_transform("sRGB"), ], clf_transform_id, - "AP0 to sRGB Encoded P3-D65 - Scene-referred", + "AP0 to Display P3 - Scene-referred", "ACES2065-1", - "sRGB Encoded P3-D65 primaries, D65 white point", + "Display P3 primaries, D65 white point", ) name = "AP0_to_AdobeRGB-Scene-referred" diff --git a/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_sRGB_Encoded_P3-D65-Scene-referred.clf b/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Display_P3-Scene-referred.clf similarity index 74% rename from opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_sRGB_Encoded_P3-D65-Scene-referred.clf rename to opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Display_P3-Scene-referred.clf index 67b3524..9cb2bc2 100644 --- a/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_sRGB_Encoded_P3-D65-Scene-referred.clf +++ b/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Display_P3-Scene-referred.clf @@ -1,7 +1,7 @@ - + ACES2065-1 - sRGB Encoded P3-D65 primaries, D65 white point + Display P3 primaries, D65 white point 2.02490528596679 -0.689069761034766 -0.335835524932019 diff --git a/opencolorio_config_aces/config/cg/generate/resources/OpenColorIO-Config-ACES CG and Studio Transforms - v2 - CG Config - Mapping.csv b/opencolorio_config_aces/config/cg/generate/resources/OpenColorIO-Config-ACES CG and Studio Transforms - v2 - CG Config - Mapping.csv index 13e477a..95c6b43 100644 --- a/opencolorio_config_aces/config/cg/generate/resources/OpenColorIO-Config-ACES CG and Studio Transforms - v2 - CG Config - Mapping.csv +++ b/opencolorio_config_aces/config/cg/generate/resources/OpenColorIO-Config-ACES CG and Studio Transforms - v2 - CG Config - Mapping.csv @@ -14,12 +14,12 @@ Ordering,Colorspace,Legacy,ACEStransformID,CLFtransformID,Interface,BuiltinTrans 410,Utility - Linear - Rec.2020,TRUE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Linear_Rec2020:1.0,ColorSpace,,"lin_rec2020,lin_rec2020_scene",scene-linear,"file-io,texture" 410,Utility - Linear - Rec.709,TRUE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Linear_Rec709:1.0,ColorSpace,,"lin_rec709,lin_rec709_scene,lin_srgb,Utility - Linear - sRGB",scene-linear,"file-io,working-space,texture" 420,AdobeRGB - Scene-referred,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_AdobeRGB-Scene-referred:1.0,ColorSpace,,"adobergb,g22_adobergb_scene",sdr-video,"file-io,texture" -420,CIE-XYZ-D65 - Scene-referred,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_CIE-XYZ-D65-Scene-referred:1.0,ColorSpace,,lin_ciexyzd65_scene,scene-linear,file-io +420,CIE XYZ-D65 - Scene-referred,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_CIE-XYZ-D65-Scene-referred:1.0,ColorSpace,,"lin_ciexyzd65_scene,CIE-XYZ-D65 - Scene-referred",scene-linear,file-io +420,Display P3 - Scene-referred,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Display_P3-Scene-referred:1.0,ColorSpace,,"srgb_p3d65,srgb_displayp3,srgb_displayp3_scene,sRGB Encoded P3-D65 - Texture,srgb_encoded_p3d65_tx",sdr-video,"file-io,texture" 420,Gamma 2.2 AP1 - Scene-referred,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.2_AP1-Scene-referred:1.0,ColorSpace,,"g22_ap1,Gamma 2.2 AP1 - Texture,g22_ap1_tx",sdr-video,"file-io,texture" 420,Gamma 2.4 Rec.709 - Scene-referred,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.4_Rec709-Scene-referred:1.0,ColorSpace,,"g24_rec709,rec709_display,Utility - Rec.709 - Display,Gamma 2.4 Rec.709 - Texture,g24_rec709_tx",sdr-video,"file-io,texture" 420,Linear AdobeRGB,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Linear_AdobeRGB:1.0,ColorSpace,,"lin_adobergb,lin_adobergb_scene,Utility - Linear - Adobe RGB",scene-linear,"file-io,texture" 420,sRGB Encoded AP1 - Scene-referred,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_sRGB_Encoded_AP1-Scene-referred:1.0,ColorSpace,,"srgb_ap1,srgb_ap1_scene,sRGB Encoded AP1 - Texture,srgb_encoded_ap1_tx",sdr-video,"file-io,texture" -420,sRGB Encoded P3-D65 - Scene-referred,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_sRGB_Encoded_P3-D65-Scene-referred:1.0,ColorSpace,,"srgb_p3d65,srgb_displayp3,srgb_displayp3_scene,sRGB Encoded P3-D65 - Texture,srgb_encoded_p3d65_tx",sdr-video,"file-io,texture" 420,Utility - Gamma 1.8 - Rec.709 - Texture,TRUE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma1.8_Rec709-Scene-referred:1.0,ColorSpace,,"g18_rec709,Gamma 1.8 Rec.709 - Texture,g18_rec709_tx",sdr-video,"file-io,texture" 420,Utility - Gamma 2.2 - Rec.709 - Texture,TRUE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.2_Rec709-Scene-referred:1.0,ColorSpace,,"g22_rec709,Gamma 2.2 Rec.709 - Texture,g22_rec709_tx",sdr-video,"file-io,texture" 420,Utility - sRGB - Texture,TRUE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_sRGB-Scene-referred:1.0,ColorSpace,,"srgb_texture,srgb_rec709_scene,Input - Generic - sRGB - Texture,sRGB - Texture,srgb_tx",sdr-video,"file-io,texture" diff --git a/opencolorio_config_aces/config/reference/aces-system b/opencolorio_config_aces/config/reference/aces-system new file mode 160000 index 0000000..a079dd0 --- /dev/null +++ b/opencolorio_config_aces/config/reference/aces-system @@ -0,0 +1 @@ +Subproject commit a079dd026032c35eb21cc828e050b6ecf0df9535 diff --git a/opencolorio_config_aces/config/reference/generate/config.py b/opencolorio_config_aces/config/reference/generate/config.py index 0e8256d..ff6d5a5 100644 --- a/opencolorio_config_aces/config/reference/generate/config.py +++ b/opencolorio_config_aces/config/reference/generate/config.py @@ -1145,7 +1145,7 @@ def generate_config_aces( ] display_reference_colorspace = { - "name": "CIE-XYZ-D65 - Display-referred", + "name": "CIE XYZ-D65 - Display-referred", "description": 'The "CIE XYZ (D65)" display connection colorspace.', "reference_space": "REFERENCE_SPACE_DISPLAY", "encoding": "display-linear", @@ -1153,6 +1153,7 @@ def generate_config_aces( display_reference_colorspace["aliases"] = [ beautify_alias(display_reference_colorspace["name"]), "CIE-XYZ-D65", + "CIE-XYZ-D65 - Display-referred", ] raw_colorspace = { diff --git a/opencolorio_config_aces/config/studio/generate/resources/OpenColorIO-Config-ACES CG and Studio Transforms - v2 - Studio Config - Mapping.csv b/opencolorio_config_aces/config/studio/generate/resources/OpenColorIO-Config-ACES CG and Studio Transforms - v2 - Studio Config - Mapping.csv index 4e18be1..4dee400 100644 --- a/opencolorio_config_aces/config/studio/generate/resources/OpenColorIO-Config-ACES CG and Studio Transforms - v2 - Studio Config - Mapping.csv +++ b/opencolorio_config_aces/config/studio/generate/resources/OpenColorIO-Config-ACES CG and Studio Transforms - v2 - Studio Config - Mapping.csv @@ -71,12 +71,12 @@ Ordering,Colorspace,Legacy,ACEStransformID,CLFtransformID,Interface,BuiltinTrans 410,Utility - Linear - Rec.709,TRUE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Linear_Rec709:1.0,ColorSpace,,"lin_rec709,lin_rec709_scene,lin_srgb,Utility - Linear - sRGB",scene-linear,"file-io,working-space,texture" 410,Utility - Linear - RIMM ROMM (ProPhoto),TRUE,,,ColorSpace,,"lin_prophoto,lin_rimm",scene-linear,file-io 420,AdobeRGB - Scene-referred,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_AdobeRGB-Scene-referred:1.0,ColorSpace,,"adobergb,g22_adobergb_scene",sdr-video,"file-io,texture" -420,CIE-XYZ-D65 - Scene-referred,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_CIE-XYZ-D65-Scene-referred:1.0,ColorSpace,,lin_ciexyzd65_scene,scene-linear,file-io +420,CIE XYZ-D65 - Scene-referred,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_CIE-XYZ-D65-Scene-referred:1.0,ColorSpace,,"lin_ciexyzd65_scene,CIE-XYZ-D65 - Scene-referred",scene-linear,file-io +420,Display P3 - Scene-referred,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Display_P3-Scene-referred:1.0,ColorSpace,,"srgb_p3d65,srgb_displayp3,srgb_displayp3_scene,sRGB Encoded P3-D65 - Texture,srgb_encoded_p3d65_tx",sdr-video,"file-io,texture" 420,Gamma 2.2 AP1 - Scene-referred,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.2_AP1-Scene-referred:1.0,ColorSpace,,"g22_ap1,Gamma 2.2 AP1 - Texture,g22_ap1_tx",sdr-video,"file-io,texture" 420,Gamma 2.4 Rec.709 - Scene-referred,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.4_Rec709-Scene-referred:1.0,ColorSpace,,"g24_rec709,rec709_display,Utility - Rec.709 - Display,Gamma 2.4 Rec.709 - Texture,g24_rec709_tx",sdr-video,"file-io,texture" 420,Linear AdobeRGB,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Linear_AdobeRGB:1.0,ColorSpace,,"lin_adobergb,lin_adobergb_scene,Utility - Linear - Adobe RGB",scene-linear,"file-io,texture" 420,sRGB Encoded AP1 - Scene-referred,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_sRGB_Encoded_AP1-Scene-referred:1.0,ColorSpace,,"srgb_ap1,srgb_ap1_scene,sRGB Encoded AP1 - Texture,srgb_encoded_ap1_tx",sdr-video,"file-io,texture" -420,sRGB Encoded P3-D65 - Scene-referred,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_sRGB_Encoded_P3-D65-Scene-referred:1.0,ColorSpace,,"srgb_p3d65,srgb_displayp3,srgb_displayp3_scene,sRGB Encoded P3-D65 - Texture,srgb_encoded_p3d65_tx",sdr-video,"file-io,texture" 420,Utility - Gamma 1.8 - Rec.709 - Texture,TRUE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma1.8_Rec709-Scene-referred:1.0,ColorSpace,,"g18_rec709,Gamma 1.8 Rec.709 - Texture,g18_rec709_tx",sdr-video,"file-io,texture" 420,Utility - Gamma 2.2 - Rec.709 - Texture,TRUE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.2_Rec709-Scene-referred:1.0,ColorSpace,,"g22_rec709,Gamma 2.2 Rec.709 - Texture,g22_rec709_tx",sdr-video,"file-io,texture" 420,Utility - sRGB - Texture,TRUE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_sRGB-Scene-referred:1.0,ColorSpace,,"srgb_texture,srgb_rec709_scene,Input - Generic - sRGB - Texture,sRGB - Texture,srgb_tx",sdr-video,"file-io,texture"