Skip to content

Commit 9c764b4

Browse files
KelSolaarKelSolaar
authored
PR: ACES 1.x Varnishing (#132)
* Implement various aliasing and naming updates. Signed-off-by: Thomas Mansencal <[email protected]> * Insert the *Un-tone-mapped* view transform at the beginning of the view transforms list for *OpenColorIO* profile lesser or equal to 2.3. Signed-off-by: Thomas Mansencal <[email protected]> * Update various colourspace names according to latest *ASWF Color Interop Forum* recommendations. Signed-off-by: Thomas Mansencal <[email protected]> * Address code review notes. Signed-off-by: Thomas Mansencal <[email protected]> * Re-order various *Colorspace*s and *NamedTransform*s. Signed-off-by: Thomas Mansencal <[email protected]> --------- Signed-off-by: Thomas Mansencal <[email protected]>
1 parent bc2614e commit 9c764b4

16 files changed

+103
-74
lines changed

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ def generate_clf_transforms_ocio(output_directory):
100100
style=style,
101101
)
102102

103-
name = "AP0_to_CIE-XYZ-D65-Scene-referred"
103+
name = "AP0_to_CIE_XYZ-D65-Scene-referred"
104104
clf_transform_id = format_clf_transform_id(FAMILY, GENUS, name, VERSION)
105105
filename = output_directory / clf_basename(clf_transform_id)
106106
M_ACES = colour.RGB_COLOURSPACES["ACES2065-1"].matrix_RGB_to_XYZ
@@ -118,7 +118,7 @@ def generate_clf_transforms_ocio(output_directory):
118118
filename,
119119
[matrix_transform(M_XYZ)],
120120
clf_transform_id,
121-
"AP0 to CIE-XYZ-D65",
121+
"AP0 to CIE XYZ-D65",
122122
"ACES2065-1",
123123
"CIE XYZ, D65 white point",
124124
)
@@ -171,7 +171,7 @@ def generate_clf_transforms_ocio(output_directory):
171171
"linear Adobe RGB (1998) primaries, D65 white point",
172172
)
173173

174-
name = "AP0_to_sRGB-Scene-referred"
174+
name = "AP0_to_sRGB-Encoded-Rec709"
175175
clf_transform_id = format_clf_transform_id(FAMILY, GENUS, name, VERSION)
176176
filename = output_directory / clf_basename(clf_transform_id)
177177
clf_transforms[filename] = generate_clf_transform(
@@ -181,12 +181,12 @@ def generate_clf_transforms_ocio(output_directory):
181181
gamma_transform("sRGB"),
182182
],
183183
clf_transform_id,
184-
"AP0 to sRGB Rec.709",
184+
"AP0 to sRGB Encoded Rec.709 (sRGB)",
185185
"ACES2065-1",
186186
"sRGB",
187187
)
188188

189-
name = "AP0_to_Gamma1.8_Rec709-Scene-referred"
189+
name = "AP0_to_Gamma1.8_Encoded_Rec709"
190190
clf_transform_id = format_clf_transform_id(FAMILY, GENUS, name, VERSION)
191191
filename = output_directory / clf_basename(clf_transform_id)
192192
clf_transforms[filename] = generate_clf_transform(
@@ -196,12 +196,12 @@ def generate_clf_transforms_ocio(output_directory):
196196
gamma_transform(1.8),
197197
],
198198
clf_transform_id,
199-
"AP0 to Gamma 1.8 Rec.709 - Scene-referred",
199+
"AP0 to Gamma 1.8 Encoded Rec.709",
200200
"ACES2065-1",
201201
"1.8 gamma-corrected Rec.709 primaries, D65 white point",
202202
)
203203

204-
name = "AP0_to_Gamma2.2_Rec709-Scene-referred"
204+
name = "AP0_to_Gamma2.2_Encoded_Rec709"
205205
clf_transform_id = format_clf_transform_id(FAMILY, GENUS, name, VERSION)
206206
filename = output_directory / clf_basename(clf_transform_id)
207207
clf_transforms[filename] = generate_clf_transform(
@@ -211,12 +211,12 @@ def generate_clf_transforms_ocio(output_directory):
211211
gamma_transform(2.2),
212212
],
213213
clf_transform_id,
214-
"AP0 to Gamma 2.2 Rec.709 - Scene-referred",
214+
"AP0 to Gamma 2.2 Encoded Rec.709",
215215
"ACES2065-1",
216216
"2.2 gamma-corrected Rec.709 primaries, D65 white point",
217217
)
218218

219-
name = "AP0_to_Gamma2.4_Rec709-Scene-referred"
219+
name = "AP0_to_Gamma2.4_Encoded_Rec709"
220220
clf_transform_id = format_clf_transform_id(FAMILY, GENUS, name, VERSION)
221221
filename = output_directory / clf_basename(clf_transform_id)
222222
clf_transforms[filename] = generate_clf_transform(
@@ -226,12 +226,12 @@ def generate_clf_transforms_ocio(output_directory):
226226
gamma_transform(2.4),
227227
],
228228
clf_transform_id,
229-
"AP0 to Gamma 2.4 Rec.709 - Scene-referred",
229+
"AP0 to Gamma 2.4 Encoded Rec.709",
230230
"ACES2065-1",
231231
"2.4 gamma-corrected Rec.709 primaries, D65 white point",
232232
)
233233

234-
name = "AP0_to_Gamma2.2_AP1-Scene-referred"
234+
name = "AP0_to_Gamma2.2_Encoded_AP1"
235235
clf_transform_id = format_clf_transform_id(FAMILY, GENUS, name, VERSION)
236236
filename = output_directory / clf_basename(clf_transform_id)
237237
clf_transforms[filename] = generate_clf_transform(
@@ -241,12 +241,12 @@ def generate_clf_transforms_ocio(output_directory):
241241
gamma_transform(2.2),
242242
],
243243
clf_transform_id,
244-
"AP0 to Gamma 2.2 AP1 - Scene-referred",
244+
"AP0 to Gamma 2.2 Encoded AP1",
245245
"ACES2065-1",
246246
"2.2 gamma-corrected AP1 primaries, ACES ~=D60 white point",
247247
)
248248

249-
name = "AP0_to_sRGB_Encoded_AP1-Scene-referred"
249+
name = "AP0_to_sRGB_Encoded_AP1"
250250
clf_transform_id = format_clf_transform_id(FAMILY, GENUS, name, VERSION)
251251
filename = output_directory / clf_basename(clf_transform_id)
252252
clf_transforms[filename] = generate_clf_transform(
@@ -256,27 +256,27 @@ def generate_clf_transforms_ocio(output_directory):
256256
gamma_transform("sRGB"),
257257
],
258258
clf_transform_id,
259-
"AP0 to sRGB Encoded AP1 - Scene-referred",
259+
"AP0 to sRGB Encoded AP1",
260260
"ACES2065-1",
261261
"sRGB Encoded AP1 primaries, ACES ~=D60 white point",
262262
)
263263

264-
name = "AP0_to_sRGB_Encoded_P3-D65-Scene-referred"
264+
name = "AP0_to_sRGB_Encoded_P3-D65"
265265
clf_transform_id = format_clf_transform_id(FAMILY, GENUS, name, VERSION)
266266
filename = output_directory / clf_basename(clf_transform_id)
267267
clf_transforms[filename] = generate_clf_transform(
268268
filename,
269269
[
270-
matrix_RGB_to_RGB_transform("ACES2065-1", "P3-D65"),
270+
matrix_RGB_to_RGB_transform("ACES2065-1", "Display P3"),
271271
gamma_transform("sRGB"),
272272
],
273273
clf_transform_id,
274-
"AP0 to sRGB Encoded P3-D65 - Scene-referred",
274+
"AP0 to sRGB Encoded P3-D65",
275275
"ACES2065-1",
276276
"sRGB Encoded P3-D65 primaries, D65 white point",
277277
)
278278

279-
name = "AP0_to_AdobeRGB-Scene-referred"
279+
name = "AP0_to_Gamma2.2_Encoded_AdobeRGB"
280280
clf_transform_id = format_clf_transform_id(FAMILY, GENUS, name, VERSION)
281281
filename = output_directory / clf_basename(clf_transform_id)
282282
clf_transforms[filename] = generate_clf_transform(
@@ -286,9 +286,9 @@ def generate_clf_transforms_ocio(output_directory):
286286
gamma_transform(563 / 256),
287287
],
288288
clf_transform_id,
289-
"AP0 to Adobe RGB (1998) - Scene-referred",
289+
"AP0 to Gamma 2.2 Encoded AdobeRGB",
290290
"ACES2065-1",
291-
"Adobe RGB (1998) primaries, D65 white point",
291+
"2.2 gamma-corrected AdobeRGB primaries, D65 white point",
292292
)
293293

294294
return clf_transforms

opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_CIE-XYZ-D65-Scene-referred.clf renamed to opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_CIE_XYZ-D65-Scene-referred.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_CIE-XYZ-D65-Scene-referred:1.0" name="AP0 to CIE-XYZ-D65">
2+
<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_CIE_XYZ-D65-Scene-referred:1.0" name="AP0 to CIE XYZ-D65">
33
<InputDescriptor>ACES2065-1</InputDescriptor>
44
<OutputDescriptor>CIE XYZ, D65 white point</OutputDescriptor>
55
<Matrix inBitDepth="32f" outBitDepth="32f">

opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Gamma1.8_Rec709-Scene-referred.clf renamed to opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Gamma1.8_Encoded_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_Gamma1.8_Rec709-Scene-referred:1.0" name="AP0 to Gamma 1.8 Rec.709 - Scene-referred">
2+
<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma1.8_Encoded_Rec709:1.0" name="AP0 to Gamma 1.8 Encoded Rec.709">
33
<InputDescriptor>ACES2065-1</InputDescriptor>
44
<OutputDescriptor>1.8 gamma-corrected Rec.709 primaries, D65 white point</OutputDescriptor>
55
<Matrix inBitDepth="32f" outBitDepth="32f">

opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Gamma2.2_AP1-Scene-referred.clf renamed to opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Gamma2.2_Encoded_AP1.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_Gamma2.2_AP1-Scene-referred:1.0" name="AP0 to Gamma 2.2 AP1 - Scene-referred">
2+
<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.2_Encoded_AP1:1.0" name="AP0 to Gamma 2.2 Encoded AP1">
33
<InputDescriptor>ACES2065-1</InputDescriptor>
44
<OutputDescriptor>2.2 gamma-corrected AP1 primaries, ACES ~=D60 white point</OutputDescriptor>
55
<Matrix inBitDepth="32f" outBitDepth="32f">

opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_AdobeRGB-Scene-referred.clf renamed to opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Gamma2.2_Encoded_AdobeRGB.clf

Lines changed: 2 additions & 2 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:OCIO:Utility:AP0_to_AdobeRGB-Scene-referred:1.0" name="AP0 to Adobe RGB (1998) - Scene-referred">
2+
<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.2_Encoded_AdobeRGB:1.0" name="AP0 to Gamma 2.2 Encoded AdobeRGB">
33
<InputDescriptor>ACES2065-1</InputDescriptor>
4-
<OutputDescriptor>Adobe RGB (1998) primaries, D65 white point</OutputDescriptor>
4+
<OutputDescriptor>2.2 gamma-corrected AdobeRGB primaries, D65 white point</OutputDescriptor>
55
<Matrix inBitDepth="32f" outBitDepth="32f">
66
<Array dim="3 3">
77
1.72456031681181 -0.419993594161504 -0.304566722650304

opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Gamma2.2_Rec709-Scene-referred.clf renamed to opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Gamma2.2_Encoded_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_Gamma2.2_Rec709-Scene-referred:1.0" name="AP0 to Gamma 2.2 Rec.709 - Scene-referred">
2+
<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.2_Encoded_Rec709:1.0" name="AP0 to Gamma 2.2 Encoded Rec.709">
33
<InputDescriptor>ACES2065-1</InputDescriptor>
44
<OutputDescriptor>2.2 gamma-corrected Rec.709 primaries, D65 white point</OutputDescriptor>
55
<Matrix inBitDepth="32f" outBitDepth="32f">

opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Gamma2.4_Rec709-Scene-referred.clf renamed to opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_Gamma2.4_Encoded_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_Gamma2.4_Rec709-Scene-referred:1.0" name="AP0 to Gamma 2.4 Rec.709 - Scene-referred">
2+
<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.4_Encoded_Rec709:1.0" name="AP0 to Gamma 2.4 Encoded Rec.709">
33
<InputDescriptor>ACES2065-1</InputDescriptor>
44
<OutputDescriptor>2.4 gamma-corrected Rec.709 primaries, D65 white point</OutputDescriptor>
55
<Matrix inBitDepth="32f" outBitDepth="32f">

opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_sRGB-Scene-referred.clf renamed to opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_sRGB-Encoded-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_sRGB-Scene-referred:1.0" name="AP0 to sRGB Rec.709">
2+
<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_sRGB-Encoded-Rec709:1.0" name="AP0 to sRGB Encoded Rec.709 (sRGB)">
33
<InputDescriptor>ACES2065-1</InputDescriptor>
44
<OutputDescriptor>sRGB</OutputDescriptor>
55
<Matrix inBitDepth="32f" outBitDepth="32f">

opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_sRGB_Encoded_AP1-Scene-referred.clf renamed to opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_sRGB_Encoded_AP1.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_sRGB_Encoded_AP1-Scene-referred:1.0" name="AP0 to sRGB Encoded AP1 - Scene-referred">
2+
<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_sRGB_Encoded_AP1:1.0" name="AP0 to sRGB Encoded AP1">
33
<InputDescriptor>ACES2065-1</InputDescriptor>
44
<OutputDescriptor>sRGB Encoded AP1 primaries, ACES ~=D60 white point</OutputDescriptor>
55
<Matrix inBitDepth="32f" outBitDepth="32f">

opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_sRGB_Encoded_P3-D65-Scene-referred.clf renamed to opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_sRGB_Encoded_P3-D65.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_sRGB_Encoded_P3-D65-Scene-referred:1.0" name="AP0 to sRGB Encoded P3-D65 - Scene-referred">
2+
<ProcessList compCLFversion="3" id="urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_sRGB_Encoded_P3-D65:1.0" name="AP0 to sRGB Encoded P3-D65">
33
<InputDescriptor>ACES2065-1</InputDescriptor>
44
<OutputDescriptor>sRGB Encoded P3-D65 primaries, D65 white point</OutputDescriptor>
55
<Matrix inBitDepth="32f" outBitDepth="32f">

0 commit comments

Comments
 (0)