Skip to content

Commit 6f218c5

Browse files
KelSolaarKelSolaar
committed
Address various code review notes.
Signed-off-by: Thomas Mansencal <thomas.mansencal@gmail.com>
1 parent 94db866 commit 6f218c5

6 files changed

Lines changed: 50 additions & 83 deletions

File tree

‎opencolorio_config_aces/config/cg/generate/config.py‎

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,7 @@ def clf_transform_to_description(
198198
if describe != DescriptionStyle.NONE:
199199
description = []
200200

201-
if describe in (
202-
DescriptionStyle.OPENCOLORIO,
203-
DescriptionStyle.SHORT,
204-
DescriptionStyle.SHORT_UNION,
205-
):
201+
if describe in (DescriptionStyle.SHORT_UNION, DescriptionStyle.LONG_UNION):
206202
if clf_transform.description is not None:
207203
if direction.lower() == "forward":
208204
description.append(
@@ -214,27 +210,23 @@ def clf_transform_to_description(
214210
f"Convert {clf_transform.output_descriptor} "
215211
f"to {clf_transform.input_descriptor}"
216212
)
217-
elif describe in ( # noqa: SIM102
218-
DescriptionStyle.OPENCOLORIO,
219-
DescriptionStyle.LONG,
220-
DescriptionStyle.LONG_UNION,
221-
):
213+
elif describe in (DescriptionStyle.LONG_UNION,):
222214
if clf_transform.description is not None:
223215
description.append("\n" + clf_transform.description)
224216

225-
if len(description) > 0:
226-
description.append("")
217+
if len(description) > 0:
218+
description.append("")
227219

228-
description.append(
229-
TEMPLATE_CLF_TRANSFORM_ID.format(
230-
clf_transform.clf_transform_id.clf_transform_id
231-
),
232-
)
220+
description.append(
221+
TEMPLATE_CLF_TRANSFORM_ID.format(
222+
clf_transform.clf_transform_id.clf_transform_id
223+
),
224+
)
233225

234-
aces_transform_id = clf_transform.information.get("ACEStransformID")
235-
if aces_transform_id:
236-
aces_transform_id = aces_transform_id.aces_transform_id
237-
description.append(TEMPLATE_ACES_TRANSFORM_ID.format(aces_transform_id))
226+
aces_transform_id = clf_transform.information.get("ACEStransformID")
227+
if aces_transform_id:
228+
aces_transform_id = aces_transform_id.aces_transform_id
229+
description.append(TEMPLATE_ACES_TRANSFORM_ID.format(aces_transform_id))
238230

239231
description = "\n".join(description).strip()
240232

‎opencolorio_config_aces/config/cg/generate/resources/Loading... - CG Config - Mapping.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Ordering,Colorspace,Legacy,ACEStransformID,CLFtransformID,Interface,BuiltinTrans
66
400,Rec709-D65_100nit_in_Rec709-D65_sRGB-Piecewise,FALSE,urn:ampas:aces:transformId:v2.0:Output.Academy.Rec709-D65_100nit_in_Rec709-D65_sRGB-Piecewise.a2.v1,,ViewTransform,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-100nit-REC709_2.0,,sdr-video,file-io,srgb_rec709_display
77
405,Rec709-D65_100nit_in_Rec709-D65_Gamma2pt2,FALSE,urn:ampas:aces:transformId:v2.0:Output.Academy.Rec709-D65_100nit_in_Rec709-D65_Gamma2pt2.a2.v1,,ViewTransform,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-100nit-REC709_2.0,,sdr-video,file-io,g22_rec709_display
88
415,P3-D65_100nit_in_P3-D65_sRGB-Piecewise,FALSE,urn:ampas:aces:transformId:v2.0:Output.Academy.P3-D65_100nit_in_P3-D65_sRGB-Piecewise.a2.v1,,ViewTransform,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-100nit-P3-D65_2.0,,sdr-video,file-io,srgb_p3d65_display
9-
420,P3-D65_1000nit_in_P3-D65_sRGB-Piecewise,FALSE,urn:ampas:aces:transformId:v2.0:Output.Academy.P3-D65_1000nit_in_P3-D65_sRGB-Piecewise.a2.v1,,ViewTransform,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - HDR-1000nit-P3-D65_2.0,,xdr-video,file-io,srgbx_p3d65_display
9+
420,P3-D65_1000nit_in_P3-D65_sRGB-Piecewise,FALSE,urn:ampas:aces:transformId:v2.0:Output.Academy.P3-D65_1000nit_in_P3-D65_sRGB-Piecewise.a2.v1,,ViewTransform,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - HDR-1000nit-P3-D65_2.0,,edr-video,file-io,srgbx_p3d65_display
1010
430,P3-D65_48nit_in_P3-D65_Gamma2pt6,FALSE,urn:ampas:aces:transformId:v2.0:Output.Academy.P3-D65_48nit_in_P3-D65_Gamma2pt6.a2.v1,,ViewTransform,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-100nit-P3-D65_2.0,,sdr-video,file-io,g26_p3d65_display
1111
440,Rec709-D65_100nit_in_Rec709-D65_BT1886,FALSE,urn:ampas:aces:transformId:v2.0:Output.Academy.Rec709-D65_100nit_in_Rec709-D65_BT1886.a2.v1,,ViewTransform,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-100nit-REC709_2.0,,sdr-video,file-io,g24_rec709_display
1212
440,sRGB - Curve,TRUE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:Linear_to_sRGB-Curve:1.0,NamedTransform,,"crv_srgb,Utility - Curve - sRGB",sdr-video,file-io,

‎opencolorio_config_aces/config/generation/beautifiers.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@
173173

174174
PATTERNS_DISPLAY_NAME: dict[str, str] = {
175175
"G2.6-": "",
176+
"G2.2": "Gamma 2.2",
176177
"-BFD": "",
177178
"DisplayP3": "Display P3",
178179
"REC.1886": "Rec.1886",

‎opencolorio_config_aces/config/reference/generate/config.py‎

Lines changed: 25 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -340,9 +340,7 @@ def ctl_transform_to_description(
340340
description = None
341341
if describe != DescriptionStyle.NONE:
342342
description = []
343-
344343
if describe in (
345-
DescriptionStyle.OPENCOLORIO,
346344
DescriptionStyle.SHORT_UNION,
347345
DescriptionStyle.LONG_UNION,
348346
):
@@ -357,37 +355,28 @@ def ctl_transform_to_description(
357355
"inverse_transform",
358356
]
359357
)
358+
360359
transforms = [
361360
transform
362361
for transform in (kwargs.get(forward), kwargs.get(inverse))
363362
if transform is not None
364363
]
364+
365365
transform = produce_transform(next(iter(transforms), None))
366+
366367
if isinstance(transform, ocio.BuiltinTransform):
367368
description.append(transform.getDescription())
368369

369-
if describe in (
370-
DescriptionStyle.ACES,
371-
DescriptionStyle.ACES | DescriptionStyle.SHORT,
372-
DescriptionStyle.SHORT_UNION,
373-
DescriptionStyle.LONG_UNION,
374-
):
370+
if describe in (DescriptionStyle.LONG_UNION,):
375371
if len(description) > 0:
376372
description.append("")
377373

378374
aces_transform_id = ctl_transform.aces_transform_id.aces_transform_id
379375

380-
if describe in (
381-
DescriptionStyle.ACES,
382-
DescriptionStyle.ACES | DescriptionStyle.SHORT,
383-
DescriptionStyle.SHORT_UNION,
384-
):
385-
description.append(TEMPLATE_ACES_TRANSFORM_ID.format(aces_transform_id))
386-
else:
387-
description.append("CTL Transform")
388-
description.append(f'{"=" * len(description[-1])}\n')
389-
description.append(f"{ctl_transform.description}\n")
390-
description.append(TEMPLATE_ACES_TRANSFORM_ID.format(aces_transform_id))
376+
description.append("CTL Transform")
377+
description.append(f'{"=" * len(description[-1])}\n')
378+
description.append(f"{ctl_transform.description}\n")
379+
description.append(TEMPLATE_ACES_TRANSFORM_ID.format(aces_transform_id))
391380

392381
description = "\n".join(description)
393382

@@ -571,18 +560,12 @@ class instances corresponding to the given style.
571560
description = []
572561

573562
if describe in (
574-
DescriptionStyle.OPENCOLORIO,
575563
DescriptionStyle.SHORT_UNION,
576564
DescriptionStyle.LONG_UNION,
577565
):
578566
description.append(builtin_transform.getDescription())
579567

580-
if describe in (
581-
DescriptionStyle.ACES,
582-
DescriptionStyle.ACES | DescriptionStyle.SHORT,
583-
DescriptionStyle.SHORT_UNION,
584-
DescriptionStyle.LONG_UNION,
585-
):
568+
if describe in (DescriptionStyle.LONG_UNION,):
586569
aces_transform_ids, aces_descriptions = zip(
587570
*[
588571
(
@@ -596,33 +579,22 @@ class instances corresponding to the given style.
596579
if len(description) > 0:
597580
description.append("")
598581

599-
if describe in (
600-
DescriptionStyle.ACES | DescriptionStyle.SHORT,
601-
DescriptionStyle.SHORT_UNION,
602-
):
603-
description.extend(
582+
description.append(
583+
f'CTL Transform{"s" if len(aces_transform_ids) >= 2 else ""}'
584+
)
585+
description.append(f'{"=" * len(description[-1])}\n')
586+
587+
description.append(
588+
f'\n{"-" * 80}\n\n'.join(
604589
[
605-
f"ACEStransformID: {aces_transform_id}"
606-
for aces_transform_id in aces_transform_ids
590+
(
591+
f"{aces_descriptions[i]}\n\n"
592+
f"ACEStransformID: {aces_transform_id}\n"
593+
)
594+
for i, aces_transform_id in enumerate(aces_transform_ids)
607595
]
608596
)
609-
else:
610-
description.append(
611-
f'CTL Transform{"s" if len(aces_transform_ids) >= 2 else ""}'
612-
)
613-
description.append(f'{"=" * len(description[-1])}\n')
614-
615-
description.append(
616-
f'\n{"-" * 80}\n\n'.join(
617-
[
618-
(
619-
f"{aces_descriptions[i]}\n\n"
620-
f"ACEStransformID: {aces_transform_id}\n"
621-
)
622-
for i, aces_transform_id in enumerate(aces_transform_ids)
623-
]
624-
)
625-
)
597+
)
626598

627599
description = "\n".join(description)
628600

@@ -697,7 +669,6 @@ def style_to_display_colorspace(
697669
description = []
698670

699671
if describe in (
700-
DescriptionStyle.OPENCOLORIO,
701672
DescriptionStyle.SHORT_UNION,
702673
DescriptionStyle.LONG_UNION,
703674
):
@@ -754,6 +725,9 @@ def transform_data_aliases(transform_data: dict[str, Any]) -> list[str]:
754725
if not aliases:
755726
aliases = []
756727

728+
if (interop_id := transform_data.get("interop_id")) is not None:
729+
aliases.append(interop_id)
730+
757731
if as_bool(transform_data["legacy"]):
758732
return [transform_data["colorspace"], *aliases]
759733
else:

‎opencolorio_config_aces/config/reference/generate/resources/Loading... - Reference Config - Mapping.csv‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Ordering,ACEStransformID,Colorspace,Legacy,BuiltinTransform Style,Linked DisplayColorSpace Style,Interface,Encoding,Categories,Aliases,InteropId
2-
100,urn:ampas:aces:transformId:v2.0:CSC.Academy.ACEScc_to_ACES.a2.v1,ACES - ACEScc,TRUE,ACEScc_to_ACES2065-1,,ColorSpace,log,file-io,"acescc,acescc_ap1",acescc_ap1_scene
2+
100,urn:ampas:aces:transformId:v2.0:CSC.Academy.ACEScc_to_ACES.a2.v1,ACES - ACEScc,TRUE,ACEScc_to_ACES2065-1,,ColorSpace,log,file-io,"acescc,acescc_ap1",ocio:acescc_ap1_scene
33
100,urn:ampas:aces:transformId:v2.0:CSC.Academy.ACEScct_to_ACES.a2.v1,ACES - ACEScct,TRUE,ACEScct_to_ACES2065-1,,ColorSpace,log,"file-io,working-space","acescct,acescct_ap1",ocio:acescct_ap1_scene
44
100,urn:ampas:aces:transformId:v2.0:CSC.Academy.ACEScg_to_ACES.a2.v1,ACES - ACEScg,TRUE,ACEScg_to_ACES2065-1,,ColorSpace,scene-linear,"file-io,working-space,texture","acescg,lin_ap1,lin_ap1_scene,ACES - ACEScg",lin_ap1_scene
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,ocio:adx10_apd_scene
@@ -22,10 +22,10 @@ Ordering,ACEStransformID,Colorspace,Legacy,BuiltinTransform Style,Linked Display
2222
411,urn:ampas:aces:transformId:v2.0:Output.Academy.P3-D60_48nit_in_XYZ-E_Gamma2pt6.a2.v1,,FALSE,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-100nit-P3-D60-in-XYZ-E_2.0,DISPLAY - CIE-XYZ-D65_to_DCDM-D65,ViewTransform,sdr-video,file-io,,g26_xyzd65_display
2323
415,urn:ampas:aces:transformId:v2.0:Output.Academy.P3-D65_100nit_in_P3-D65_sRGB-Piecewise.a2.v1,,FALSE,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-100nit-P3-D65_2.0,DISPLAY - CIE-XYZ-D65_to_DisplayP3,ViewTransform,sdr-video,file-io,,srgb_p3d65_display
2424
416,urn:ampas:aces:transformId:v2.0:Output.Academy.P3-D60_100nit_in_P3-D65_sRGB-Piecewise.a2.v1,,FALSE,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-100nit-P3-D60-in-P3-D65_2.0,DISPLAY - CIE-XYZ-D65_to_DisplayP3,ViewTransform,sdr-video,file-io,,srgb_p3d65_display
25-
420,urn:ampas:aces:transformId:v2.0:Output.Academy.P3-D65_1000nit_in_P3-D65_sRGB-Piecewise.a2.v1,,FALSE,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - HDR-1000nit-P3-D65_2.0,DISPLAY - CIE-XYZ-D65_to_DisplayP3-HDR,ViewTransform,hdr-video,file-io,,srgbx_p3d65_display
26-
421,urn:ampas:aces:transformId:v2.0:Output.Academy.P3-D60_1000nit_in_P3-D65_sRGB-Piecewise.a2.v1,,FALSE,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - HDR-1000nit-P3-D60-in-P3-D65_2.0,DISPLAY - CIE-XYZ-D65_to_DisplayP3-HDR,ViewTransform,hdr-video,file-io,,srgbx_p3d65_display
27-
422,urn:ampas:aces:transformId:v2.0:Output.Academy.Rec709-D65_100nit_in_P3-D65_sRGB-Piecewise.a2.v1,,FALSE,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-100nit-REC709_2.0,DISPLAY - CIE-XYZ-D65_to_DisplayP3-HDR,ViewTransform,hdr-video,file-io,,srgb_p3d65_display
28-
423,urn:ampas:aces:transformId:v2.0:Output.Academy.Rec709-D60_100nit_in_P3-D65_sRGB-Piecewise.a2.v1,,FALSE,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-100nit-REC709-D60-in-P3-D65_2.0,DISPLAY - CIE-XYZ-D65_to_DisplayP3-HDR,ViewTransform,hdr-video,file-io,,srgb_p3d65_display
25+
420,urn:ampas:aces:transformId:v2.0:Output.Academy.P3-D65_1000nit_in_P3-D65_sRGB-Piecewise.a2.v1,,FALSE,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - HDR-1000nit-P3-D65_2.0,DISPLAY - CIE-XYZ-D65_to_DisplayP3-HDR,ViewTransform,edr-video,file-io,,srgbx_p3d65_display
26+
421,urn:ampas:aces:transformId:v2.0:Output.Academy.P3-D60_1000nit_in_P3-D65_sRGB-Piecewise.a2.v1,,FALSE,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - HDR-1000nit-P3-D60-in-P3-D65_2.0,DISPLAY - CIE-XYZ-D65_to_DisplayP3-HDR,ViewTransform,edr-video,file-io,,srgbx_p3d65_display
27+
422,urn:ampas:aces:transformId:v2.0:Output.Academy.Rec709-D65_100nit_in_P3-D65_sRGB-Piecewise.a2.v1,,FALSE,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-100nit-REC709_2.0,DISPLAY - CIE-XYZ-D65_to_DisplayP3-HDR,ViewTransform,edr-video,file-io,,srgb_p3d65_display
28+
423,urn:ampas:aces:transformId:v2.0:Output.Academy.Rec709-D60_100nit_in_P3-D65_sRGB-Piecewise.a2.v1,,FALSE,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-100nit-REC709-D60-in-P3-D65_2.0,DISPLAY - CIE-XYZ-D65_to_DisplayP3-HDR,ViewTransform,edr-video,file-io,,srgb_p3d65_display
2929
430,urn:ampas:aces:transformId:v2.0:Output.Academy.P3-D65_48nit_in_P3-D65_Gamma2pt6.a2.v1,,FALSE,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-100nit-P3-D65_2.0,DISPLAY - CIE-XYZ-D65_to_G2.6-P3-D65 - MIRROR NEGS,ViewTransform,sdr-video,file-io,,g26_p3d65_display
3030
431,urn:ampas:aces:transformId:v2.0:Output.Academy.P3-D60_48nit_in_P3-D65_Gamma2pt6.a2.v1,,FALSE,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-100nit-P3-D60-in-P3-D65_2.0,DISPLAY - CIE-XYZ-D65_to_G2.6-P3-D65 - MIRROR NEGS,ViewTransform,sdr-video,file-io,,g26_p3d65_display
3131
435,urn:ampas:aces:transformId:v2.0:Output.Academy.Rec709-D65_48nit_in_P3-D65_Gamma2pt6.a2.v1,,FALSE,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-100nit-REC709_2.0,DISPLAY - CIE-XYZ-D65_to_G2.6-P3-D65 - MIRROR NEGS,ViewTransform,sdr-video,file-io,,g26_p3d65_display

0 commit comments

Comments
 (0)
⚡