diff --git a/opencolorio_config_aces/clf/transforms/canon/generate.py b/opencolorio_config_aces/clf/transforms/canon/generate.py index 97cbcb7a..b0ca0203 100644 --- a/opencolorio_config_aces/clf/transforms/canon/generate.py +++ b/opencolorio_config_aces/clf/transforms/canon/generate.py @@ -10,7 +10,6 @@ - :func:`opencolorio_config_aces.clf.generate_clf_transforms_canon` """ -import PyOpenColorIO as ocio from pathlib import Path from opencolorio_config_aces.clf.transforms import ( @@ -75,8 +74,6 @@ def generate_clf_transforms_canon(output_directory): clf_transforms = {} - bt = ocio.BuiltinTransform(style="CANON_CLOG3-CGAMUT_to_ACES2065-1") - mtx = matrix_RGB_to_RGB_transform("Cinema Gamut", "ACES2065-1", "CAT02") aces_transform_id = ( @@ -93,14 +90,16 @@ def generate_clf_transforms_canon(output_directory): output_descriptor = "ACES2065-1" clf_transform_id = format_clf_transform_id(FAMILY, GENUS, name, VERSION) filename = output_directory / clf_basename(clf_transform_id) + style = "CANON_CLOG3-CGAMUT_to_ACES2065-1" clf_transforms[filename] = generate_clf_transform( filename, - [bt], + [{"transform_type": "BuiltinTransform", "style": style}], clf_transform_id, f"{input_descriptor} to {output_descriptor}", input_descriptor, output_descriptor, aces_transform_id, + style=style, ) # Generate transform for primaries only. diff --git a/opencolorio_config_aces/clf/transforms/canon/input/Canon.Input.CanonLog3_CinemaGamut-D55_to_ACES2065-1.clf b/opencolorio_config_aces/clf/transforms/canon/input/Canon.Input.CanonLog3_CinemaGamut-D55_to_ACES2065-1.clf index 3ab2ad48..a32e411f 100644 --- a/opencolorio_config_aces/clf/transforms/canon/input/Canon.Input.CanonLog3_CinemaGamut-D55_to_ACES2065-1.clf +++ b/opencolorio_config_aces/clf/transforms/canon/input/Canon.Input.CanonLog3_CinemaGamut-D55_to_ACES2065-1.clf @@ -4,6 +4,7 @@ ACES2065-1 urn:ampas:aces:transformId:v1.5:ACEScsc.Academy.CLog3_CGamut_to_ACES.a1.1.0 + CANON_CLOG3-CGAMUT_to_ACES2065-1 diff --git a/opencolorio_config_aces/config/cg/generate/resources/OpenColorIO-Config-ACES CG and Studio Transforms - v0.2.0 - CG Config - Mapping.csv b/opencolorio_config_aces/config/cg/generate/resources/OpenColorIO-Config-ACES CG and Studio Transforms - v1.0.0-rc1 - CG Config - Mapping.csv similarity index 100% rename from opencolorio_config_aces/config/cg/generate/resources/OpenColorIO-Config-ACES CG and Studio Transforms - v0.2.0 - CG Config - Mapping.csv rename to opencolorio_config_aces/config/cg/generate/resources/OpenColorIO-Config-ACES CG and Studio Transforms - v1.0.0-rc1 - CG Config - Mapping.csv diff --git a/opencolorio_config_aces/config/reference/generate/config.py b/opencolorio_config_aces/config/reference/generate/config.py index e136a8e4..5e2253dd 100644 --- a/opencolorio_config_aces/config/reference/generate/config.py +++ b/opencolorio_config_aces/config/reference/generate/config.py @@ -172,7 +172,7 @@ def version_config_mapping_file(path=PATH_TRANSFORMS_MAPPING_FILE_REFERENCE): '' """ - search = re.search(r"- (v\d\.\d\.\d) -", Path(path).stem) + search = re.search(r"- (v\d\.\d\.\d(-rc\d+)?) -", Path(path).stem) if search: return search.group(1) else: diff --git a/opencolorio_config_aces/config/reference/generate/resources/OpenColorIO-Config-ACES Reference Transforms - v0.2.0 - Reference Config - Mapping.csv b/opencolorio_config_aces/config/reference/generate/resources/OpenColorIO-Config-ACES Reference Transforms - v1.0.0-rc1 - Reference Config - Mapping.csv similarity index 100% rename from opencolorio_config_aces/config/reference/generate/resources/OpenColorIO-Config-ACES Reference Transforms - v0.2.0 - Reference Config - Mapping.csv rename to opencolorio_config_aces/config/reference/generate/resources/OpenColorIO-Config-ACES Reference Transforms - v1.0.0-rc1 - Reference Config - Mapping.csv diff --git a/opencolorio_config_aces/config/studio/generate/resources/OpenColorIO-Config-ACES CG and Studio Transforms - v0.2.0 - Studio Config - Mapping.csv b/opencolorio_config_aces/config/studio/generate/resources/OpenColorIO-Config-ACES CG and Studio Transforms - v1.0.0-rc1 - Studio Config - Mapping.csv similarity index 88% rename from opencolorio_config_aces/config/studio/generate/resources/OpenColorIO-Config-ACES CG and Studio Transforms - v0.2.0 - Studio Config - Mapping.csv rename to opencolorio_config_aces/config/studio/generate/resources/OpenColorIO-Config-ACES CG and Studio Transforms - v1.0.0-rc1 - Studio Config - Mapping.csv index 3e7398b8..161f5dfe 100644 --- a/opencolorio_config_aces/config/studio/generate/resources/OpenColorIO-Config-ACES CG and Studio Transforms - v0.2.0 - Studio Config - Mapping.csv +++ b/opencolorio_config_aces/config/studio/generate/resources/OpenColorIO-Config-ACES CG and Studio Transforms - v1.0.0-rc1 - Studio Config - Mapping.csv @@ -4,17 +4,18 @@ Ordering,Legacy Name,ACEStransformID,CLFtransformID,Interface,BuiltinTransform S 100,ACES - ACEScg,urn:ampas:aces:transformId:v1.5:ACEScsc.Academy.ACEScg_to_ACES.a1.0.3,,ColorSpace,ACEScg_to_ACES2065-1,"acescg,lin_ap1",scene-linear,ACES 200,Input - ADX - ADX10,urn:ampas:aces:transformId:v1.5:ACEScsc.Academy.ADX10_to_ACES.a1.0.3,,ColorSpace,ADX10_to_ACES2065-1,adx10,log,ACES 200,Input - ADX - ADX16,urn:ampas:aces:transformId:v1.5:ACEScsc.Academy.ADX16_to_ACES.a1.0.3,,ColorSpace,ADX16_to_ACES2065-1,adx16,log,ACES -203,Input - ARRI - Curve - V3 LogC (EI800),,,NamedTransform,,crv_logc3ei800,log,ARRI -203,Input - ARRI - Linear - ALEXA Wide Gamut,,,ColorSpace,,lin_awg,scene-linear,ARRI -203,Input - ARRI - V3 LogC (EI800) - Wide Gamut,urn:ampas:aces:transformId:v1.5:IDT.ARRI.Alexa-v3-logC-EI800.a1.v2,,ColorSpace,,logc3ei800_awg,log,ARRI -204,Input - ARRI - Curve - LogC4,,,NamedTransform,,crv_logc4,log, -204,Input - ARRI - Linear - ARRI Wide Gamut 4,,,ColorSpace,,lin_awg4,scene-linear, -204,Input - ARRI LogC4,,,ColorSpace,,logc4_awg4,log, +203,Input - ARRI - Curve - V3 LogC (EI800),,urn:aswf:ocio:transformId:1.0:ARRI:Input:ARRI_LogC3_Curve_EI800_to_Linear:1.0,NamedTransform,,crv_logc3ei800,log,ARRI +203,Input - ARRI - Linear - ALEXA Wide Gamut,,urn:aswf:ocio:transformId:1.0:ARRI:Input:Linear_ARRI_Wide_Gamut_3_to_ACES2065-1:1.0,ColorSpace,,lin_awg,scene-linear,ARRI +203,Input - ARRI - V3 LogC (EI800) - Wide Gamut,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_awg,log,ARRI +204,Input - ARRI - Curve - LogC4,,urn:aswf:ocio:transformId:1.0:ARRI:Input:ARRI_LogC4_Curve_to_Linear:1.0,NamedTransform,,crv_logc4,log, +204,Input - ARRI - Linear - ARRI Wide Gamut 4,,urn:aswf:ocio:transformId:1.0:ARRI:Input:Linear_ARRI_Wide_Gamut_4_to_ACES2065-1:1.0,ColorSpace,,lin_awg4,scene-linear, +204,Input - ARRI LogC4,,urn:aswf:ocio:transformId:1.0:ARRI:Input:ARRI_LogC4_to_ACES2065-1:1.0,ColorSpace,,logc4_awg4,log, 210,Input - Blackmagic - Curve - DaVinci Intermediate,,urn:aswf:ocio:transformId:1.0:BlackmagicDesign:Input:DaVinci_Intermediate_Log-Curve_to_Linear:1.0,NamedTransform,,crv_davinci_intermediate,log,Blackmagic 210,Input - Blackmagic - DaVinci Intermediate - DaVinci Wide Gamut,,urn:aswf:ocio:transformId:1.0:BlackmagicDesign:Input:DaVinci_Intermediate_WideGamut_to_ACES2065-1:1.0,ColorSpace,,davinci_intermediate_dwg,log,Blackmagic 210,Input - Blackmagic - Linear - DaVinci Wide Gamut,,urn:aswf:ocio:transformId:1.0:BlackmagicDesign:Input:Linear_DaVinci_WideGamut_to_ACES2065-1:1.0,ColorSpace,,lin_dwg,scene-linear,Blackmagic +210,Input - Canon - Canon-Log3 - Cinema Gamut Daylight,,urn:aswf:ocio:transformId:1.0:Canon:Input:CanonLog3_CinemaGamut-D55_to_ACES2065-1:1.0,ColorSpace,CANON_CLOG3-CGAMUT_to_ACES2065-1,clog3_cgamut,log,Canon 210,Input - Canon - Curve - Canon-Log3,,,NamedTransform,,crv_clog3,log,Canon -210,Input - Canon - Linear - Canon Cinema Gamut Daylight,,,ColorSpace,,lin_cgamut,scene-linear,Canon +210,Input - Canon - Linear - Canon Cinema Gamut Daylight,,urn:aswf:ocio:transformId:1.0:Canon:Input:Linear-CinemaGamut-D55_to_ACES2065-1:1.0,ColorSpace,,lin_cgamut,scene-linear,Canon 210,Input - Panasonic - Curve - V-Log,,urn:aswf:ocio:transformId:1.0:Panasonic:Input:VLog-Curve_to_Linear:1.0,NamedTransform,,crv_vlog,log,Panasonic 210,Input - Panasonic - Linear - V-Gamut,,urn:aswf:ocio:transformId:1.0:Panasonic:Input:Linear_VGamut_to_ACES2065-1:1.0,ColorSpace,,lin_vgamut,scene-linear,Panasonic 210,Input - Panasonic - V-Log - V-Gamut,,urn:aswf:ocio:transformId:1.0:Panasonic:Input:VLog_VGamut_to_ACES2065-1:1.0,ColorSpace,,vlog_vgamut,log,Panasonic