Skip to content

Commit 08b0a9e

Browse files
KelSolaarKelSolaar
authored
PR: Last Stretch for RC2 (#80)
* Add "opencolorio_config_aces.utilities.ROOT_BUILD_DEFAULT" attribute. Signed-off-by: Thomas Mansencal <[email protected]> * Include "Blackmagic Film (Gen 5)" and related colorspaces. Signed-off-by: Thomas Mansencal <[email protected]> * Rename "Linear Rec.709" colorspace to "Linear Rec.709 (sRGB)". Signed-off-by: Thomas Mansencal <[email protected]> * Drop "Video" affixe from display spaces. Signed-off-by: Thomas Mansencal <[email protected]> * Add "Un-tone-mapped" to active views. Signed-off-by: Thomas Mansencal <[email protected]> * Fix default role in "CG" config. Signed-off-by: Thomas Mansencal <[email protected]> * Fix incorrect "Studio" config description. Signed-off-by: Thomas Mansencal <[email protected]> * Add missing categories to "ACES2065-1" colorspace. Signed-off-by: Thomas Mansencal <[email protected]> * Update "CG" and "Reference" CSV mapping files. Signed-off-by: Thomas Mansencal <[email protected]> * Remove "(SUP v3)" from various "CLF" transforms. Signed-off-by: Thomas Mansencal <[email protected]> * Remove "Default" role. Signed-off-by: Thomas Mansencal <[email protected]> * Set "Color Picking" role to "sRGB - Texture". Signed-off-by: Thomas Mansencal <[email protected]> * Optionally drop "OCIO" from family name. Signed-off-by: Thomas Mansencal <[email protected]> * Re-order "Raw" colorspace for aesthetics. Signed-off-by: Thomas Mansencal <[email protected]> * Move "Linear to Rec.709" to "ITU" namespace. Signed-off-by: Thomas Mansencal <[email protected]> * Add display colorspaces to inactive colorspaces. Signed-off-by: Thomas Mansencal <[email protected]> * Inverse "NamedTransform" direction. Signed-off-by: Thomas Mansencal <[email protected]> * Swap "Texture" and "Matte Paint" roles. Signed-off-by: Thomas Mansencal <[email protected]> * Raise package version to 1.0.0-rc2. Signed-off-by: Thomas Mansencal <[email protected]> Signed-off-by: Thomas Mansencal <[email protected]>
1 parent 1bcc00a commit 08b0a9e

25 files changed

+230
-216
lines changed

‎docs/opencolorio_config_aces.utilities.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Common
1515
.. autosummary::
1616
:toctree: generated/
1717

18+
ROOT_BUILD_DEFAULT
1819
DocstringDict
1920
first_item
2021
common_ancestor

‎opencolorio_config_aces/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131

132132
__major_version__ = "1"
133133
__minor_version__ = "0"
134-
__change_version__ = "0-rc1"
134+
__change_version__ = "0-rc2"
135135
__version__ = ".".join(
136136
(__major_version__, __minor_version__, __change_version__)
137137
)

‎opencolorio_config_aces/clf/transforms/itu/generate.py‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,18 @@ def generate_clf_transforms_itu(output_directory):
7373
"Rec.709 camera OETF Rec.709 primaries, D65 white point",
7474
)
7575

76+
name = "Linear_to_Rec709-Curve"
77+
clf_transform_id = format_clf_transform_id(FAMILY, GENUS, name, VERSION)
78+
filename = output_directory / clf_basename(clf_transform_id)
79+
clf_transforms[filename] = generate_clf_transform(
80+
filename,
81+
[gamma_transform("Rec709")],
82+
clf_transform_id,
83+
"Linear to Rec.709",
84+
"generic linear RGB",
85+
"generic gamma-corrected RGB",
86+
)
87+
7688
return clf_transforms
7789

7890

opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.Rec709-Curve.clf renamed to opencolorio_config_aces/clf/transforms/itu/utility/ITU.Utility.Rec709-Curve.clf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:OCIO:Utility:Linear_to_Rec709-Curve:1.0" name="Linear to Rec.709">
2+
<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:ITU:Utility:Linear_to_Rec709-Curve:1.0" name="Linear to Rec.709">
33
<InputDescriptor>generic linear RGB</InputDescriptor>
44
<OutputDescriptor>generic gamma-corrected RGB</OutputDescriptor>
55
<Exponent inBitDepth="32f" outBitDepth="32f" style="monCurveRev">

‎opencolorio_config_aces/clf/transforms/ocio/generate.py‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -82,18 +82,6 @@ def generate_clf_transforms_ocio(output_directory):
8282
"generic gamma-corrected RGB",
8383
)
8484

85-
name = "Linear_to_Rec709-Curve"
86-
clf_transform_id = format_clf_transform_id(FAMILY, GENUS, name, VERSION)
87-
filename = output_directory / clf_basename(clf_transform_id)
88-
clf_transforms[filename] = generate_clf_transform(
89-
filename,
90-
[gamma_transform("Rec709")],
91-
clf_transform_id,
92-
"Linear to Rec.709",
93-
"generic linear RGB",
94-
"generic gamma-corrected RGB",
95-
)
96-
9785
name = "Linear_to_ST2084-Curve"
9886
clf_transform_id = format_clf_transform_id(FAMILY, GENUS, name, VERSION)
9987
filename = output_directory / clf_basename(clf_transform_id)
@@ -139,7 +127,7 @@ def generate_clf_transforms_ocio(output_directory):
139127
filename,
140128
[matrix_RGB_to_RGB_transform("ACES2065-1", "ITU-R BT.709")],
141129
clf_transform_id,
142-
"AP0 to Linear Rec.709",
130+
"AP0 to Linear Rec.709 (sRGB)",
143131
"ACES2065-1",
144132
"linear Rec.709 primaries, D65 white point",
145133
)

‎opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Linear_Rec709.clf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Linear_Rec709:1.0" name="AP0 to Linear Rec.709">
2+
<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Linear_Rec709:1.0" name="AP0 to Linear Rec.709 (sRGB)">
33
<InputDescriptor>ACES2065-1</InputDescriptor>
44
<OutputDescriptor>linear Rec.709 primaries, D65 white point</OutputDescriptor>
55
<Matrix inBitDepth="32f" outBitDepth="32f">

‎opencolorio_config_aces/clf/transforms/panasonic/generate.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def generate_clf_transforms_panasonic(output_directory):
112112
# Generate full transform.
113113

114114
name = "VLog_VGamut_to_ACES2065-1"
115-
input_descriptor = "Panasonic V-Log - V-Gamut (SUP v3)"
115+
input_descriptor = "Panasonic V-Log - V-Gamut"
116116
output_descriptor = "ACES2065-1"
117117
clf_transform_id = format_clf_transform_id(FAMILY, GENUS, name, VERSION)
118118
filename = output_directory / clf_basename(clf_transform_id)
@@ -129,7 +129,7 @@ def generate_clf_transforms_panasonic(output_directory):
129129
# Generate transform for primaries only.
130130

131131
name = "Linear_VGamut_to_ACES2065-1"
132-
input_descriptor = "Linear Panasonic V-Gamut (SUP v3)"
132+
input_descriptor = "Linear Panasonic V-Gamut"
133133
output_descriptor = "ACES2065-1"
134134
clf_transform_id = format_clf_transform_id(FAMILY, GENUS, name, VERSION)
135135
filename = output_directory / clf_basename(clf_transform_id)
@@ -144,8 +144,8 @@ def generate_clf_transforms_panasonic(output_directory):
144144

145145
# Generate `NamedTransform` for log curve only.
146146
name = "VLog-Curve_to_Linear"
147-
input_descriptor = "Panasonic V-Log (SUP v3) Log (arbitrary primaries)"
148-
output_descriptor = "Panasonic V-Log (SUP v3) Linear (arbitrary primaries)"
147+
input_descriptor = "Panasonic V-Log Log (arbitrary primaries)"
148+
output_descriptor = "Panasonic V-Log Linear (arbitrary primaries)"
149149
clf_transform_id = format_clf_transform_id(FAMILY, GENUS, name, VERSION)
150150
filename = output_directory / clf_basename(clf_transform_id)
151151
clf_transforms[filename] = generate_clf_transform(

‎opencolorio_config_aces/clf/transforms/panasonic/input/Panasonic.Input.Linear_VGamut_to_ACES2065-1.clf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:Panasonic:Input:Linear_VGamut_to_ACES2065-1:1.0" name="Linear Panasonic V-Gamut (SUP v3) to ACES2065-1">
3-
<InputDescriptor>Linear Panasonic V-Gamut (SUP v3)</InputDescriptor>
2+
<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:Panasonic:Input:Linear_VGamut_to_ACES2065-1:1.0" name="Linear Panasonic V-Gamut to ACES2065-1">
3+
<InputDescriptor>Linear Panasonic V-Gamut</InputDescriptor>
44
<OutputDescriptor>ACES2065-1</OutputDescriptor>
55
<Matrix inBitDepth="32f" outBitDepth="32f">
66
<Array dim="3 3">

‎opencolorio_config_aces/clf/transforms/panasonic/input/Panasonic.Input.VLog-Curve.clf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:Panasonic:Input:VLog-Curve_to_Linear:1.0" name="Panasonic V-Log (SUP v3) Log to Linear Curve">
3-
<InputDescriptor>Panasonic V-Log (SUP v3) Log (arbitrary primaries)</InputDescriptor>
4-
<OutputDescriptor>Panasonic V-Log (SUP v3) Linear (arbitrary primaries)</OutputDescriptor>
2+
<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:Panasonic:Input:VLog-Curve_to_Linear:1.0" name="Panasonic V-Log Log to Linear Curve">
3+
<InputDescriptor>Panasonic V-Log Log (arbitrary primaries)</InputDescriptor>
4+
<OutputDescriptor>Panasonic V-Log Linear (arbitrary primaries)</OutputDescriptor>
55
<Log inBitDepth="32f" outBitDepth="32f" style="cameraLogToLin">
66
<LogParams base="10" linSideSlope="1" linSideOffset="0.00873" logSideSlope="0.241514" logSideOffset="0.598206" linSideBreak="0.01" />
77
</Log>

‎opencolorio_config_aces/clf/transforms/panasonic/input/Panasonic.Input.VLog_VGamut_to_ACES2065-1.clf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:Panasonic:Input:VLog_VGamut_to_ACES2065-1:1.0" name="Panasonic V-Log - V-Gamut (SUP v3) to ACES2065-1">
3-
<InputDescriptor>Panasonic V-Log - V-Gamut (SUP v3)</InputDescriptor>
2+
<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:Panasonic:Input:VLog_VGamut_to_ACES2065-1:1.0" name="Panasonic V-Log - V-Gamut to ACES2065-1">
3+
<InputDescriptor>Panasonic V-Log - V-Gamut</InputDescriptor>
44
<OutputDescriptor>ACES2065-1</OutputDescriptor>
55
<Info>
66
<ACEStransformID>urn:ampas:aces:transformId:v1.5:ACEScsc.Academy.VLog_VGamut_to_ACES.a1.1.0</ACEStransformID>

0 commit comments

Comments
 (0)