Skip to content

Commit 95f6bb0

Browse files
KelSolaarKelSolaar
authored
PR: 2025-09 (#160)
* Use `https://github.com/ampas/aces`and fix old `ACEStransformID` for the *ARRI* transforms. Closes #157. Signed-off-by: Thomas Mansencal <[email protected]> * Enable *Rec.709* *Gamma 2.2* display rendering transforms. Closes #145. Signed-off-by: Thomas Mansencal <[email protected]> * Implement support for *DJI D-Log - D-Gamut*. Closes #146. Signed-off-by: Thomas Mansencal <[email protected]> * Prepare ground for *AMF* updates. Signed-off-by: Thomas Mansencal <[email protected]> * Implement support for adding virtual displays. Closes #133. Signed-off-by: Thomas Mansencal <[email protected]> * Implement support for `interop_id` and new mirrored display builtins transforms. Closes #153. References #154. Signed-off-by: Thomas Mansencal <[email protected]> * Implement support for `amf_transform_ids`. Closes #154. Signed-off-by: Thomas Mansencal <[email protected]> * Address various code review notes. Signed-off-by: Thomas Mansencal <[email protected]> * Implement support for viewing rules. Signed-off-by: Thomas Mansencal <[email protected]> * Implement support for file rules. Signed-off-by: Thomas Mansencal <[email protected]> * Bump *colorspaces* version to 4.0.0. Signed-off-by: Thomas Mansencal <[email protected]> * Implement support for *AMF* components filtering by config variant. Signed-off-by: Thomas Mansencal <[email protected]> * Add *AMF* component IDs to *Look* and *ViewTransform*. Signed-off-by: Thomas Mansencal <[email protected]> * Update CSV files. Signed-off-by: Thomas Mansencal <[email protected]> * Use `https://github.com/scottdyer/aces` remote `arri-csc-aces-to-logC3` branch. Signed-off-by: Thomas Mansencal <[email protected]> * Update viewing rules. Signed-off-by: Thomas Mansencal <[email protected]> * Ensure that there are no empty *ACEStransformID* in the *AMF* components. Signed-off-by: Thomas Mansencal <[email protected]> --------- Signed-off-by: Thomas Mansencal <[email protected]>
1 parent 6c06e59 commit 95f6bb0

35 files changed

+1030
-586
lines changed

‎.gitmodules‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
[submodule "opencolorio_config_aces/config/reference/aces-system"]
2-
path = opencolorio_config_aces/config/reference/aces-system
3-
url = https://github.com/colour-science/aces-system
1+
[submodule "opencolorio_config_aces/config/reference/aces"]
2+
path = opencolorio_config_aces/config/reference/aces
3+
url = https://github.com/ampas/aces

‎docs/opencolorio_config_aces.clf.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ Common LUT Format Generation
4343
generate_clf_transforms_bmdfilm
4444
generate_clf_transforms_canon
4545
generate_clf_transforms_davinci
46+
generate_clf_transforms_dji
4647
generate_clf_transforms_itu
4748
generate_clf_transforms_ocio
4849
generate_clf_transforms_panasonic

‎docs/opencolorio_config_aces.config.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ Reference Configuration
8282
version_aces_dev
8383
classify_aces_ctl_transforms
8484
discover_aces_ctl_transforms
85+
filter_amf_components
8586
filter_ctl_transforms
8687
generate_amf_components
8788
print_aces_taxonomy

‎docs/opencolorio_config_aces.utilities.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,5 @@ Common
4040
timestamp
4141
as_bool
4242
optional
43+
filter_any
44+
filter_all

‎opencolorio_config_aces/__init__.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
conversion_path,
5050
ctl_transform_to_node,
5151
discover_aces_ctl_transforms,
52+
filter_amf_components,
5253
filter_ctl_transforms,
5354
filter_nodes,
5455
generate_amf_components,
@@ -108,6 +109,7 @@
108109
"conversion_path",
109110
"ctl_transform_to_node",
110111
"discover_aces_ctl_transforms",
112+
"filter_amf_components",
111113
"filter_ctl_transforms",
112114
"filter_nodes",
113115
"generate_amf_components",

‎opencolorio_config_aces/clf/__init__.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
generate_clf_transforms_bmdfilm,
1515
generate_clf_transforms_canon,
1616
generate_clf_transforms_davinci,
17+
generate_clf_transforms_dji,
1718
generate_clf_transforms_itu,
1819
generate_clf_transforms_ocio,
1920
generate_clf_transforms_panasonic,
@@ -35,6 +36,7 @@
3536
"generate_clf_transforms_bmdfilm",
3637
"generate_clf_transforms_canon",
3738
"generate_clf_transforms_davinci",
39+
"generate_clf_transforms_dji",
3840
"generate_clf_transforms_itu",
3941
"generate_clf_transforms_ocio",
4042
"generate_clf_transforms_panasonic",

‎opencolorio_config_aces/clf/transforms/__init__.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
from .canon import (
2020
generate_clf_transforms_canon,
2121
)
22+
from .dji import (
23+
generate_clf_transforms_dji,
24+
)
2225
from .itu import (
2326
generate_clf_transforms_itu,
2427
)
@@ -53,6 +56,9 @@
5356
__all__ += [
5457
"generate_clf_transforms_canon",
5558
]
59+
__all__ += [
60+
"generate_clf_transforms_dji",
61+
]
5662
__all__ += [
5763
"generate_clf_transforms_itu",
5864
]

‎opencolorio_config_aces/clf/transforms/arri/generate.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,10 @@ def _generate_logc3_transforms(
273273
# Generate ARRI LogC3 to ACES 2065-1 Transform
274274
name = f"ARRI_LogC3_EI{ei}_to_ACES2065-1"
275275
aces_id = f"urn:ampas:aces:transformId:v1.5:IDT.ARRI.Alexa-v3-logC-EI{ei}.a1.v2"
276+
277+
if ei == 800:
278+
aces_id = "urn:ampas:aces:transformId:v2.0:CSC.Arri.LogC3_to_ACES.a2.v1"
279+
276280
input_descriptor = f"ARRI LogC3 (EI{ei})"
277281
output_descriptor = "ACES2065-1"
278282
clf_transform_id = format_clf_transform_id(FAMILY, GENUS, name, VERSION)
@@ -342,7 +346,7 @@ def _generate_logc4_transforms(
342346

343347
# Generate ARRI LogC4 to ACES 2065-1 Transform
344348
name = "ARRI_LogC4_to_ACES2065-1"
345-
aces_id = "urn:ampas:aces:transformId:v2.0:CSC.Arri.LogCv4_to_ACES.a2.v1"
349+
aces_id = "urn:ampas:aces:transformId:v2.0:CSC.Arri.LogC4_to_ACES.a2.v1"
346350
input_descriptor = "ARRI LogC4"
347351
output_descriptor = "ACES2065-1"
348352
clf_transform_id = format_clf_transform_id(FAMILY, GENUS, name, VERSION)

‎opencolorio_config_aces/clf/transforms/arri/input/ARRI.Input.ARRI_LogC3_EI800_to_ACES2065-1.clf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<InputDescriptor>ARRI LogC3 (EI800)</InputDescriptor>
44
<OutputDescriptor>ACES2065-1</OutputDescriptor>
55
<Info>
6-
<ACEStransformID>urn:ampas:aces:transformId:v2.0:CSC.Arri.LogCv3_to_ACES.a2.v1</ACEStransformID>
6+
<ACEStransformID>urn:ampas:aces:transformId:v2.0:CSC.Arri.LogC3_to_ACES.a2.v1</ACEStransformID>
77
</Info>
88
<Log inBitDepth="32f" outBitDepth="32f" style="cameraLogToLin">
99
<LogParams base="10" linSideSlope="5.55555555555556" linSideOffset="0.0522722750251688" logSideSlope="0.247189638318671" logSideOffset="0.385536998692443" linSideBreak="0.0105909904954696" />

‎opencolorio_config_aces/clf/transforms/arri/input/ARRI.Input.ARRI_LogC4_to_ACES2065-1.clf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<InputDescriptor>ARRI LogC4</InputDescriptor>
44
<OutputDescriptor>ACES2065-1</OutputDescriptor>
55
<Info>
6-
<ACEStransformID>urn:ampas:aces:transformId:v2.0:CSC.Arri.LogCv4_to_ACES.a2.v1</ACEStransformID>
6+
<ACEStransformID>urn:ampas:aces:transformId:v2.0:CSC.Arri.LogC4_to_ACES.a2.v1</ACEStransformID>
77
</Info>
88
<Log inBitDepth="32f" outBitDepth="32f" style="cameraLogToLin">
99
<LogParams base="2" linSideSlope="2231.82630906769" linSideOffset="64" logSideSlope="0.0647954196341293" logSideOffset="-0.295908392682586" linSideBreak="-0.0180569961199113" />

0 commit comments

Comments
 (0)