Skip to content

Commit

Permalink
Update various colourspace names according to latest *ASWF Color Inte…
Browse files Browse the repository at this point in the history
…rop Forum* recommendations.

Signed-off-by: Thomas Mansencal <[email protected]>
  • Loading branch information
KelSolaar committed Sep 12, 2024
1 parent 03edc4b commit 44af79a
Show file tree
Hide file tree
Showing 13 changed files with 47 additions and 46 deletions.
36 changes: 18 additions & 18 deletions opencolorio_config_aces/clf/transforms/ocio/generate.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ def generate_clf_transforms_ocio(output_directory):
"linear Adobe RGB (1998) primaries, D65 white point",
)

name = "AP0_to_sRGB-Scene-referred"
name = "AP0_to_sRGB-Encoded-Rec709"
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(
Expand All @@ -181,12 +181,12 @@ def generate_clf_transforms_ocio(output_directory):
gamma_transform("sRGB"),
],
clf_transform_id,
"AP0 to sRGB Rec.709",
"AP0 to sRGB Encoded Rec.709 (sRGB)",
"ACES2065-1",
"sRGB",
)

name = "AP0_to_Gamma1.8_Rec709-Scene-referred"
name = "AP0_to_Gamma1.8_Encoded_Rec709"
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(
Expand All @@ -196,12 +196,12 @@ def generate_clf_transforms_ocio(output_directory):
gamma_transform(1.8),
],
clf_transform_id,
"AP0 to Gamma 1.8 Rec.709 - Scene-referred",
"AP0 to Gamma 1.8 Encoded Rec.709",
"ACES2065-1",
"1.8 gamma-corrected Rec.709 primaries, D65 white point",
)

name = "AP0_to_Gamma2.2_Rec709-Scene-referred"
name = "AP0_to_Gamma2.2_Encoded_Rec709"
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(
Expand All @@ -211,12 +211,12 @@ def generate_clf_transforms_ocio(output_directory):
gamma_transform(2.2),
],
clf_transform_id,
"AP0 to Gamma 2.2 Rec.709 - Scene-referred",
"AP0 to Gamma 2.2 Encoded Rec.709",
"ACES2065-1",
"2.2 gamma-corrected Rec.709 primaries, D65 white point",
)

name = "AP0_to_Gamma2.4_Rec709-Scene-referred"
name = "AP0_to_Gamma2.4_Encoded_Rec709"
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(
Expand All @@ -226,12 +226,12 @@ def generate_clf_transforms_ocio(output_directory):
gamma_transform(2.4),
],
clf_transform_id,
"AP0 to Gamma 2.4 Rec.709 - Scene-referred",
"AP0 to Gamma 2.4 Encoded Rec.709",
"ACES2065-1",
"2.4 gamma-corrected Rec.709 primaries, D65 white point",
)

name = "AP0_to_Gamma2.2_AP1-Scene-referred"
name = "AP0_to_Gamma2.2_Encoded_AP1"
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(
Expand All @@ -241,12 +241,12 @@ def generate_clf_transforms_ocio(output_directory):
gamma_transform(2.2),
],
clf_transform_id,
"AP0 to Gamma 2.2 AP1 - Scene-referred",
"AP0 to Gamma 2.2 Encoded AP1",
"ACES2065-1",
"2.2 gamma-corrected AP1 primaries, ACES ~=D60 white point",
)

name = "AP0_to_sRGB_Encoded_AP1-Scene-referred"
name = "AP0_to_sRGB_Encoded_AP1"
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(
Expand All @@ -256,12 +256,12 @@ def generate_clf_transforms_ocio(output_directory):
gamma_transform("sRGB"),
],
clf_transform_id,
"AP0 to sRGB Encoded AP1 - Scene-referred",
"AP0 to sRGB Encoded AP1",
"ACES2065-1",
"sRGB Encoded AP1 primaries, ACES ~=D60 white point",
)

name = "AP0_to_Display_P3-Scene-referred"
name = "AP0_to_sRGB_Encoded_P3-D65"
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(
Expand All @@ -271,12 +271,12 @@ def generate_clf_transforms_ocio(output_directory):
gamma_transform("sRGB"),
],
clf_transform_id,
"AP0 to Display P3 - Scene-referred",
"AP0 to sRGB Encoded P3-D65",
"ACES2065-1",
"Display P3 primaries, D65 white point",
"sRGB Encoded P3-D65 primaries, D65 white point",
)

name = "AP0_to_AdobeRGB-Scene-referred"
name = "AP0_to_Gamma2.2_Encoded_AdobeRGB"
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(
Expand All @@ -286,9 +286,9 @@ def generate_clf_transforms_ocio(output_directory):
gamma_transform(563 / 256),
],
clf_transform_id,
"AP0 to Adobe RGB (1998) - Scene-referred",
"AP0 to Gamma 2.2 Encoded AdobeRGB",
"ACES2065-1",
"Adobe RGB (1998) primaries, D65 white point",
"2.2 gamma-corrected AdobeRGB primaries, D65 white point",
)

return clf_transforms
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma1.8_Rec709-Scene-referred:1.0" name="AP0 to Gamma 1.8 Rec.709 - Scene-referred">
<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma1.8_Encoded_Rec709:1.0" name="AP0 to Gamma 1.8 Encoded Rec.709">
<InputDescriptor>ACES2065-1</InputDescriptor>
<OutputDescriptor>1.8 gamma-corrected Rec.709 primaries, D65 white point</OutputDescriptor>
<Matrix inBitDepth="32f" outBitDepth="32f">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.2_AP1-Scene-referred:1.0" name="AP0 to Gamma 2.2 AP1 - Scene-referred">
<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.2_Encoded_AP1:1.0" name="AP0 to Gamma 2.2 Encoded AP1">
<InputDescriptor>ACES2065-1</InputDescriptor>
<OutputDescriptor>2.2 gamma-corrected AP1 primaries, ACES ~=D60 white point</OutputDescriptor>
<Matrix inBitDepth="32f" outBitDepth="32f">
Expand Down
Original file line number Diff line number Diff line change
@@ -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_AdobeRGB-Scene-referred:1.0" name="AP0 to Adobe RGB (1998) - Scene-referred">
<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.2_Encoded_AdobeRGB:1.0" name="AP0 to Gamma 2.2 Encoded AdobeRGB">
<InputDescriptor>ACES2065-1</InputDescriptor>
<OutputDescriptor>Adobe RGB (1998) primaries, D65 white point</OutputDescriptor>
<OutputDescriptor>2.2 gamma-corrected AdobeRGB primaries, D65 white point</OutputDescriptor>
<Matrix inBitDepth="32f" outBitDepth="32f">
<Array dim="3 3">
1.72456031681181 -0.419993594161504 -0.304566722650304
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.2_Rec709-Scene-referred:1.0" name="AP0 to Gamma 2.2 Rec.709 - Scene-referred">
<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.2_Encoded_Rec709:1.0" name="AP0 to Gamma 2.2 Encoded Rec.709">
<InputDescriptor>ACES2065-1</InputDescriptor>
<OutputDescriptor>2.2 gamma-corrected Rec.709 primaries, D65 white point</OutputDescriptor>
<Matrix inBitDepth="32f" outBitDepth="32f">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.4_Rec709-Scene-referred:1.0" name="AP0 to Gamma 2.4 Rec.709 - Scene-referred">
<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.4_Encoded_Rec709:1.0" name="AP0 to Gamma 2.4 Encoded Rec.709">
<InputDescriptor>ACES2065-1</InputDescriptor>
<OutputDescriptor>2.4 gamma-corrected Rec.709 primaries, D65 white point</OutputDescriptor>
<Matrix inBitDepth="32f" outBitDepth="32f">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_sRGB-Scene-referred:1.0" name="AP0 to sRGB Rec.709">
<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_sRGB-Encoded-Rec709:1.0" name="AP0 to sRGB Encoded Rec.709 (sRGB)">
<InputDescriptor>ACES2065-1</InputDescriptor>
<OutputDescriptor>sRGB</OutputDescriptor>
<Matrix inBitDepth="32f" outBitDepth="32f">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_sRGB_Encoded_AP1-Scene-referred:1.0" name="AP0 to sRGB Encoded AP1 - Scene-referred">
<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_sRGB_Encoded_AP1:1.0" name="AP0 to sRGB Encoded AP1">
<InputDescriptor>ACES2065-1</InputDescriptor>
<OutputDescriptor>sRGB Encoded AP1 primaries, ACES ~=D60 white point</OutputDescriptor>
<Matrix inBitDepth="32f" outBitDepth="32f">
Expand Down
Original file line number Diff line number Diff line change
@@ -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_Display_P3-Scene-referred:1.0" name="AP0 to Display P3 - Scene-referred">
<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_sRGB_Encoded_P3-D65:1.0" name="AP0 to sRGB Encoded P3-D65">
<InputDescriptor>ACES2065-1</InputDescriptor>
<OutputDescriptor>Display P3 primaries, D65 white point</OutputDescriptor>
<OutputDescriptor>sRGB Encoded P3-D65 primaries, D65 white point</OutputDescriptor>
<Matrix inBitDepth="32f" outBitDepth="32f">
<Array dim="3 3">
2.02490528596679 -0.689069761034766 -0.335835524932019
Expand Down
4 changes: 2 additions & 2 deletions opencolorio_config_aces/config/cg/generate/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -1177,7 +1177,7 @@ def view_filterer(transform):

data.roles.update(
{
ocio.ROLE_COLOR_PICKING: "sRGB - Scene-referred",
ocio.ROLE_COLOR_PICKING: "sRGB Encoded Rec.709 (sRGB)",
ocio.ROLE_COLOR_TIMING: format_optional_prefix("ACEScct", "ACES", scheme),
ocio.ROLE_COMPOSITING_LOG: format_optional_prefix(
"ACEScct", "ACES", scheme
Expand All @@ -1189,7 +1189,7 @@ def view_filterer(transform):
),
ocio.ROLE_MATTE_PAINT: format_optional_prefix("ACEScct", "ACES", scheme),
ocio.ROLE_SCENE_LINEAR: format_optional_prefix("ACEScg", "ACES", scheme),
ocio.ROLE_TEXTURE_PAINT: "sRGB - Scene-referred",
ocio.ROLE_TEXTURE_PAINT: "sRGB Encoded Rec.709 (sRGB)",
}
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ Ordering,Colorspace,Legacy,ACEStransformID,CLFtransformID,Interface,BuiltinTrans
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,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,Gamma 2.2 Encoded AdobeRGB,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.2_Encoded_AdobeRGB:1.0,ColorSpace,,"adobergb,g22_adobergb_scene",sdr-video,"file-io,texture"
420,Gamma 2.2 Encoded AP1,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.2_Encoded_AP1:1.0,ColorSpace,,"g22_ap1,Gamma 2.2 AP1 - Texture,g22_ap1_tx",sdr-video,"file-io,texture"
420,Gamma 2.4 Encoded Rec.709,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.4_Encoded_Rec709: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,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"
420,sRGB Encoded AP1,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_sRGB_Encoded_AP1: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,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_sRGB_Encoded_P3-D65: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_Encoded_Rec709: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_Encoded_Rec709: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-Encoded-Rec709: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,,,,
1 change: 1 addition & 0 deletions opencolorio_config_aces/config/generation/beautifiers.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
"Cine\\b": ".Cine",
"EI800": "(EI800)",
"Linear Rec.709": "Linear Rec.709 (sRGB)",
"sRGB Encoded Rec.709": "sRGB Encoded Rec.709 (sRGB)",
}
"""
*OpenColorIO* colorspace name substitution patterns.
Expand Down
Loading

0 comments on commit 44af79a

Please sign in to comment.