Implement various aliasing and naming updates.

Signed-off-by: Thomas Mansencal <[email protected]>
colour-science · Sep 4, 2024 · 5ba140c · 5ba140c
1 parent bc2614e
commit 5ba140c
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git 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/...to_sRGB_Encoded_P3-D65-Scene-referred.clf → ...lity.AP0_to_Display_P3-Scene-referred.clf b/...to_sRGB_Encoded_P3-D65-Scene-referred.clf → ...lity.AP0_to_Display_P3-Scene-referred.clf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_sRGB_Encoded_P3-D65-Scene-referred:1.0" name="AP0 to sRGB Encoded P3-D65 - Scene-referred">
+<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Display_P3-Scene-referred:1.0" name="AP0 to Display P3 - Scene-referred">
     <InputDescriptor>ACES2065-1</InputDescriptor>
-    <OutputDescriptor>sRGB Encoded P3-D65 primaries, D65 white point</OutputDescriptor>
+    <OutputDescriptor>Display P3 primaries, D65 white point</OutputDescriptor>
     <Matrix inBitDepth="32f" outBitDepth="32f">
         <Array dim="3 3">
    2.02490528596679  -0.689069761034766  -0.335835524932019

diff --git a/...resources/OpenColorIO-Config-ACES CG and Studio Transforms - v2 - CG Config - Mapping.csv b/...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
diff --git a/opencolorio_config_aces/config/reference/generate/config.py b/opencolorio_config_aces/config/reference/generate/config.py
@@ -1145,14 +1145,15 @@ 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",
     }
     display_reference_colorspace["aliases"] = [
         beautify_alias(display_reference_colorspace["name"]),
         "CIE-XYZ-D65",
+        "CIE-XYZ-D65 - Display-referred",
     ]
 
     raw_colorspace = {
@@ -1209,8 +1210,10 @@ def generate_config_aces(
                 display["transforms_data"] = [transform_data]
                 display_name = display["name"]
 
-                if display_name not in display_names:
+                if display not in displays:
                     displays.append(display)
+
+                if display_name not in display_names:
                     display_names.append(display_name)
 
                 shared_view = {

diff --git a/...urces/OpenColorIO-Config-ACES CG and Studio Transforms - v2 - Studio Config - Mapping.csv b/...urces/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"