diff --git a/.github/workflows/continuous-integration-quality-unit-tests.yml b/.github/workflows/continuous-integration-quality-unit-tests.yml
index 6fe84407..213e1c82 100644
--- a/.github/workflows/continuous-integration-quality-unit-tests.yml
+++ b/.github/workflows/continuous-integration-quality-unit-tests.yml
@@ -7,7 +7,8 @@ jobs:
name: ${{ matrix.os }} - Python ${{ matrix.python-version }}
strategy:
matrix:
- os: [macOS-13, ubuntu-20.04, windows-latest]
+ # os: [macOS-13, ubuntu-20.04, windows-latest]
+ os: [macOS-13, ubuntu-20.04]
python-version: [3.11]
fail-fast: false
runs-on: ${{ matrix.os }}
diff --git a/opencolorio_config_aces/clf/discover/classify.py b/opencolorio_config_aces/clf/discover/classify.py
index ea6ba378..a0d8b54f 100644
--- a/opencolorio_config_aces/clf/discover/classify.py
+++ b/opencolorio_config_aces/clf/discover/classify.py
@@ -1188,8 +1188,7 @@ def unclassify_clf_transforms(
... discover_clf_transforms())
>>> sorted( # doctest: +ELLIPSIS
... unclassify_clf_transforms(clf_transforms), key=lambda x: x.path)[0]
- CLFTransform(\
-'arri...input...ARRI.Input.ARRI_LogC3_Curve_EI800.clf')
+ CLFTransform('apple...input...Apple.Input.Apple_Log-Curve.clf')
"""
unclassified_clf_transforms = []
diff --git a/opencolorio_config_aces/clf/transforms/ocio/generate.py b/opencolorio_config_aces/clf/transforms/ocio/generate.py
index a9ea7deb..a3a7daae 100644
--- a/opencolorio_config_aces/clf/transforms/ocio/generate.py
+++ b/opencolorio_config_aces/clf/transforms/ocio/generate.py
@@ -18,7 +18,9 @@
gamma_transform,
generate_clf_transform,
matrix_RGB_to_RGB_transform,
+ matrix_transform,
)
+from opencolorio_config_aces.utilities import required
__author__ = "OpenColorIO Contributors"
__copyright__ = "Copyright Contributors to the OpenColorIO Project."
@@ -50,9 +52,12 @@
"""
+@required("Colour")
def generate_clf_transforms_ocio(output_directory):
"""Generate OCIO Utility CLF transforms."""
+ import colour
+
output_directory.mkdir(parents=True, exist_ok=True)
clf_transforms = {}
@@ -95,6 +100,29 @@ def generate_clf_transforms_ocio(output_directory):
style=style,
)
+ 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)
+ 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_transform(M_XYZ)],
+ clf_transform_id,
+ "AP0 to CIE-XYZ-D65",
+ "ACES2065-1",
+ "CIE XYZ, D65 white point",
+ )
+
name = "AP0_to_Linear_P3-D65"
clf_transform_id = format_clf_transform_id(FAMILY, GENUS, name, VERSION)
filename = output_directory / clf_basename(clf_transform_id)
@@ -131,7 +159,19 @@ def generate_clf_transforms_ocio(output_directory):
"linear Rec.709 primaries, D65 white point",
)
- name = "AP0_to_sRGB-Texture"
+ name = "AP0_to_Linear_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(
+ filename,
+ [matrix_RGB_to_RGB_transform("ACES2065-1", "Adobe RGB (1998)")],
+ clf_transform_id,
+ "AP0 to Linear Adobe RGB (1998)",
+ "ACES2065-1",
+ "linear Adobe RGB (1998) primaries, D65 white point",
+ )
+
+ name = "AP0_to_sRGB-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(
@@ -146,7 +186,7 @@ def generate_clf_transforms_ocio(output_directory):
"sRGB",
)
- name = "AP0_to_Gamma1.8_Rec709-Texture"
+ name = "AP0_to_Gamma1.8_Rec709-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(
@@ -156,12 +196,12 @@ def generate_clf_transforms_ocio(output_directory):
gamma_transform(1.8),
],
clf_transform_id,
- "AP0 to Gamma 1.8 Rec.709 - Texture",
+ "AP0 to Gamma 1.8 Rec.709 - Scene-referred",
"ACES2065-1",
"1.8 gamma-corrected Rec.709 primaries, D65 white point",
)
- name = "AP0_to_Gamma2.2_Rec709-Texture"
+ name = "AP0_to_Gamma2.2_Rec709-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(
@@ -171,12 +211,12 @@ def generate_clf_transforms_ocio(output_directory):
gamma_transform(2.2),
],
clf_transform_id,
- "AP0 to Gamma 2.2 Rec.709 - Texture",
+ "AP0 to Gamma 2.2 Rec.709 - Scene-referred",
"ACES2065-1",
"2.2 gamma-corrected Rec.709 primaries, D65 white point",
)
- name = "AP0_to_Gamma2.4_Rec709-Texture"
+ name = "AP0_to_Gamma2.4_Rec709-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(
@@ -186,12 +226,12 @@ def generate_clf_transforms_ocio(output_directory):
gamma_transform(2.4),
],
clf_transform_id,
- "AP0 to Gamma 2.4 Rec.709 - Texture",
+ "AP0 to Gamma 2.4 Rec.709 - Scene-referred",
"ACES2065-1",
"2.4 gamma-corrected Rec.709 primaries, D65 white point",
)
- name = "AP0_to_Gamma2.2_AP1-Texture"
+ name = "AP0_to_Gamma2.2_AP1-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(
@@ -201,12 +241,12 @@ def generate_clf_transforms_ocio(output_directory):
gamma_transform(2.2),
],
clf_transform_id,
- "AP0 to Gamma 2.2 AP1 - Texture",
+ "AP0 to Gamma 2.2 AP1 - Scene-referred",
"ACES2065-1",
"2.2 gamma-corrected AP1 primaries, ACES ~=D60 white point",
)
- name = "AP0_to_sRGB_Encoded_AP1-Texture"
+ name = "AP0_to_sRGB_Encoded_AP1-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(
@@ -216,12 +256,12 @@ def generate_clf_transforms_ocio(output_directory):
gamma_transform("sRGB"),
],
clf_transform_id,
- "AP0 to sRGB Encoded AP1 - Texture",
+ "AP0 to sRGB Encoded AP1 - Scene-referred",
"ACES2065-1",
"sRGB Encoded AP1 primaries, ACES ~=D60 white point",
)
- name = "AP0_to_sRGB_Encoded_P3-D65-Texture"
+ name = "AP0_to_sRGB_Encoded_P3-D65-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(
@@ -231,11 +271,26 @@ def generate_clf_transforms_ocio(output_directory):
gamma_transform("sRGB"),
],
clf_transform_id,
- "AP0 to sRGB Encoded P3-D65 - Texture",
+ "AP0 to sRGB Encoded P3-D65 - Scene-referred",
"ACES2065-1",
"sRGB Encoded P3-D65 primaries, D65 white point",
)
+ name = "AP0_to_AdobeRGB-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", "Adobe RGB (1998)"),
+ gamma_transform(563 / 256),
+ ],
+ clf_transform_id,
+ "AP0 to Adobe RGB (1998) - Scene-referred",
+ "ACES2065-1",
+ "Adobe RGB (1998) primaries, D65 white point",
+ )
+
return clf_transforms
diff --git a/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_AdobeRGB-Scene-referred.clf b/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_AdobeRGB-Scene-referred.clf
new file mode 100644
index 00000000..b7a24362
--- /dev/null
+++ b/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_AdobeRGB-Scene-referred.clf
@@ -0,0 +1,15 @@
+
+
+ ACES2065-1
+ Adobe RGB (1998) primaries, D65 white point
+
+
+ 1.72456031681181 -0.419993594161504 -0.304566722650304
+ -0.276479914229922 1.37271908766826 -0.0962391734383339
+-0.0261255258256649 -0.0901747806551909 1.11630030648086
+
+
+
+
+
+
diff --git a/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_CIE-XYZ-D65-Scene-referred.clf b/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_CIE-XYZ-D65-Scene-referred.clf
new file mode 100644
index 00000000..87720a58
--- /dev/null
+++ b/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_CIE-XYZ-D65-Scene-referred.clf
@@ -0,0 +1,12 @@
+
+
+ ACES2065-1
+ CIE XYZ, D65 white point
+
+
+ 0.938279849239345 -0.00445144581227847 0.0166275235564231
+ 0.337368890823117 0.729521566676754 -0.066890457499083
+ 0.00117395084939056 -0.00371070640198378 1.09159450636463
+
+
+
diff --git a/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Gamma1.8_Rec709-Texture.clf b/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Gamma1.8_Rec709-Scene-referred.clf
similarity index 86%
rename from opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Gamma1.8_Rec709-Texture.clf
rename to opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Gamma1.8_Rec709-Scene-referred.clf
index 866cee0c..30c9b45e 100644
--- a/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Gamma1.8_Rec709-Texture.clf
+++ b/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Gamma1.8_Rec709-Scene-referred.clf
@@ -1,5 +1,5 @@
-
+
ACES2065-1
1.8 gamma-corrected Rec.709 primaries, D65 white point
diff --git a/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Gamma2.2_AP1-Texture.clf b/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Gamma2.2_AP1-Scene-referred.clf
similarity index 87%
rename from opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Gamma2.2_AP1-Texture.clf
rename to opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Gamma2.2_AP1-Scene-referred.clf
index 70ffe395..67d6b342 100644
--- a/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Gamma2.2_AP1-Texture.clf
+++ b/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Gamma2.2_AP1-Scene-referred.clf
@@ -1,5 +1,5 @@
-
+
ACES2065-1
2.2 gamma-corrected AP1 primaries, ACES ~=D60 white point
diff --git a/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Gamma2.2_Rec709-Texture.clf b/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Gamma2.2_Rec709-Scene-referred.clf
similarity index 86%
rename from opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Gamma2.2_Rec709-Texture.clf
rename to opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Gamma2.2_Rec709-Scene-referred.clf
index d60ff608..16ce0aa0 100644
--- a/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Gamma2.2_Rec709-Texture.clf
+++ b/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Gamma2.2_Rec709-Scene-referred.clf
@@ -1,5 +1,5 @@
-
+
ACES2065-1
2.2 gamma-corrected Rec.709 primaries, D65 white point
diff --git a/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Gamma2.4_Rec709-Texture.clf b/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Gamma2.4_Rec709-Scene-referred.clf
similarity index 86%
rename from opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Gamma2.4_Rec709-Texture.clf
rename to opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Gamma2.4_Rec709-Scene-referred.clf
index ce363c87..15144ead 100644
--- a/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Gamma2.4_Rec709-Texture.clf
+++ b/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Gamma2.4_Rec709-Scene-referred.clf
@@ -1,5 +1,5 @@
-
+
ACES2065-1
2.4 gamma-corrected Rec.709 primaries, D65 white point
diff --git a/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Linear_AdobeRGB.clf b/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Linear_AdobeRGB.clf
new file mode 100644
index 00000000..93b69d86
--- /dev/null
+++ b/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Linear_AdobeRGB.clf
@@ -0,0 +1,12 @@
+
+
+ ACES2065-1
+ linear Adobe RGB (1998) primaries, D65 white point
+
+
+ 1.72456031681181 -0.419993594161504 -0.304566722650304
+ -0.276479914229922 1.37271908766826 -0.0962391734383339
+-0.0261255258256649 -0.0901747806551909 1.11630030648086
+
+
+
diff --git a/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_sRGB-Texture.clf b/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_sRGB-Scene-referred.clf
similarity index 89%
rename from opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_sRGB-Texture.clf
rename to opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_sRGB-Scene-referred.clf
index c137c0e1..d36d5bb3 100644
--- a/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_sRGB-Texture.clf
+++ b/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_sRGB-Scene-referred.clf
@@ -1,5 +1,5 @@
-
+
ACES2065-1
sRGB
diff --git a/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_sRGB_Encoded_AP1-Texture.clf b/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_sRGB_Encoded_AP1-Scene-referred.clf
similarity index 86%
rename from opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_sRGB_Encoded_AP1-Texture.clf
rename to opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_sRGB_Encoded_AP1-Scene-referred.clf
index 2614be95..00868016 100644
--- a/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_sRGB_Encoded_AP1-Texture.clf
+++ b/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_sRGB_Encoded_AP1-Scene-referred.clf
@@ -1,5 +1,5 @@
-
+
ACES2065-1
sRGB Encoded AP1 primaries, ACES ~=D60 white point
diff --git a/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_sRGB_Encoded_P3-D65-Texture.clf b/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_sRGB_Encoded_P3-D65-Scene-referred.clf
similarity index 85%
rename from opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_sRGB_Encoded_P3-D65-Texture.clf
rename to opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_sRGB_Encoded_P3-D65-Scene-referred.clf
index 88be8c56..67b3524e 100644
--- a/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_sRGB_Encoded_P3-D65-Texture.clf
+++ b/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_sRGB_Encoded_P3-D65-Scene-referred.clf
@@ -1,5 +1,5 @@
-
+
ACES2065-1
sRGB Encoded P3-D65 primaries, D65 white point
diff --git a/opencolorio_config_aces/clf/transforms/sony/input/Sony.Input.Linear_Venice_SGamut3_to_ACES2065-1.clf b/opencolorio_config_aces/clf/transforms/sony/input/Sony.Input.Linear_Venice_SGamut3_to_ACES2065-1.clf
index e4c23a1d..85f08ecd 100644
--- a/opencolorio_config_aces/clf/transforms/sony/input/Sony.Input.Linear_Venice_SGamut3_to_ACES2065-1.clf
+++ b/opencolorio_config_aces/clf/transforms/sony/input/Sony.Input.Linear_Venice_SGamut3_to_ACES2065-1.clf
@@ -4,9 +4,9 @@
ACES2065-1
- 0.793329741146434 0.0890786256206771 0.117591633232888
+ 0.793329741146434 0.089078625620677 0.117591633232888
0.0155810585252582 1.03271230692988 -0.0482933654551394
--0.0188647477991488 0.0127694120973433 1.0060953357018
+-0.0188647477991488 0.0127694120973433 1.00609533570181
diff --git a/opencolorio_config_aces/config/cg/generate/config.py b/opencolorio_config_aces/config/cg/generate/config.py
index 55a2be53..2de856bf 100644
--- a/opencolorio_config_aces/config/cg/generate/config.py
+++ b/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,7 @@ 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, "Forward"
),
}
@@ -598,10 +598,15 @@ def style_to_named_transform(
colorspace_signature = clf_transform_to_colorspace(
clf_transform, describe, amf_components, True, **kwargs
)
- description = colorspace_signature["description"]
signature.update(colorspace_signature)
signature.pop("from_reference", None)
source = clf_transform.source
+ description = clf_transform_to_description(
+ clf_transform,
+ describe,
+ amf_components,
+ "Reverse" if is_reference(source) else "Forward",
+ )
else:
# TODO: Implement solid "BuiltinTransform" source detection.
source = (
@@ -1156,7 +1161,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 (
@@ -1169,19 +1177,19 @@ def view_filterer(transform):
data.roles.update(
{
- ocio.ROLE_COLOR_PICKING: "sRGB - Texture",
+ ocio.ROLE_COLOR_PICKING: "sRGB - Scene-referred",
ocio.ROLE_COLOR_TIMING: format_optional_prefix("ACEScct", "ACES", scheme),
ocio.ROLE_COMPOSITING_LOG: format_optional_prefix(
"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
),
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 - Texture",
+ ocio.ROLE_TEXTURE_PAINT: "sRGB - Scene-referred",
}
)
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 2ab4282f..13e477af 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
@@ -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,14 +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,Utility - Gamma 1.8 - Rec.709 - Texture,TRUE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma1.8_Rec709-Texture:1.0,ColorSpace,,g18_rec709,sdr-video,"file-io,texture"
-420,Utility - Gamma 2.2 - AP1 - Texture,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.2_AP1-Texture:1.0,ColorSpace,,g22_ap1,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-Texture:1.0,ColorSpace,,g22_rec709,sdr-video,"file-io,texture"
-420,Utility - Gamma 2.4 - Rec.709 - Texture,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.4_Rec709-Texture:1.0,ColorSpace,,"g24_rec709,rec709_display,Utility - Rec.709 - Display",sdr-video,"file-io,texture"
-420,Utility - sRGB - AP1 - Texture,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_sRGB_Encoded_AP1-Texture:1.0,ColorSpace,,srgb_ap1,sdr-video,"file-io,texture"
-420,Utility - sRGB - P3-D65 - Texture,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_sRGB_Encoded_P3-D65-Texture:1.0,ColorSpace,,"srgb_p3d65,srgb_displayp3",sdr-video,"file-io,texture"
-420,Utility - sRGB - Texture,TRUE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_sRGB-Texture:1.0,ColorSpace,,"srgb_texture,Input - Generic - sRGB - Texture",,"file-io,texture"
-500,Utility - Look - Gamut Compress,FALSE,urn:ampas:aces:transformId:v1.5:LMT.Academy.ReferenceGamutCompress.a1.v1.0,,Look,,,,
+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,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"
+500,ACES 1.3 Reference Gamut Compression,FALSE,urn:ampas:aces:transformId:v1.5:LMT.Academy.ReferenceGamutCompress.a1.v1.0,,Look,,,,
diff --git a/opencolorio_config_aces/config/generation/beautifiers.py b/opencolorio_config_aces/config/generation/beautifiers.py
index 15245ff8..0e7deffc 100644
--- a/opencolorio_config_aces/config/generation/beautifiers.py
+++ b/opencolorio_config_aces/config/generation/beautifiers.py
@@ -72,6 +72,7 @@
"\\b(\\d+)nits\\b": "(\\1 nits)",
"RGBmonitor": "sRGB",
"\\bP3 D": "P3-D",
+ "CIE XYZ D65": "CIE-XYZ-D65",
"Gamma1": "Gamma 1",
"Gamma2": "Gamma 2",
"Rec1886": "Rec.1886",
@@ -80,6 +81,7 @@
"Rec2100": "Rec.2100",
"ST2084": "ST-2084",
"Curve\\b": "- Curve",
+ "Scene referred": "- Scene-referred",
"Texture\\b": "- Texture",
"\\b(\\w)Log": "\\1-Log",
"\\b(\\w)Gamut": "\\1-Gamut",
@@ -197,6 +199,7 @@
"Display P3": "DisplayP3",
"Gamma ": "g",
"Linear": "lin",
+ "Scene-referred": "scene",
"Texture": "tx",
"-Gamut": "gamut",
"-Log": "log",
diff --git a/opencolorio_config_aces/config/generation/common.py b/opencolorio_config_aces/config/generation/common.py
index 6d4b7c71..7c27b57a 100644
--- a/opencolorio_config_aces/config/generation/common.py
+++ b/opencolorio_config_aces/config/generation/common.py
@@ -414,7 +414,13 @@ def generate_config(data, config_name=None, validate=True, base_config=None):
if config_name is not None:
with open(config_name, "w") as file:
- file.write(config.serialize())
+ try:
+ file.write(config.serialize())
+ except Exception as error:
+ json_name = str(config_name).replace("ocio", "json")
+ serialize_config_data(data, json_name)
+ logger.critical('The config data was serialised to: "%s"', json_name)
+ raise Exception from error # noqa: TRY002
return config
diff --git a/opencolorio_config_aces/config/generation/version.py b/opencolorio_config_aces/config/generation/version.py
index 2469c8a4..31402b99 100644
--- a/opencolorio_config_aces/config/generation/version.py
+++ b/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),
),
]
diff --git a/opencolorio_config_aces/config/reference/generate/config.py b/opencolorio_config_aces/config/reference/generate/config.py
index 2af4f58f..0e8256df 100644
--- a/opencolorio_config_aces/config/reference/generate/config.py
+++ b/opencolorio_config_aces/config/reference/generate/config.py
@@ -1134,21 +1134,25 @@ def generate_config_aces(
"family": "ACES",
"description": 'The "Academy Color Encoding System" reference colorspace.',
"encoding": "scene-linear",
- "categories": ["file-io"],
+ "categories": ["file-io", "texture"],
}
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"])
+ beautify_alias(display_reference_colorspace["name"]),
+ "CIE-XYZ-D65",
]
raw_colorspace = {
@@ -1157,10 +1161,12 @@ 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"]),
"Utility - Raw",
+ "none",
]
colorspaces += [
@@ -1168,7 +1174,6 @@ def generate_config_aces(
display_reference_colorspace,
raw_colorspace,
]
- inactive_colorspaces = [display_reference_colorspace["name"]]
logger.info('Implicit colorspaces: "%s"', [a["name"] for a in colorspaces])
@@ -1203,8 +1208,6 @@ def generate_config_aces(
)
display["transforms_data"] = [transform_data]
display_name = display["name"]
- if display_name not in inactive_colorspaces:
- inactive_colorspaces.append(display_name)
if display_name not in display_names:
displays.append(display)
@@ -1332,7 +1335,6 @@ def generate_config_aces(
"colorspace": scene_reference_colorspace["name"],
}
],
- inactive_colorspaces=inactive_colorspaces,
default_view_transform=untonemapped_view_transform["name"],
profile_version=dependency_versions.ocio,
)
diff --git a/opencolorio_config_aces/config/reference/generate/resources/OpenColorIO-Config-ACES Reference Transforms - v2 - Reference Config - Mapping.csv b/opencolorio_config_aces/config/reference/generate/resources/OpenColorIO-Config-ACES Reference Transforms - v2 - Reference Config - Mapping.csv
index 9fadcd13..a098fd6b 100644
--- a/opencolorio_config_aces/config/reference/generate/resources/OpenColorIO-Config-ACES Reference Transforms - v2 - Reference Config - Mapping.csv
+++ b/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
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 a8f88588..4e18be15 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
@@ -1,23 +1,21 @@
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"
200,Input - ADX - ADX10,TRUE,urn:ampas:aces:transformId:v1.5:ACEScsc.Academy.ADX10_to_ACES.a1.0.3,,ColorSpace,ADX10_to_ACES2065-1,adx10,log,file-io
200,Input - ADX - ADX16,TRUE,urn:ampas:aces:transformId:v1.5:ACEScsc.Academy.ADX16_to_ACES.a1.0.3,,ColorSpace,ADX16_to_ACES2065-1,adx16,log,file-io
-201,Input - Apple - Apple Log,FALSE,urn:ampas:aces:transformId:v1.5:IDT.Apple.AppleLog_BT2020.a1.v1,urn:aswf:ocio:transformId:1.0:Apple:Input:Apple_Log_to_ACES2065-1:1.0,ColorSpace,APPLE_LOG_to_ACES2065-1,,log,file-io
-201,Input - Apple - Curve - Apple Log,FALSE,,urn:aswf:ocio:transformId:1.0:Apple:Input:Apple_Log-Curve_to_Linear:1.0,NamedTransform,CURVE - APPLE_LOG_to_LINEAR,,log,file-io
+201,Apple Log,FALSE,urn:ampas:aces:transformId:v1.5:IDT.Apple.AppleLog_BT2020.a1.v1,urn:aswf:ocio:transformId:1.0:Apple:Input:Apple_Log_to_ACES2065-1:1.0,ColorSpace,APPLE_LOG_to_ACES2065-1,,log,file-io
+201,Apple Log - Curve,FALSE,,urn:aswf:ocio:transformId:1.0:Apple:Input:Apple_Log-Curve_to_Linear:1.0,NamedTransform,CURVE - APPLE_LOG_to_LINEAR,,log,file-io
203,Input - ARRI - Curve - V3 LogC (EI800),TRUE,,urn:aswf:ocio:transformId:1.0:ARRI:Input:ARRI_LogC3_Curve_EI800_to_Linear:1.0,NamedTransform,,crv_logc3ei800,log,file-io
203,Input - ARRI - Linear - ALEXA Wide Gamut,TRUE,,urn:aswf:ocio:transformId:1.0:ARRI:Input:Linear_ARRI_Wide_Gamut_3_to_ACES2065-1:1.0,ColorSpace,,lin_alexawide,scene-linear,file-io
203,Input - ARRI - V3 LogC (EI800) - Wide Gamut,TRUE,urn:ampas:aces:transformId:v1.5:IDT.ARRI.Alexa-v3-logC-EI800.a1.v2,urn:aswf:ocio:transformId:1.0:ARRI:Input:ARRI_LogC3_EI800_to_ACES2065-1:1.0,ColorSpace,,logc3ei800_alexawide,log,file-io
-204,Input - ARRI - Curve - LogC4,FALSE,,urn:aswf:ocio:transformId:1.0:ARRI:Input:ARRI_LogC4_Curve_to_Linear:1.0,NamedTransform,,,log,file-io
-204,Input - ARRI - Linear - ARRI Wide Gamut 4,FALSE,,urn:aswf:ocio:transformId:1.0:ARRI:Input:Linear_ARRI_Wide_Gamut_4_to_ACES2065-1:1.0,ColorSpace,,lin_awg4,scene-linear,file-io
-204,Input - ARRI LogC4,FALSE,,urn:aswf:ocio:transformId:1.0:ARRI:Input:ARRI_LogC4_to_ACES2065-1:1.0,ColorSpace,,,log,file-io
-210,Input - Blackmagic - Blackmagic Film Wide Gamut (Gen 5),FALSE,,urn:aswf:ocio:transformId:1.0:BlackmagicDesign:Input:BMDFilm_WideGamut_Gen5_to_ACES2065-1:1.0,ColorSpace,,,log,file-io
-210,Input - Blackmagic - Curve - Blackmagic Film (Gen 5),FALSE,,urn:aswf:ocio:transformId:1.0:BlackmagicDesign:Input:BMDFilm_Gen5_Log-Curve_to_Linear:1.0,NamedTransform,,,log,file-io
-210,Input - Blackmagic - Curve - DaVinci Intermediate,FALSE,,urn:aswf:ocio:transformId:1.0:BlackmagicDesign:Input:DaVinci_Intermediate_Log-Curve_to_Linear:1.0,NamedTransform,,,log,file-io
-210,Input - Blackmagic - DaVinci Intermediate - DaVinci Wide Gamut,FALSE,,urn:aswf:ocio:transformId:1.0:BlackmagicDesign:Input:DaVinci_Intermediate_WideGamut_to_ACES2065-1:1.0,ColorSpace,,,log,file-io
-210,Input - Blackmagic - Linear - Blackmagic Wide Gamut (Gen 5),FALSE,,urn:aswf:ocio:transformId:1.0:BlackmagicDesign:Input:Linear_BMD_WideGamut_Gen5_to_ACES2065-1:1.0,ColorSpace,,,scene-linear,file-io
-210,Input - Blackmagic - Linear - DaVinci Wide Gamut,FALSE,,urn:aswf:ocio:transformId:1.0:BlackmagicDesign:Input:Linear_DaVinci_WideGamut_to_ACES2065-1:1.0,ColorSpace,,,scene-linear,file-io
+204,ARRI LogC4,FALSE,,urn:aswf:ocio:transformId:1.0:ARRI:Input:ARRI_LogC4_to_ACES2065-1:1.0,ColorSpace,,,log,file-io
+204,ARRI LogC4 - Curve,FALSE,,urn:aswf:ocio:transformId:1.0:ARRI:Input:ARRI_LogC4_Curve_to_Linear:1.0,NamedTransform,,,log,file-io
+204,Linear ARRI Wide Gamut 4,FALSE,,urn:aswf:ocio:transformId:1.0:ARRI:Input:Linear_ARRI_Wide_Gamut_4_to_ACES2065-1:1.0,ColorSpace,,lin_awg4,scene-linear,file-io
+210,BMDFilm Gen5 Log - Curve,FALSE,,urn:aswf:ocio:transformId:1.0:BlackmagicDesign:Input:BMDFilm_Gen5_Log-Curve_to_Linear:1.0,NamedTransform,,,log,file-io
+210,BMDFilm WideGamut Gen5,FALSE,,urn:aswf:ocio:transformId:1.0:BlackmagicDesign:Input:BMDFilm_WideGamut_Gen5_to_ACES2065-1:1.0,ColorSpace,,,log,file-io
+210,DaVinci Intermediate Log - Curve,FALSE,,urn:aswf:ocio:transformId:1.0:BlackmagicDesign:Input:DaVinci_Intermediate_Log-Curve_to_Linear:1.0,NamedTransform,,,log,file-io
+210,DaVinci Intermediate WideGamut,FALSE,,urn:aswf:ocio:transformId:1.0:BlackmagicDesign:Input:DaVinci_Intermediate_WideGamut_to_ACES2065-1:1.0,ColorSpace,,,log,file-io
210,Input - Canon - Canon-Log2 - Cinema Gamut Daylight,TRUE,,urn:aswf:ocio:transformId:1.0:Canon:Input:CanonLog2_CinemaGamut-D55_to_ACES2065-1:1.0,ColorSpace,CANON_CLOG2-CGAMUT_to_ACES2065-1,canonlog2_cgamutday,log,file-io
210,Input - Canon - Canon-Log3 - Cinema Gamut Daylight,TRUE,,urn:aswf:ocio:transformId:1.0:Canon:Input:CanonLog3_CinemaGamut-D55_to_ACES2065-1:1.0,ColorSpace,CANON_CLOG3-CGAMUT_to_ACES2065-1,canonlog3_cgamutday,log,file-io
210,Input - Canon - Curve - Canon-Log2,TRUE,,urn:aswf:ocio:transformId:1.0:Canon:Input:CLog2-Curve_to_Linear:1.0,NamedTransform,CURVE - CANON_CLOG2_to_LINEAR,crv_canonlog2,log,file-io
@@ -38,6 +36,8 @@ Ordering,Colorspace,Legacy,ACEStransformID,CLFtransformID,Interface,BuiltinTrans
210,Input - Sony - S-Log3 - S-Gamut3.Cine,TRUE,urn:ampas:aces:transformId:v1.5:IDT.Sony.SLog3_SGamut3Cine.a1.v1,urn:aswf:ocio:transformId:1.0:Sony:Input:SLog3_SGamut3Cine_to_ACES2065-1:1.0,ColorSpace,,slog3_sgamutcine,log,file-io
210,Input - Sony - S-Log3 - Venice S-Gamut3,TRUE,urn:ampas:aces:transformId:v1.5:IDT.Sony.Venice_SLog3_SGamut3.a1.v1,urn:aswf:ocio:transformId:1.0:Sony:Input:SLog3_Venice_SGamut3_to_ACES2065-1:1.0,ColorSpace,,slog3_venice_sgamut3,log,file-io
210,Input - Sony - S-Log3 - Venice S-Gamut3.Cine,TRUE,urn:ampas:aces:transformId:v1.5:IDT.Sony.Venice_SLog3_SGamut3Cine.a1.v1,urn:aswf:ocio:transformId:1.0:Sony:Input:SLog3_Venice_SGamut3Cine_to_ACES2065-1:1.0,ColorSpace,,slog3_venice_sgamutcine,log,file-io
+210,Linear BMD WideGamut Gen5,FALSE,,urn:aswf:ocio:transformId:1.0:BlackmagicDesign:Input:Linear_BMD_WideGamut_Gen5_to_ACES2065-1:1.0,ColorSpace,,,scene-linear,file-io
+210,Linear DaVinci WideGamut,FALSE,,urn:aswf:ocio:transformId:1.0:BlackmagicDesign:Input:Linear_DaVinci_WideGamut_to_ACES2065-1:1.0,ColorSpace,,,scene-linear,file-io
210,Utility - Rec.709 - Camera,TRUE,,urn:aswf:ocio:transformId:1.0:ITU:Utility:AP0_to_Camera_Rec709:1.0,ColorSpace,,rec709_camera,sdr-video,file-io
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 - DisplayP3 (D60 sim.),TRUE,urn:ampas:aces:transformId:v1.5:ODT.Academy.DisplayP3_D60sim_dim.a1.0.0,,ViewTransform,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-VIDEO-D60sim-D65_1.0,,sdr-video,file-io
@@ -62,19 +62,22 @@ Ordering,Colorspace,Legacy,ACEStransformID,CLFtransformID,Interface,BuiltinTrans
300,Output - Rec.709 (D60 sim.),TRUE,urn:ampas:aces:transformId:v1.5:ODT.Academy.Rec709_D60sim_100nits_dim.a1.0.3,,ViewTransform,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-VIDEO-D60sim-D65_1.0,,sdr-video,file-io
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
300,Output - sRGB (D60 sim.),TRUE,urn:ampas:aces:transformId:v1.5:ODT.Academy.RGBmonitor_D60sim_100nits_dim.a1.0.3,,ViewTransform,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-VIDEO-D60sim-D65_1.0,,sdr-video,file-io
+400,ST-2084 - Curve,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:Linear_to_ST2084-Curve:1.0,NamedTransform,CURVE - LINEAR_to_ST-2084,,hdr-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 - Rec.709,TRUE,,urn:aswf:ocio:transformId:1.0:ITU:Utility:Linear_to_Rec709-Curve:1.0,NamedTransform,,crv_rec709,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
-400,Utility - Curve - ST2084,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:Linear_to_ST2084-Curve:1.0,NamedTransform,CURVE - LINEAR_to_ST-2084,,hdr-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"
+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"
410,Utility - Linear - RIMM ROMM (ProPhoto),TRUE,,,ColorSpace,,"lin_prophoto,lin_rimm",scene-linear,file-io
-420,Utility - Gamma 1.8 - Rec.709 - Texture,TRUE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma1.8_Rec709-Texture:1.0,ColorSpace,,g18_rec709,sdr-video,"file-io,texture"
-420,Utility - Gamma 2.2 - AP1 - Texture,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.2_AP1-Texture:1.0,ColorSpace,,g22_ap1,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-Texture:1.0,ColorSpace,,g22_rec709,sdr-video,"file-io,texture"
-420,Utility - Gamma 2.4 - Rec.709 - Texture,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.4_Rec709-Texture:1.0,ColorSpace,,"g24_rec709,rec709_display,Utility - Rec.709 - Display",sdr-video,"file-io,texture"
-420,Utility - sRGB - AP1 - Texture,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_sRGB_Encoded_AP1-Texture:1.0,ColorSpace,,srgb_ap1,sdr-video,"file-io,texture"
-420,Utility - sRGB - P3-D65 - Texture,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_sRGB_Encoded_P3-D65-Texture:1.0,ColorSpace,,"srgb_p3d65,srgb_displayp3",sdr-video,"file-io,texture"
-420,Utility - sRGB - Texture,TRUE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_sRGB-Texture:1.0,ColorSpace,,"srgb_texture,Input - Generic - sRGB - Texture",,"file-io,texture"
-500,Utility - Look - Gamut Compress,FALSE,urn:ampas:aces:transformId:v1.5:LMT.Academy.ReferenceGamutCompress.a1.v1.0,,Look,,,,
+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,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"
+500,ACES 1.3 Reference Gamut Compression,FALSE,urn:ampas:aces:transformId:v1.5:LMT.Academy.ReferenceGamutCompress.a1.v1.0,,Look,,,,