Skip to content

Commit 484930d

Browse files
authored
Add ARRI contributions to OCIO-ACES CLFs (#54)
* add ARRI contributions to OCIO-ACES CLFs Signed-off-by: scoopxyz <[email protected]> * address CI tests Signed-off-by: scoopxyz <[email protected]> * add module to avoid name collision Signed-off-by: scoopxyz <[email protected]> * implement black style change Signed-off-by: scoopxyz <[email protected]> * address Joseph's PR comments, fix EI string formatting Signed-off-by: scoopxyz <[email protected]> * update ARRI CLF generation to latest programming conventions Signed-off-by: Sean Cooper <[email protected]> * update CLF generation code to include ARRI transforms Signed-off-by: Sean Cooper <[email protected]> * update doctests Signed-off-by: Sean Cooper <[email protected]> * address PR notes Signed-off-by: Sean Cooper <[email protected]> * address PR notes, change transform generator function signature Signed-off-by: Sean Cooper <[email protected]> Signed-off-by: scoopxyz <[email protected]> Signed-off-by: Sean Cooper <[email protected]>
1 parent 1d2f83b commit 484930d

11 files changed

+552
-10
lines changed

opencolorio_config_aces/clf/discover/classify.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1028,8 +1028,8 @@ def discover_clf_transforms(root_directory=ROOT_TRANSFORMS_CLF):
10281028
>>> os.path.basename(key)
10291029
'input'
10301030
>>> sorted([os.path.basename(path) for path in clf_transforms[key]])[:2]
1031-
['BlackmagicDesign.Input.BMDFilm_Gen5_Log-Curve.clf', \
1032-
'BlackmagicDesign.Input.BMDFilm_WideGamut_Gen5_to_ACES2065-1.clf']
1031+
['ARRI.Input.ARRI_LogC3_Curve_EI800.clf', \
1032+
'ARRI.Input.ARRI_LogC3_EI800_to_ACES2065-1.clf']
10331033
"""
10341034

10351035
root_directory = os.path.normpath(os.path.expandvars(root_directory))
@@ -1088,19 +1088,18 @@ def classify_clf_transforms(unclassified_clf_transforms):
10881088
... discover_clf_transforms())
10891089
>>> family = sorted(clf_transforms.keys())[0]
10901090
>>> str(family)
1091-
'blackmagic'
1091+
'arri'
10921092
>>> genera = sorted(clf_transforms[family])
10931093
>>> print(genera)
10941094
['Input']
10951095
>>> genus = genera[0]
10961096
>>> sorted(clf_transforms[family][genus].items())[:2] # doctest: +ELLIPSIS
1097-
[('BlackmagicDesign.Input.BMDFilm_Gen5_Log-Curve', \
1097+
[('ARRI.Input.ARRI_LogC3_Curve_EI800', \
10981098
CLFTransform(\
1099-
'blackmagic...input...BlackmagicDesign.Input.BMDFilm_Gen5_Log-Curve.clf')), \
1100-
('BlackmagicDesign.Input.BMDFilm_WideGamut_Gen5_to_ACES2065-1', \
1099+
'arri...input...ARRI.Input.ARRI_LogC3_Curve_EI800.clf')), \
1100+
('ARRI.Input.ARRI_LogC3_EI800_to_ACES2065-1', \
11011101
CLFTransform(\
1102-
'blackmagic...input...BlackmagicDesign.Input\
1103-
.BMDFilm_WideGamut_Gen5_to_ACES2065-1.clf'))]
1102+
'arri...input...ARRI.Input.ARRI_LogC3_EI800_to_ACES2065-1.clf'))]
11041103
"""
11051104

11061105
classified_clf_transforms = defaultdict(lambda: defaultdict(dict))
@@ -1180,7 +1179,7 @@ def unclassify_clf_transforms(classified_clf_transforms):
11801179
>>> sorted( # doctest: +ELLIPSIS
11811180
... unclassify_clf_transforms(clf_transforms), key=lambda x: x.path)[0]
11821181
CLFTransform(\
1183-
'blackmagic...input...BlackmagicDesign.Input.BMDFilm_Gen5_Log-Curve.clf')
1182+
'arri...input...ARRI.Input.ARRI_LogC3_Curve_EI800.clf')
11841183
"""
11851184

11861185
unclassified_clf_transforms = []

opencolorio_config_aces/clf/transforms/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
format_clf_transform_id,
1010
clf_basename,
1111
)
12+
from .arri import (
13+
generate_clf_arri,
14+
)
1215
from .blackmagic import (
1316
generate_clf_transforms_bmdfilm,
1417
generate_clf_transforms_davinci,
@@ -34,6 +37,7 @@
3437
"format_clf_transform_id",
3538
"clf_basename",
3639
]
40+
__all__ += ["generate_clf_arri"]
3741
__all__ += [
3842
"generate_clf_transforms_bmdfilm",
3943
"generate_clf_transforms_davinci",
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# SPDX-License-Identifier: BSD-3-Clause
2+
# Copyright Contributors to the OpenColorIO Project.
3+
4+
from .generate import generate_clf_arri
5+
6+
__all__ = [
7+
"generate_clf_arri",
8+
]

0 commit comments

Comments
 (0)