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]>
AcademySoftwareFoundation · Sep 21, 2022 · 484930d · 484930d
1 parent 1d2f83b
commit 484930d
Show file tree

Hide file tree

Showing 11 changed files with 552 additions and 10 deletions.
diff --git a/opencolorio_config_aces/clf/discover/classify.py b/opencolorio_config_aces/clf/discover/classify.py
@@ -1028,8 +1028,8 @@ def discover_clf_transforms(root_directory=ROOT_TRANSFORMS_CLF):
     >>> os.path.basename(key)
     'input'
     >>> sorted([os.path.basename(path) for path in clf_transforms[key]])[:2]
-    ['BlackmagicDesign.Input.BMDFilm_Gen5_Log-Curve.clf', \
-'BlackmagicDesign.Input.BMDFilm_WideGamut_Gen5_to_ACES2065-1.clf']
+    ['ARRI.Input.ARRI_LogC3_Curve_EI800.clf', \
+'ARRI.Input.ARRI_LogC3_EI800_to_ACES2065-1.clf']
     """
 
     root_directory = os.path.normpath(os.path.expandvars(root_directory))
@@ -1088,19 +1088,18 @@ def classify_clf_transforms(unclassified_clf_transforms):
     ...     discover_clf_transforms())
     >>> family = sorted(clf_transforms.keys())[0]
     >>> str(family)
-    'blackmagic'
+    'arri'
     >>> genera = sorted(clf_transforms[family])
     >>> print(genera)
     ['Input']
     >>> genus = genera[0]
     >>> sorted(clf_transforms[family][genus].items())[:2]  # doctest: +ELLIPSIS
-    [('BlackmagicDesign.Input.BMDFilm_Gen5_Log-Curve', \
+    [('ARRI.Input.ARRI_LogC3_Curve_EI800', \
 CLFTransform(\
-'blackmagic...input...BlackmagicDesign.Input.BMDFilm_Gen5_Log-Curve.clf')), \
-('BlackmagicDesign.Input.BMDFilm_WideGamut_Gen5_to_ACES2065-1', \
+'arri...input...ARRI.Input.ARRI_LogC3_Curve_EI800.clf')), \
+('ARRI.Input.ARRI_LogC3_EI800_to_ACES2065-1', \
 CLFTransform(\
-'blackmagic...input...BlackmagicDesign.Input\
-.BMDFilm_WideGamut_Gen5_to_ACES2065-1.clf'))]
+'arri...input...ARRI.Input.ARRI_LogC3_EI800_to_ACES2065-1.clf'))]
     """
 
     classified_clf_transforms = defaultdict(lambda: defaultdict(dict))
@@ -1180,7 +1179,7 @@ def unclassify_clf_transforms(classified_clf_transforms):
     >>> sorted(  # doctest: +ELLIPSIS
     ...     unclassify_clf_transforms(clf_transforms), key=lambda x: x.path)[0]
     CLFTransform(\
-'blackmagic...input...BlackmagicDesign.Input.BMDFilm_Gen5_Log-Curve.clf')
+'arri...input...ARRI.Input.ARRI_LogC3_Curve_EI800.clf')
     """
 
     unclassified_clf_transforms = []

diff --git a/opencolorio_config_aces/clf/transforms/__init__.py b/opencolorio_config_aces/clf/transforms/__init__.py
@@ -9,6 +9,9 @@
     format_clf_transform_id,
     clf_basename,
 )
+from .arri import (
+    generate_clf_arri,
+)
 from .blackmagic import (
     generate_clf_transforms_bmdfilm,
     generate_clf_transforms_davinci,
@@ -34,6 +37,7 @@
     "format_clf_transform_id",
     "clf_basename",
 ]
+__all__ += ["generate_clf_arri"]
 __all__ += [
     "generate_clf_transforms_bmdfilm",
     "generate_clf_transforms_davinci",

diff --git a/opencolorio_config_aces/clf/transforms/arri/__init__.py b/opencolorio_config_aces/clf/transforms/arri/__init__.py
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright Contributors to the OpenColorIO Project.
+
+from .generate import generate_clf_arri
+
+__all__ = [
+    "generate_clf_arri",
+]