Address code review notes.

Signed-off-by: Thomas Mansencal <[email protected]>

opencolorio_config_aces/clf/transforms/ocio/generate.py

@@ -12,14 +12,13 @@
 
 from pathlib import Path
 
-import numpy as np
-
 from opencolorio_config_aces.clf.transforms import (
     clf_basename,
     format_clf_transform_id,
     gamma_transform,
     generate_clf_transform,
     matrix_RGB_to_RGB_transform,
+    matrix_transform,
 )
 from opencolorio_config_aces.utilities import required
 
@@ -104,17 +103,20 @@ def generate_clf_transforms_ocio(output_directory):
     name = "AP0_to_CIE-XYZ-D65-Scene-referred"
     clf_transform_id = format_clf_transform_id(FAMILY, GENUS, name, VERSION)
     filename = output_directory / clf_basename(clf_transform_id)
-    colour.RGB_COLOURSPACES["CIE-XYZ-D65"] = colour.RGB_Colourspace(
-        "CIE-XYZ-D65",
-        colour.XYZ_to_xy(np.identity(3)),
-        colour.CCS_ILLUMINANTS["CIE 1931 2 Degree Standard Observer"]["D65"],
-        "D65",
-        use_derived_matrix_RGB_to_XYZ=True,
-        use_derived_matrix_XYZ_to_RGB=True,
+    M_ACES = colour.RGB_COLOURSPACES["ACES2065-1"].matrix_RGB_to_XYZ
+    XYZ_ACES = colour.xy_to_XYZ(colour.RGB_COLOURSPACES["ACES2065-1"].whitepoint)
+    XYZ_D65 = colour.xy_to_XYZ(
+        colour.CCS_ILLUMINANTS["CIE 1931 2 Degree Standard Observer"]["D65"]
+    )
+    M_XYZ = colour.algebra.matrix_dot(
+        colour.adaptation.matrix_chromatic_adaptation_VonKries(
+            XYZ_ACES, XYZ_D65, "Bradford"
+        ),
+        M_ACES,
     )
     clf_transforms[filename] = generate_clf_transform(
         filename,
-        [matrix_RGB_to_RGB_transform("ACES2065-1", "CIE-XYZ-D65")],
+        [matrix_transform(M_XYZ)],
         clf_transform_id,
         "AP0 to CIE-XYZ-D65",
         "ACES2065-1",

opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_CIE-XYZ-D65-Scene-referred.clf

@@ -4,9 +4,9 @@
     <OutputDescriptor>CIE XYZ, D65 white point</OutputDescriptor>
     <Matrix inBitDepth="32f" outBitDepth="32f">
         <Array dim="3 3">
-  0.987189224215598 -0.00468348472103211   0.0174942605054339
-   0.337368890787837    0.729521566690265  -0.0668904574781025
- 0.00107795096161498 -0.00340726320478726     1.00232931224317
+  0.938279849239345 -0.00445144581227847   0.0166275235564231
+   0.337368890823117    0.729521566676754   -0.066890457499083
+ 0.00117395084939056 -0.00371070640198378     1.09159450636463
         </Array>
     </Matrix>
 </ProcessList>

opencolorio_config_aces/config/cg/generate/config.py

@@ -207,13 +207,13 @@ def clf_transform_to_description(
             if clf_transform.description is not None:
                 if direction.lower() == "forward":
                     description.append(
-                        f"Convert {clf_transform.output_descriptor} "
-                        f"to {clf_transform.input_descriptor}"
+                        f"Convert {clf_transform.input_descriptor} "
+                        f"to {clf_transform.output_descriptor}"
                     )
                 else:
                     description.append(
-                        f"Convert {clf_transform.input_descriptor} "
-                        f"to {clf_transform.output_descriptor}"
+                        f"Convert {clf_transform.output_descriptor} "
+                        f"to {clf_transform.input_descriptor}"
                     )
         elif describe in (  # noqa: SIM102
             DescriptionStyle.OPENCOLORIO,
@@ -328,7 +328,9 @@ def clf_transform_to_colorspace(
         "name": clf_transform_to_colorspace_name(clf_transform),
         "family": clf_transform_to_family(clf_transform),
         "description": clf_transform_to_description(
-            clf_transform, describe, amf_components
+            clf_transform,
+            describe,
+            amf_components,
         ),
     }
 
@@ -1156,7 +1158,10 @@ def view_filterer(transform):
 
         inactive_colorspaces.append(colorspace)
 
-    data.inactive_colorspaces = inactive_colorspaces
+    data.inactive_colorspaces = [
+        *inactive_colorspaces,
+        "CIE-XYZ-D65 - Display-referred",
+    ]
 
     # Roles Filtering & Update
     for role in (
@@ -1175,7 +1180,7 @@ def view_filterer(transform):
                 "ACEScct", "ACES", scheme
             ),
             ocio.ROLE_DATA: "Raw",
-            ocio.ROLE_INTERCHANGE_DISPLAY: "CIE-XYZ-D65",
+            ocio.ROLE_INTERCHANGE_DISPLAY: "CIE-XYZ-D65 - Display-referred",
             ocio.ROLE_INTERCHANGE_SCENE: format_optional_prefix(
                 "ACES2065-1", "ACES", scheme
             ),

opencolorio_config_aces/config/cg/generate/resources/OpenColorIO-Config-ACES CG and Studio Transforms - v2 - CG Config - Mapping.csv

@@ -1,7 +1,7 @@
 Ordering,Colorspace,Legacy,ACEStransformID,CLFtransformID,Interface,BuiltinTransform Style,Aliases,Encoding,Categories
 100,ACES - ACEScc,TRUE,urn:ampas:aces:transformId:v1.5:ACEScsc.Academy.ACEScc_to_ACES.a1.0.3,,ColorSpace,ACEScc_to_ACES2065-1,"acescc,acescc_ap1",log,file-io
 100,ACES - ACEScct,TRUE,urn:ampas:aces:transformId:v1.5:ACEScsc.Academy.ACEScct_to_ACES.a1.0.3,,ColorSpace,ACEScct_to_ACES2065-1,"acescct,acescct_ap1",log,"file-io,working-space"
-100,ACES - ACEScg,TRUE,urn:ampas:aces:transformId:v1.5:ACEScsc.Academy.ACEScg_to_ACES.a1.0.3,,ColorSpace,ACEScg_to_ACES2065-1,"acescg,lin_ap1",scene-linear,"file-io,working-space,texture"
+100,ACES - ACEScg,TRUE,urn:ampas:aces:transformId:v1.5:ACEScsc.Academy.ACEScg_to_ACES.a1.0.3,,ColorSpace,ACEScg_to_ACES2065-1,"acescg,lin_ap1,lin_ap1_scene",scene-linear,"file-io,working-space,texture"
 300,Output - DisplayP3,TRUE,urn:ampas:aces:transformId:v1.5:ODT.Academy.DisplayP3_dim.a1.0.0,,ViewTransform,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-VIDEO_1.0,,sdr-video,file-io
 300,Output - P3-D65 ST2084 (1000 nits),TRUE,urn:ampas:aces:transformId:v1.5:RRTODT.Academy.P3D65_1000nits_15nits_ST2084.a1.1.0,,ViewTransform,DISPLAY - CIE-XYZ-D65_to_ST2084-P3-D65,,hdr-video,file-io
 300,Output - P3D65,TRUE,urn:ampas:aces:transformId:v1.5:ODT.Academy.P3D65_48nits.a1.1.0,,ViewTransform,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-CINEMA_1.0,,sdr-video,file-io
@@ -10,15 +10,17 @@ Ordering,Colorspace,Legacy,ACEStransformID,CLFtransformID,Interface,BuiltinTrans
 300,Output - sRGB,TRUE,urn:ampas:aces:transformId:v1.5:ODT.Academy.RGBmonitor_100nits_dim.a1.0.3,,ViewTransform,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-VIDEO_1.0,,sdr-video,file-io
 400,Utility - Curve - Rec.1886,TRUE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:Linear_to_Rec1886-Curve:1.0,NamedTransform,,crv_rec1886,sdr-video,file-io
 400,Utility - Curve - sRGB,TRUE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:Linear_to_sRGB-Curve:1.0,NamedTransform,,crv_srgb,sdr-video,file-io
-410,Utility - Linear - P3-D65,TRUE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Linear_P3-D65:1.0,ColorSpace,,"lin_p3d65,lin_displayp3,Linear Display P3",scene-linear,"file-io,working-space,texture"
-410,Utility - Linear - Rec.2020,TRUE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Linear_Rec2020:1.0,ColorSpace,,lin_rec2020,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_srgb,Utility - Linear - sRGB",scene-linear,"file-io,working-space,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,,,,file-io
+410,Utility - Linear - P3-D65,TRUE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Linear_P3-D65:1.0,ColorSpace,,"lin_p3d65,lin_displayp3,lin_displayp3_scene,Linear Display P3",scene-linear,"file-io,working-space,texture"
+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,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,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 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 Encoded P3-D65 - Texture,srgb_encoded_p3d65_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
+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,Input - Generic - sRGB - Texture,sRGB - Texture,srgb_tx",,"file-io,texture"
-500,Utility - Look - Gamut Compress,FALSE,urn:ampas:aces:transformId:v1.5:LMT.Academy.ReferenceGamutCompress.a1.v1.0,,Look,,,,
+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"
+500,ACES 1.3 Reference Gamut Compression,FALSE,urn:ampas:aces:transformId:v1.5:LMT.Academy.ReferenceGamutCompress.a1.v1.0,,Look,,,,

opencolorio_config_aces/config/generation/version.py

@@ -85,22 +85,22 @@ def to_regularised_versions(self):
 DEPENDENCY_VERSIONS = [
     DependencyVersions(
         aces=Version(1, 3),
-        colorspaces=Version(2, 0, 0),
+        colorspaces=Version(2, 1, 0),
         ocio=Version(2, 1),
     ),
     DependencyVersions(
         aces=Version(1, 3),
-        colorspaces=Version(2, 0, 0),
+        colorspaces=Version(2, 1, 0),
         ocio=Version(2, 2),
     ),
     DependencyVersions(
         aces=Version(1, 3),
-        colorspaces=Version(2, 1, 0),
+        colorspaces=Version(2, 2, 0),
         ocio=Version(2, 3),
     ),
     DependencyVersions(
         aces=Version(1, 3),
-        colorspaces=Version(2, 1, 0),
+        colorspaces=Version(2, 2, 0),
         ocio=Version(2, 4),
     ),
 ]

opencolorio_config_aces/config/reference/generate/config.py

@@ -1138,14 +1138,17 @@ def generate_config_aces(
     }
     scene_reference_colorspace["aliases"] = [
         beautify_alias(scene_reference_colorspace["name"]),
+        "aces",
         "ACES - ACES2065-1",
         "lin_ap0",
+        "lin_ap0_scene",
     ]
 
     display_reference_colorspace = {
-        "name": "CIE-XYZ-D65",
+        "name": "CIE-XYZ-D65 - Display-referred",
         "description": 'The "CIE XYZ (D65)" display connection colorspace.',
         "reference_space": "REFERENCE_SPACE_DISPLAY",
+        "encoding": "display-linear",
     }
     display_reference_colorspace["aliases"] = [
         beautify_alias(display_reference_colorspace["name"])
@@ -1157,6 +1160,7 @@ def generate_config_aces(
         "description": 'The utility "Raw" colorspace.',
         "is_data": True,
         "categories": ["file-io", "texture"],
+        "encoding": "data",
     }
     raw_colorspace["aliases"] = [
         beautify_alias(raw_colorspace["name"]),

opencolorio_config_aces/config/reference/generate/resources/OpenColorIO-Config-ACES Reference Transforms - v2 - Reference Config - Mapping.csv

@@ -1,7 +1,7 @@
 Ordering,ACEStransformID,Colorspace,Legacy,BuiltinTransform Style,Linked DisplayColorSpace Style,Interface,Encoding,Categories,Aliases
 100,urn:ampas:aces:transformId:v1.5:ACEScsc.Academy.ACEScc_to_ACES.a1.0.3,ACES - ACEScc,TRUE,ACEScc_to_ACES2065-1,,ColorSpace,log,file-io,"acescc,acescc_ap1"
 100,urn:ampas:aces:transformId:v1.5:ACEScsc.Academy.ACEScct_to_ACES.a1.0.3,ACES - ACEScct,TRUE,ACEScct_to_ACES2065-1,,ColorSpace,log,"file-io,working-space","acescct,acescct_ap1"
-100,urn:ampas:aces:transformId:v1.5:ACEScsc.Academy.ACEScg_to_ACES.a1.0.3,ACES - ACEScg,TRUE,ACEScg_to_ACES2065-1,,ColorSpace,scene-linear,"file-io,working-space,texture","acescg,lin_ap1"
+100,urn:ampas:aces:transformId:v1.5:ACEScsc.Academy.ACEScg_to_ACES.a1.0.3,ACES - ACEScg,TRUE,ACEScg_to_ACES2065-1,,ColorSpace,scene-linear,"file-io,working-space,texture","acescg,lin_ap1,lin_ap1_scene"
 100,urn:ampas:aces:transformId:v1.5:ACEScsc.Academy.ADX10_to_ACES.a1.0.3,Input - ADX - ADX10,TRUE,ADX10_to_ACES2065-1,,ColorSpace,log,file-io,adx10
 100,urn:ampas:aces:transformId:v1.5:ACEScsc.Academy.ADX16_to_ACES.a1.0.3,Input - ADX - ADX16,TRUE,ADX16_to_ACES2065-1,,ColorSpace,log,file-io,adx16
 120,urn:ampas:aces:transformId:v1.5:ACEScsc.Academy.CLog2_CGamut_to_ACES.a1.1.0,,FALSE,CANON_CLOG2-CGAMUT_to_ACES2065-1,,ColorSpace,log,file-io,canonlog2_cgamutday