Skip to content

Commit

Permalink
Add CIE-XYZ-D65 - Scene-referred colourspace.
Browse files Browse the repository at this point in the history
  • Loading branch information
KelSolaar committed Jul 31, 2024
1 parent 8b34bf0 commit 657fcfb
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 0 deletions.
26 changes: 26 additions & 0 deletions opencolorio_config_aces/clf/transforms/ocio/generate.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,16 @@

from pathlib import Path

import numpy as np

from opencolorio_config_aces.clf.transforms import (
clf_basename,
format_clf_transform_id,
gamma_transform,
generate_clf_transform,
matrix_RGB_to_RGB_transform,
)
from opencolorio_config_aces.utilities import required

__author__ = "OpenColorIO Contributors"
__copyright__ = "Copyright Contributors to the OpenColorIO Project."
Expand Down Expand Up @@ -50,9 +53,12 @@
"""


@required("Colour")
def generate_clf_transforms_ocio(output_directory):
"""Generate OCIO Utility CLF transforms."""

import colour

output_directory.mkdir(parents=True, exist_ok=True)

clf_transforms = {}
Expand Down Expand Up @@ -95,6 +101,26 @@ def generate_clf_transforms_ocio(output_directory):
style=style,
)

name = "AP0_to_CIE-XYZ-D65-Scene-referred"
clf_transform_id = format_clf_transform_id(FAMILY, GENUS, name, VERSION)
filename = output_directory / clf_basename(clf_transform_id)
colour.RGB_COLOURSPACES["CIE-XYZ-D65"] = colour.RGB_Colourspace(
"CIE-XYZ-D65",
colour.XYZ_to_xy(np.identity(3)),
colour.CCS_ILLUMINANTS["CIE 1931 2 Degree Standard Observer"]["D65"],
"D65",
use_derived_matrix_RGB_to_XYZ=True,
use_derived_matrix_XYZ_to_RGB=True,
)
clf_transforms[filename] = generate_clf_transform(
filename,
[matrix_RGB_to_RGB_transform("ACES2065-1", "CIE-XYZ-D65")],
clf_transform_id,
"AP0 to CIE-XYZ-D65",
"ACES2065-1",
"CIE XYZ, D65 white point",
)

name = "AP0_to_Linear_P3-D65"
clf_transform_id = format_clf_transform_id(FAMILY, GENUS, name, VERSION)
filename = output_directory / clf_basename(clf_transform_id)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<InputDescriptor>ACES2065-1</InputDescriptor>
<OutputDescriptor>CIE XYZ, D65 white point</OutputDescriptor>
<Matrix inBitDepth="32f" outBitDepth="32f">
<Array dim="3 3">
0.987189224215598 -0.00468348472103211 0.0174942605054339
0.337368890787837 0.729521566690265 -0.0668904574781025
0.00107795096161498 -0.00340726320478726 1.00232931224317
</Array>
</Matrix>
</ProcessList>
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Ordering,Colorspace,Legacy,ACEStransformID,CLFtransformID,Interface,BuiltinTrans
410,Utility - Linear - P3-D65,TRUE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Linear_P3-D65:1.0,ColorSpace,,"lin_p3d65,lin_displayp3,Linear Display P3",scene-linear,"file-io,working-space,texture"
410,Utility - Linear - Rec.2020,TRUE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Linear_Rec2020:1.0,ColorSpace,,lin_rec2020,scene-linear,"file-io,texture"
410,Utility - Linear - Rec.709,TRUE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Linear_Rec709:1.0,ColorSpace,,"lin_rec709,lin_srgb,Utility - Linear - sRGB",scene-linear,"file-io,working-space,texture"
420,CIE-XYZ-D65 - Scene-referred,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_CIE-XYZ-D65-Scene-referred:1.0,ColorSpace,,,,file-io
420,Gamma 2.2 AP1 - Scene-referred,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.2_AP1-Scene-referred:1.0,ColorSpace,,"g22_ap1,Gamma 2.2 AP1 - Texture,g22_ap1_tx",sdr-video,"file-io,texture"
420,Gamma 2.4 Rec.709 - Scene-referred,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.4_Rec709-Scene-referred:1.0,ColorSpace,,"g24_rec709,rec709_display,Utility - Rec.709 - Display,Gamma 2.4 Rec.709 - Texture,g24_rec709_tx",sdr-video,"file-io,texture"
420,sRGB Encoded AP1 - Scene-referred,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_sRGB_Encoded_AP1-Scene-referred:1.0,ColorSpace,,"srgb_ap1,sRGB Encoded AP1 - Texture,srgb_encoded_ap1_tx",sdr-video,"file-io,texture"
Expand Down
1 change: 1 addition & 0 deletions opencolorio_config_aces/config/generation/beautifiers.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
"\\b(\\d+)nits\\b": "(\\1 nits)",
"RGBmonitor": "sRGB",
"\\bP3 D": "P3-D",
"CIE XYZ D65": "CIE-XYZ-D65",
"Gamma1": "Gamma 1",
"Gamma2": "Gamma 2",
"Rec1886": "Rec.1886",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ Ordering,Colorspace,Legacy,ACEStransformID,CLFtransformID,Interface,BuiltinTrans
410,Utility - Linear - Rec.709,TRUE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Linear_Rec709:1.0,ColorSpace,,"lin_rec709,lin_srgb,Utility - Linear - sRGB",scene-linear,"file-io,working-space,texture"
410,Utility - Linear - RIMM ROMM (ProPhoto),TRUE,,,ColorSpace,,"lin_prophoto,lin_rimm",scene-linear,file-io
420,AdobeRGB - Scene-referred,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_AdobeRGB-Scene-referred:1.0,ColorSpace,,adobergb,sdr-video,"file-io,texture"
420,CIE-XYZ-D65 - Scene-referred,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_CIE-XYZ-D65-Scene-referred:1.0,ColorSpace,,,,file-io
420,Gamma 2.2 AP1 - Scene-referred,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.2_AP1-Scene-referred:1.0,ColorSpace,,"g22_ap1,Gamma 2.2 AP1 - Texture,g22_ap1_tx",sdr-video,"file-io,texture"
420,Gamma 2.4 Rec.709 - Scene-referred,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.4_Rec709-Scene-referred:1.0,ColorSpace,,"g24_rec709,rec709_display,Utility - Rec.709 - Display,Gamma 2.4 Rec.709 - Texture,g24_rec709_tx",sdr-video,"file-io,texture"
420,Linear AdobeRGB,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Linear_AdobeRGB:1.0,ColorSpace,,lin_adobergb,scene-linear,file-io
Expand Down

0 comments on commit 657fcfb

Please sign in to comment.