Skip to content

Commit 2eba014

Browse files
KelSolaarKelSolaar
committed
Use https://github.com/ampas/acesand fix old ACEStransformID` for the *ARRI* transforms.
Closes #157. Signed-off-by: Thomas Mansencal <[email protected]>
1 parent 6c06e59 commit 2eba014

File tree

10 files changed

+17
-13
lines changed

10 files changed

+17
-13
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

‎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" />

‎opencolorio_config_aces/config/reference/aces‎

Submodule aces added at 35e1e6a

‎opencolorio_config_aces/config/reference/aces-system‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎opencolorio_config_aces/config/reference/discover/classify.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ def patch_invalid_aces_transform_id(aces_transform_id: str) -> str:
255255
ROOT_TRANSFORMS_CTL: str = os.path.normpath(
256256
os.environ.get(
257257
"OPENCOLORIO_CONFIG_CTL__CTL_TRANSFORMS_ROOT",
258-
os.path.join(os.path.dirname(__file__), "../", "aces-system"),
258+
os.path.join(os.path.dirname(__file__), "../", "aces"),
259259
)
260260
)
261261
"""

opencolorio_config_aces/config/reference/generate/resources/OpenColorIO-Config-ACES Reference Transforms - v3 - Reference Config - Mapping.csv renamed to opencolorio_config_aces/config/reference/generate/resources/Loading... - Reference Config - Mapping.csv

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ Ordering,ACEStransformID,Colorspace,Legacy,BuiltinTransform Style,Linked Display
55
100,urn:ampas:aces:transformId:v2.0:CSC.Academy.ADX10_to_ACES.a2.v1,Input - ADX - ADX10,TRUE,ADX10_to_ACES2065-1,,ColorSpace,log,file-io,adx10
66
100,urn:ampas:aces:transformId:v2.0:CSC.Academy.ADX16_to_ACES.a2.v1,Input - ADX - ADX16,TRUE,ADX16_to_ACES2065-1,,ColorSpace,log,file-io,adx16
77
105,urn:ampas:aces:transformId:v2.0:CSC.Apple.AppleLog_BT2020_to_ACES.a2.v1,,FALSE,APPLE_LOG_to_ACES2065-1,,ColorSpace,log,file-io,
8-
110,urn:ampas:aces:transformId:v2.0:CSC.Arri.LogCv3_to_ACES.a2.v1,,FALSE,ARRI_ALEXA-LOGC-EI800-AWG_to_ACES2065-1,,ColorSpace,log,file-io,logc3ei800_alexawide
9-
110,urn:ampas:aces:transformId:v2.0:CSC.Arri.LogCv4_to_ACES.a2.v1,,FALSE,ARRI_LOGC4_to_ACES2065-1,,ColorSpace,log,file-io,
8+
110,urn:ampas:aces:transformId:v2.0:CSC.Arri.LogC3_to_ACES.a2.v1,,FALSE,ARRI_ALEXA-LOGC-EI800-AWG_to_ACES2065-1,,ColorSpace,log,file-io,logc3ei800_alexawide
9+
110,urn:ampas:aces:transformId:v2.0:CSC.Arri.LogC4_to_ACES.a2.v1,,FALSE,ARRI_LOGC4_to_ACES2065-1,,ColorSpace,log,file-io,
1010
130,urn:ampas:aces:transformId:v2.0:CSC.Panasonic.VLog_VGamut_to_ACES.a2.v1,,FALSE,PANASONIC_VLOG-VGAMUT_to_ACES2065-1,,ColorSpace,log,file-io,vlog_vgamut
1111
135,urn:ampas:aces:transformId:v2.0:CSC.Red.Log3G10_RWG_to_ACES.a2.v1,,FALSE,RED_LOG3G10-RWG_to_ACES2065-1,,ColorSpace,log,file-io,log3g10_rwg
1212
140,urn:ampas:aces:transformId:v2.0:CSC.Sony.SLog3_SGamut3_to_ACES.a2.v1,,FALSE,SONY_SLOG3-SGAMUT3_to_ACES2065-1,,ColorSpace,log,file-io,slog3_sgamut3

opencolorio_config_aces/config/studio/generate/resources/OpenColorIO-Config-ACES CG and Studio Transforms - v3 - Studio Config - Mapping.csv renamed to opencolorio_config_aces/config/studio/generate/resources/Loading... - Studio Config - Mapping.csv

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ Ordering,Colorspace,Legacy,ACEStransformID,CLFtransformID,Interface,BuiltinTrans
77
105,Apple Log,FALSE,urn:ampas:aces:transformId:v2.0:CSC.Apple.AppleLog_BT2020_to_ACES.a2.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
88
105,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
99
110,ARRI LogC3 - Curve (EI800),TRUE,,urn:aswf:ocio:transformId:1.0:ARRI:Input:ARRI_LogC3_Curve_EI800_to_Linear:1.0,NamedTransform,,crv_logc3ei800,log,file-io
10-
110,ARRI LogC3 (EI800),TRUE,urn:ampas:aces:transformId:v2.0:CSC.Arri.LogCv3_to_ACES.a2.v1,urn:aswf:ocio:transformId:1.0:ARRI:Input:ARRI_LogC3_EI800_to_ACES2065-1:1.0,ColorSpace,,"logc3ei800_alexawide,Input - ARRI - V3 LogC (EI800) - Wide Gamut",log,file-io
10+
110,ARRI LogC3 (EI800),TRUE,urn:ampas:aces:transformId:v2.0:CSC.Arri.LogC3_to_ACES.a2.v1,urn:aswf:ocio:transformId:1.0:ARRI:Input:ARRI_LogC3_EI800_to_ACES2065-1:1.0,ColorSpace,,"logc3ei800_alexawide,Input - ARRI - V3 LogC (EI800) - Wide Gamut",log,file-io
1111
110,Linear ARRI Wide Gamut 3,TRUE,,urn:aswf:ocio:transformId:1.0:ARRI:Input:Linear_ARRI_Wide_Gamut_3_to_ACES2065-1:1.0,ColorSpace,,"lin_alexawide,Input - ARRI - Linear - ALEXA Wide Gamut",scene-linear,file-io
12-
111,ARRI LogC4,FALSE,urn:ampas:aces:transformId:v2.0:CSC.Arri.LogCv4_to_ACES.a2.v1,urn:aswf:ocio:transformId:1.0:ARRI:Input:ARRI_LogC4_to_ACES2065-1:1.0,ColorSpace,,,log,file-io
12+
111,ARRI LogC4,FALSE,urn:ampas:aces:transformId:v2.0:CSC.Arri.LogC4_to_ACES.a2.v1,urn:aswf:ocio:transformId:1.0:ARRI:Input:ARRI_LogC4_to_ACES2065-1:1.0,ColorSpace,,,log,file-io
1313
111,ARRI LogC4 - Curve,FALSE,,urn:aswf:ocio:transformId:1.0:ARRI:Input:ARRI_LogC4_Curve_to_Linear:1.0,NamedTransform,,,log,file-io
1414
111,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
1515
115,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

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ reportUnnecessaryTypeIgnoreComment = true
108108
reportUnsupportedDunderAll = false
109109
reportUnusedExpression = false
110110
reportAttributeAccessIssue = false # OpenColorIO does not have typing stubs.
111-
exclude = ["**/aces-system", "**/.venv"]
111+
exclude = ["**/aces", "**/.venv"]
112112

113113
[tool.ruff]
114114
target-version = "py310"

0 commit comments

Comments
 (0)