From 34ba8a5e84c0b15d75ecd23d94f061286e92ea12 Mon Sep 17 00:00:00 2001 From: Haarm-Pieter Duiker Date: Mon, 12 Jan 2015 12:19:29 -0800 Subject: [PATCH] Added AP0 to XYZ conversion. Renamed output and lmt shaper spaces from 'outputShaper' and 'lmtShaper' to 'Output Shaper' and 'LMT Shaper' --- aces_1.0.0/config.ocio | 168 +++++++++++--------- ...pi3d => InvRRT.a1.0.0.DCDM.Output Shaper.spi3d} | 0 ....0.0.P3-D60 PQ (1000 nits).Output Shaper.spi3d} | 0 ....0.0.P3-D60 PQ (2000 nits).Output Shaper.spi3d} | 0 ....0.0.P3-D60 PQ (4000 nits).Output Shaper.spi3d} | 0 ...3d => InvRRT.a1.0.0.P3-D60.Output Shaper.spi3d} | 0 ...3d => InvRRT.a1.0.0.P3-DCI.Output Shaper.spi3d} | 0 ...RRT.a1.0.0.Rec.2020 - Full.Output Shaper.spi3d} | 0 ...RT.a1.0.0.Rec.2020 - Legal.Output Shaper.spi3d} | 0 ....Rec.709 (D60 sim.) - Full.Output Shaper.spi3d} | 0 ...Rec.709 (D60 sim.) - Legal.Output Shaper.spi3d} | 0 ...vRRT.a1.0.0.Rec.709 - Full.Output Shaper.spi3d} | 0 ...RRT.a1.0.0.Rec.709 - Legal.Output Shaper.spi3d} | 0 ...RRT.a1.0.0.sRGB (D60 sim.).Output Shaper.spi3d} | 0 ... => LMT Shaper.ACES 1.0 to 0.1 emulation.spi3d} | 0 ... => LMT Shaper.ACES 1.0 to 0.2 emulation.spi3d} | 0 ... => LMT Shaper.ACES 1.0 to 0.7 emulation.spi3d} | 0 ...aper_to_aces.spi1d => LMT Shaper_to_aces.spi1d} | 0 ...t Shaper.RRT.a1.0.0.DCDM (P3 gamut clip).spi3d} | 0 ...M.spi3d => Output Shaper.RRT.a1.0.0.DCDM.spi3d} | 0 ... Shaper.RRT.a1.0.0.P3-D60 PQ (1000 nits).spi3d} | 0 ... Shaper.RRT.a1.0.0.P3-D60 PQ (2000 nits).spi3d} | 0 ... Shaper.RRT.a1.0.0.P3-D60 PQ (4000 nits).spi3d} | 0 ...spi3d => Output Shaper.RRT.a1.0.0.P3-D60.spi3d} | 0 ...spi3d => Output Shaper.RRT.a1.0.0.P3-DCI.spi3d} | 0 ...Output Shaper.RRT.a1.0.0.Rec.2020 - Full.spi3d} | 0 ...utput Shaper.RRT.a1.0.0.Rec.2020 - Legal.spi3d} | 0 ...per.RRT.a1.0.0.Rec.709 (D60 sim.) - Full.spi3d} | 0 ...er.RRT.a1.0.0.Rec.709 (D60 sim.) - Legal.spi3d} | 0 ... Output Shaper.RRT.a1.0.0.Rec.709 - Full.spi3d} | 0 ...Output Shaper.RRT.a1.0.0.Rec.709 - Legal.spi3d} | 0 ...Output Shaper.RRT.a1.0.0.sRGB (D60 sim.).spi3d} | 0 ...r_to_aces.spi1d => Output Shaper_to_aces.spi1d} | 0 aces_1.0.0/nuke_config.ocio | 168 +++++++++++--------- aces_1.0.0/python/create_aces_config.py | 56 ++++++- 35 files changed, 240 insertions(+), 152 deletions(-) rename aces_1.0.0/luts/{InvRRT.a1.0.0.DCDM.outputShaper.spi3d => InvRRT.a1.0.0.DCDM.Output Shaper.spi3d} (100%) rename aces_1.0.0/luts/{InvRRT.a1.0.0.P3-D60 PQ (1000 nits).outputShaper.spi3d => InvRRT.a1.0.0.P3-D60 PQ (1000 nits).Output Shaper.spi3d} (100%) rename aces_1.0.0/luts/{InvRRT.a1.0.0.P3-D60 PQ (2000 nits).outputShaper.spi3d => InvRRT.a1.0.0.P3-D60 PQ (2000 nits).Output Shaper.spi3d} (100%) rename aces_1.0.0/luts/{InvRRT.a1.0.0.P3-D60 PQ (4000 nits).outputShaper.spi3d => InvRRT.a1.0.0.P3-D60 PQ (4000 nits).Output Shaper.spi3d} (100%) rename aces_1.0.0/luts/{InvRRT.a1.0.0.P3-D60.outputShaper.spi3d => InvRRT.a1.0.0.P3-D60.Output Shaper.spi3d} (100%) rename aces_1.0.0/luts/{InvRRT.a1.0.0.P3-DCI.outputShaper.spi3d => InvRRT.a1.0.0.P3-DCI.Output Shaper.spi3d} (100%) rename aces_1.0.0/luts/{InvRRT.a1.0.0.Rec.2020 - Full.outputShaper.spi3d => InvRRT.a1.0.0.Rec.2020 - Full.Output Shaper.spi3d} (100%) rename aces_1.0.0/luts/{InvRRT.a1.0.0.Rec.2020 - Legal.outputShaper.spi3d => InvRRT.a1.0.0.Rec.2020 - Legal.Output Shaper.spi3d} (100%) rename aces_1.0.0/luts/{InvRRT.a1.0.0.Rec.709 (D60 sim.) - Full.outputShaper.spi3d => InvRRT.a1.0.0.Rec.709 (D60 sim.) - Full.Output Shaper.spi3d} (100%) rename aces_1.0.0/luts/{InvRRT.a1.0.0.Rec.709 (D60 sim.) - Legal.outputShaper.spi3d => InvRRT.a1.0.0.Rec.709 (D60 sim.) - Legal.Output Shaper.spi3d} (100%) rename aces_1.0.0/luts/{InvRRT.a1.0.0.Rec.709 - Full.outputShaper.spi3d => InvRRT.a1.0.0.Rec.709 - Full.Output Shaper.spi3d} (100%) rename aces_1.0.0/luts/{InvRRT.a1.0.0.Rec.709 - Legal.outputShaper.spi3d => InvRRT.a1.0.0.Rec.709 - Legal.Output Shaper.spi3d} (100%) rename aces_1.0.0/luts/{InvRRT.a1.0.0.sRGB (D60 sim.).outputShaper.spi3d => InvRRT.a1.0.0.sRGB (D60 sim.).Output Shaper.spi3d} (100%) rename aces_1.0.0/luts/{lmtShaper.ACES 1.0 to 0.1 emulation.spi3d => LMT Shaper.ACES 1.0 to 0.1 emulation.spi3d} (100%) rename aces_1.0.0/luts/{lmtShaper.ACES 1.0 to 0.2 emulation.spi3d => LMT Shaper.ACES 1.0 to 0.2 emulation.spi3d} (100%) rename aces_1.0.0/luts/{lmtShaper.ACES 1.0 to 0.7 emulation.spi3d => LMT Shaper.ACES 1.0 to 0.7 emulation.spi3d} (100%) rename aces_1.0.0/luts/{lmtShaper_to_aces.spi1d => LMT Shaper_to_aces.spi1d} (100%) rename aces_1.0.0/luts/{outputShaper.RRT.a1.0.0.DCDM (P3 gamut clip).spi3d => Output Shaper.RRT.a1.0.0.DCDM (P3 gamut clip).spi3d} (100%) rename aces_1.0.0/luts/{outputShaper.RRT.a1.0.0.DCDM.spi3d => Output Shaper.RRT.a1.0.0.DCDM.spi3d} (100%) rename aces_1.0.0/luts/{outputShaper.RRT.a1.0.0.P3-D60 PQ (1000 nits).spi3d => Output Shaper.RRT.a1.0.0.P3-D60 PQ (1000 nits).spi3d} (100%) rename aces_1.0.0/luts/{outputShaper.RRT.a1.0.0.P3-D60 PQ (2000 nits).spi3d => Output Shaper.RRT.a1.0.0.P3-D60 PQ (2000 nits).spi3d} (100%) rename aces_1.0.0/luts/{outputShaper.RRT.a1.0.0.P3-D60 PQ (4000 nits).spi3d => Output Shaper.RRT.a1.0.0.P3-D60 PQ (4000 nits).spi3d} (100%) rename aces_1.0.0/luts/{outputShaper.RRT.a1.0.0.P3-D60.spi3d => Output Shaper.RRT.a1.0.0.P3-D60.spi3d} (100%) rename aces_1.0.0/luts/{outputShaper.RRT.a1.0.0.P3-DCI.spi3d => Output Shaper.RRT.a1.0.0.P3-DCI.spi3d} (100%) rename aces_1.0.0/luts/{outputShaper.RRT.a1.0.0.Rec.2020 - Full.spi3d => Output Shaper.RRT.a1.0.0.Rec.2020 - Full.spi3d} (100%) rename aces_1.0.0/luts/{outputShaper.RRT.a1.0.0.Rec.2020 - Legal.spi3d => Output Shaper.RRT.a1.0.0.Rec.2020 - Legal.spi3d} (100%) rename aces_1.0.0/luts/{outputShaper.RRT.a1.0.0.Rec.709 (D60 sim.) - Full.spi3d => Output Shaper.RRT.a1.0.0.Rec.709 (D60 sim.) - Full.spi3d} (100%) rename aces_1.0.0/luts/{outputShaper.RRT.a1.0.0.Rec.709 (D60 sim.) - Legal.spi3d => Output Shaper.RRT.a1.0.0.Rec.709 (D60 sim.) - Legal.spi3d} (100%) rename aces_1.0.0/luts/{outputShaper.RRT.a1.0.0.Rec.709 - Full.spi3d => Output Shaper.RRT.a1.0.0.Rec.709 - Full.spi3d} (100%) rename aces_1.0.0/luts/{outputShaper.RRT.a1.0.0.Rec.709 - Legal.spi3d => Output Shaper.RRT.a1.0.0.Rec.709 - Legal.spi3d} (100%) rename aces_1.0.0/luts/{outputShaper.RRT.a1.0.0.sRGB (D60 sim.).spi3d => Output Shaper.RRT.a1.0.0.sRGB (D60 sim.).spi3d} (100%) rename aces_1.0.0/luts/{outputShaper_to_aces.spi1d => Output Shaper_to_aces.spi1d} (100%) diff --git a/aces_1.0.0/config.ocio b/aces_1.0.0/config.ocio index 2a569ea..96e557b 100644 --- a/aces_1.0.0/config.ocio +++ b/aces_1.0.0/config.ocio @@ -856,16 +856,16 @@ colorspaces: to_reference: ! {matrix: [0.680206, 0.236137, 0.083658, 0, 0.085415, 1.01747, -0.102886, 0, 0.002057, -0.062563, 1.06051, 0, 0, 0, 0, 1]} - ! - name: lmtShaper + name: LMT Shaper family: Utility - equalitygroup: lmtShaper + equalitygroup: LMT Shaper bitdepth: 32f description: | - The lmtShaper color space + The LMT Shaper color space isdata: false allocation: uniform allocationvars: [0, 1] - to_reference: ! {src: lmtShaper_to_aces.spi1d, interpolation: linear} + to_reference: ! {src: LMT Shaper_to_aces.spi1d, interpolation: linear} - ! name: ACES 1.0 to 0.1 emulation @@ -879,8 +879,8 @@ colorspaces: allocationvars: [0, 1] from_reference: ! children: - - ! {src: lmtShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: lmtShaper.ACES 1.0 to 0.1 emulation.spi3d, interpolation: tetrahedral} + - ! {src: LMT Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: LMT Shaper.ACES 1.0 to 0.1 emulation.spi3d, interpolation: tetrahedral} - ! name: ACES 1.0 to 0.2 emulation @@ -894,8 +894,8 @@ colorspaces: allocationvars: [0, 1] from_reference: ! children: - - ! {src: lmtShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: lmtShaper.ACES 1.0 to 0.2 emulation.spi3d, interpolation: tetrahedral} + - ! {src: LMT Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: LMT Shaper.ACES 1.0 to 0.2 emulation.spi3d, interpolation: tetrahedral} - ! name: ACES 1.0 to 0.7 emulation @@ -909,34 +909,34 @@ colorspaces: allocationvars: [0, 1] from_reference: ! children: - - ! {src: lmtShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: lmtShaper.ACES 1.0 to 0.7 emulation.spi3d, interpolation: tetrahedral} + - ! {src: LMT Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: LMT Shaper.ACES 1.0 to 0.7 emulation.spi3d, interpolation: tetrahedral} - ! - name: outputShaper + name: Output Shaper family: Utility - equalitygroup: outputShaper + equalitygroup: Output Shaper bitdepth: 32f description: | - The outputShaper color space + The Output Shaper color space isdata: false allocation: uniform allocationvars: [0, 1] - to_reference: ! {src: outputShaper_to_aces.spi1d, interpolation: linear} + to_reference: ! {src: Output Shaper_to_aces.spi1d, interpolation: linear} - ! - name: outputShaper AP1 + name: Output Shaper - AP1 family: Utility - equalitygroup: outputShaper + equalitygroup: Output Shaper bitdepth: 32f description: | - The outputShaper color space + The Output Shaper color space isdata: false allocation: uniform allocationvars: [0, 1] to_reference: ! children: - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear} - ! {matrix: [0.695452, 0.140679, 0.163869, 0, 0.0447946, 0.859671, 0.0955343, 0, -0.00552588, 0.00402521, 1.0015, 0, 0, 0, 0, 1]} - ! @@ -951,8 +951,8 @@ colorspaces: allocationvars: [0, 1] from_reference: ! children: - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: outputShaper.RRT.a1.0.0.DCDM (P3 gamut clip).spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: Output Shaper.RRT.a1.0.0.DCDM (P3 gamut clip).spi3d, interpolation: tetrahedral} - ! name: DCDM @@ -966,12 +966,12 @@ colorspaces: allocationvars: [0, 1] to_reference: ! children: - - ! {src: InvRRT.a1.0.0.DCDM.outputShaper.spi3d, interpolation: tetrahedral} - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear} + - ! {src: InvRRT.a1.0.0.DCDM.Output Shaper.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear} from_reference: ! children: - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: outputShaper.RRT.a1.0.0.DCDM.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: Output Shaper.RRT.a1.0.0.DCDM.spi3d, interpolation: tetrahedral} - ! name: P3-D60 PQ (1000 nits) @@ -985,12 +985,12 @@ colorspaces: allocationvars: [0, 1] to_reference: ! children: - - ! {src: InvRRT.a1.0.0.P3-D60 PQ (1000 nits).outputShaper.spi3d, interpolation: tetrahedral} - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear} + - ! {src: InvRRT.a1.0.0.P3-D60 PQ (1000 nits).Output Shaper.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear} from_reference: ! children: - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: outputShaper.RRT.a1.0.0.P3-D60 PQ (1000 nits).spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: Output Shaper.RRT.a1.0.0.P3-D60 PQ (1000 nits).spi3d, interpolation: tetrahedral} - ! name: P3-D60 PQ (2000 nits) @@ -1004,12 +1004,12 @@ colorspaces: allocationvars: [0, 1] to_reference: ! children: - - ! {src: InvRRT.a1.0.0.P3-D60 PQ (2000 nits).outputShaper.spi3d, interpolation: tetrahedral} - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear} + - ! {src: InvRRT.a1.0.0.P3-D60 PQ (2000 nits).Output Shaper.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear} from_reference: ! children: - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: outputShaper.RRT.a1.0.0.P3-D60 PQ (2000 nits).spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: Output Shaper.RRT.a1.0.0.P3-D60 PQ (2000 nits).spi3d, interpolation: tetrahedral} - ! name: P3-D60 PQ (4000 nits) @@ -1023,12 +1023,12 @@ colorspaces: allocationvars: [0, 1] to_reference: ! children: - - ! {src: InvRRT.a1.0.0.P3-D60 PQ (4000 nits).outputShaper.spi3d, interpolation: tetrahedral} - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear} + - ! {src: InvRRT.a1.0.0.P3-D60 PQ (4000 nits).Output Shaper.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear} from_reference: ! children: - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: outputShaper.RRT.a1.0.0.P3-D60 PQ (4000 nits).spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: Output Shaper.RRT.a1.0.0.P3-D60 PQ (4000 nits).spi3d, interpolation: tetrahedral} - ! name: P3-D60 @@ -1042,12 +1042,12 @@ colorspaces: allocationvars: [0, 1] to_reference: ! children: - - ! {src: InvRRT.a1.0.0.P3-D60.outputShaper.spi3d, interpolation: tetrahedral} - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear} + - ! {src: InvRRT.a1.0.0.P3-D60.Output Shaper.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear} from_reference: ! children: - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: outputShaper.RRT.a1.0.0.P3-D60.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: Output Shaper.RRT.a1.0.0.P3-D60.spi3d, interpolation: tetrahedral} - ! name: P3-DCI @@ -1061,12 +1061,12 @@ colorspaces: allocationvars: [0, 1] to_reference: ! children: - - ! {src: InvRRT.a1.0.0.P3-DCI.outputShaper.spi3d, interpolation: tetrahedral} - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear} + - ! {src: InvRRT.a1.0.0.P3-DCI.Output Shaper.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear} from_reference: ! children: - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: outputShaper.RRT.a1.0.0.P3-DCI.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: Output Shaper.RRT.a1.0.0.P3-DCI.spi3d, interpolation: tetrahedral} - ! name: Rec.2020 - Legal @@ -1080,12 +1080,12 @@ colorspaces: allocationvars: [0, 1] to_reference: ! children: - - ! {src: InvRRT.a1.0.0.Rec.2020 - Legal.outputShaper.spi3d, interpolation: tetrahedral} - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear} + - ! {src: InvRRT.a1.0.0.Rec.2020 - Legal.Output Shaper.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear} from_reference: ! children: - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: outputShaper.RRT.a1.0.0.Rec.2020 - Legal.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: Output Shaper.RRT.a1.0.0.Rec.2020 - Legal.spi3d, interpolation: tetrahedral} - ! name: Rec.2020 - Full @@ -1099,12 +1099,12 @@ colorspaces: allocationvars: [0, 1] to_reference: ! children: - - ! {src: InvRRT.a1.0.0.Rec.2020 - Full.outputShaper.spi3d, interpolation: tetrahedral} - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear} + - ! {src: InvRRT.a1.0.0.Rec.2020 - Full.Output Shaper.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear} from_reference: ! children: - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: outputShaper.RRT.a1.0.0.Rec.2020 - Full.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: Output Shaper.RRT.a1.0.0.Rec.2020 - Full.spi3d, interpolation: tetrahedral} - ! name: Rec.709 - Legal @@ -1118,12 +1118,12 @@ colorspaces: allocationvars: [0, 1] to_reference: ! children: - - ! {src: InvRRT.a1.0.0.Rec.709 - Legal.outputShaper.spi3d, interpolation: tetrahedral} - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear} + - ! {src: InvRRT.a1.0.0.Rec.709 - Legal.Output Shaper.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear} from_reference: ! children: - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: outputShaper.RRT.a1.0.0.Rec.709 - Legal.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: Output Shaper.RRT.a1.0.0.Rec.709 - Legal.spi3d, interpolation: tetrahedral} - ! name: Rec.709 - Full @@ -1137,12 +1137,12 @@ colorspaces: allocationvars: [0, 1] to_reference: ! children: - - ! {src: InvRRT.a1.0.0.Rec.709 - Full.outputShaper.spi3d, interpolation: tetrahedral} - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear} + - ! {src: InvRRT.a1.0.0.Rec.709 - Full.Output Shaper.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear} from_reference: ! children: - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: outputShaper.RRT.a1.0.0.Rec.709 - Full.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: Output Shaper.RRT.a1.0.0.Rec.709 - Full.spi3d, interpolation: tetrahedral} - ! name: Rec.709 (D60 sim.) - Legal @@ -1156,12 +1156,12 @@ colorspaces: allocationvars: [0, 1] to_reference: ! children: - - ! {src: InvRRT.a1.0.0.Rec.709 (D60 sim.) - Legal.outputShaper.spi3d, interpolation: tetrahedral} - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear} + - ! {src: InvRRT.a1.0.0.Rec.709 (D60 sim.) - Legal.Output Shaper.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear} from_reference: ! children: - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: outputShaper.RRT.a1.0.0.Rec.709 (D60 sim.) - Legal.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: Output Shaper.RRT.a1.0.0.Rec.709 (D60 sim.) - Legal.spi3d, interpolation: tetrahedral} - ! name: Rec.709 (D60 sim.) - Full @@ -1175,12 +1175,12 @@ colorspaces: allocationvars: [0, 1] to_reference: ! children: - - ! {src: InvRRT.a1.0.0.Rec.709 (D60 sim.) - Full.outputShaper.spi3d, interpolation: tetrahedral} - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear} + - ! {src: InvRRT.a1.0.0.Rec.709 (D60 sim.) - Full.Output Shaper.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear} from_reference: ! children: - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: outputShaper.RRT.a1.0.0.Rec.709 (D60 sim.) - Full.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: Output Shaper.RRT.a1.0.0.Rec.709 (D60 sim.) - Full.spi3d, interpolation: tetrahedral} - ! name: sRGB (D60 sim.) @@ -1194,9 +1194,33 @@ colorspaces: allocationvars: [0, 1] to_reference: ! children: - - ! {src: InvRRT.a1.0.0.sRGB (D60 sim.).outputShaper.spi3d, interpolation: tetrahedral} - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear} + - ! {src: InvRRT.a1.0.0.sRGB (D60 sim.).Output Shaper.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear} from_reference: ! children: - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: outputShaper.RRT.a1.0.0.sRGB (D60 sim.).spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: Output Shaper.RRT.a1.0.0.sRGB (D60 sim.).spi3d, interpolation: tetrahedral} + + - ! + name: XYZ + family: Utility + equalitygroup: XYZ + bitdepth: 32f + description: | + The XYZ color space + isdata: false + allocation: uniform + allocationvars: [0, 1] + from_reference: ! {matrix: [0.952552, 0, 9.36786e-05, 0, 0.343966, 0.728166, -0.0721325, 0, 0, 0, 1.00883, 0, 0, 0, 0, 1]} + + - ! + name: Linear - AP1 + family: Utility + equalitygroup: Linear - AP1 + bitdepth: 32f + description: | + The Linear - AP1 color space + isdata: false + allocation: uniform + allocationvars: [0, 1] + to_reference: ! {matrix: [0.695452, 0.140679, 0.163869, 0, 0.0447946, 0.859671, 0.0955343, 0, -0.00552588, 0.00402521, 1.0015, 0, 0, 0, 0, 1]} diff --git a/aces_1.0.0/luts/InvRRT.a1.0.0.DCDM.outputShaper.spi3d b/aces_1.0.0/luts/InvRRT.a1.0.0.DCDM.Output Shaper.spi3d similarity index 100% rename from aces_1.0.0/luts/InvRRT.a1.0.0.DCDM.outputShaper.spi3d rename to aces_1.0.0/luts/InvRRT.a1.0.0.DCDM.Output Shaper.spi3d diff --git a/aces_1.0.0/luts/InvRRT.a1.0.0.P3-D60 PQ (1000 nits).outputShaper.spi3d b/aces_1.0.0/luts/InvRRT.a1.0.0.P3-D60 PQ (1000 nits).Output Shaper.spi3d similarity index 100% rename from aces_1.0.0/luts/InvRRT.a1.0.0.P3-D60 PQ (1000 nits).outputShaper.spi3d rename to aces_1.0.0/luts/InvRRT.a1.0.0.P3-D60 PQ (1000 nits).Output Shaper.spi3d diff --git a/aces_1.0.0/luts/InvRRT.a1.0.0.P3-D60 PQ (2000 nits).outputShaper.spi3d b/aces_1.0.0/luts/InvRRT.a1.0.0.P3-D60 PQ (2000 nits).Output Shaper.spi3d similarity index 100% rename from aces_1.0.0/luts/InvRRT.a1.0.0.P3-D60 PQ (2000 nits).outputShaper.spi3d rename to aces_1.0.0/luts/InvRRT.a1.0.0.P3-D60 PQ (2000 nits).Output Shaper.spi3d diff --git a/aces_1.0.0/luts/InvRRT.a1.0.0.P3-D60 PQ (4000 nits).outputShaper.spi3d b/aces_1.0.0/luts/InvRRT.a1.0.0.P3-D60 PQ (4000 nits).Output Shaper.spi3d similarity index 100% rename from aces_1.0.0/luts/InvRRT.a1.0.0.P3-D60 PQ (4000 nits).outputShaper.spi3d rename to aces_1.0.0/luts/InvRRT.a1.0.0.P3-D60 PQ (4000 nits).Output Shaper.spi3d diff --git a/aces_1.0.0/luts/InvRRT.a1.0.0.P3-D60.outputShaper.spi3d b/aces_1.0.0/luts/InvRRT.a1.0.0.P3-D60.Output Shaper.spi3d similarity index 100% rename from aces_1.0.0/luts/InvRRT.a1.0.0.P3-D60.outputShaper.spi3d rename to aces_1.0.0/luts/InvRRT.a1.0.0.P3-D60.Output Shaper.spi3d diff --git a/aces_1.0.0/luts/InvRRT.a1.0.0.P3-DCI.outputShaper.spi3d b/aces_1.0.0/luts/InvRRT.a1.0.0.P3-DCI.Output Shaper.spi3d similarity index 100% rename from aces_1.0.0/luts/InvRRT.a1.0.0.P3-DCI.outputShaper.spi3d rename to aces_1.0.0/luts/InvRRT.a1.0.0.P3-DCI.Output Shaper.spi3d diff --git a/aces_1.0.0/luts/InvRRT.a1.0.0.Rec.2020 - Full.outputShaper.spi3d b/aces_1.0.0/luts/InvRRT.a1.0.0.Rec.2020 - Full.Output Shaper.spi3d similarity index 100% rename from aces_1.0.0/luts/InvRRT.a1.0.0.Rec.2020 - Full.outputShaper.spi3d rename to aces_1.0.0/luts/InvRRT.a1.0.0.Rec.2020 - Full.Output Shaper.spi3d diff --git a/aces_1.0.0/luts/InvRRT.a1.0.0.Rec.2020 - Legal.outputShaper.spi3d b/aces_1.0.0/luts/InvRRT.a1.0.0.Rec.2020 - Legal.Output Shaper.spi3d similarity index 100% rename from aces_1.0.0/luts/InvRRT.a1.0.0.Rec.2020 - Legal.outputShaper.spi3d rename to aces_1.0.0/luts/InvRRT.a1.0.0.Rec.2020 - Legal.Output Shaper.spi3d diff --git a/aces_1.0.0/luts/InvRRT.a1.0.0.Rec.709 (D60 sim.) - Full.outputShaper.spi3d b/aces_1.0.0/luts/InvRRT.a1.0.0.Rec.709 (D60 sim.) - Full.Output Shaper.spi3d similarity index 100% rename from aces_1.0.0/luts/InvRRT.a1.0.0.Rec.709 (D60 sim.) - Full.outputShaper.spi3d rename to aces_1.0.0/luts/InvRRT.a1.0.0.Rec.709 (D60 sim.) - Full.Output Shaper.spi3d diff --git a/aces_1.0.0/luts/InvRRT.a1.0.0.Rec.709 (D60 sim.) - Legal.outputShaper.spi3d b/aces_1.0.0/luts/InvRRT.a1.0.0.Rec.709 (D60 sim.) - Legal.Output Shaper.spi3d similarity index 100% rename from aces_1.0.0/luts/InvRRT.a1.0.0.Rec.709 (D60 sim.) - Legal.outputShaper.spi3d rename to aces_1.0.0/luts/InvRRT.a1.0.0.Rec.709 (D60 sim.) - Legal.Output Shaper.spi3d diff --git a/aces_1.0.0/luts/InvRRT.a1.0.0.Rec.709 - Full.outputShaper.spi3d b/aces_1.0.0/luts/InvRRT.a1.0.0.Rec.709 - Full.Output Shaper.spi3d similarity index 100% rename from aces_1.0.0/luts/InvRRT.a1.0.0.Rec.709 - Full.outputShaper.spi3d rename to aces_1.0.0/luts/InvRRT.a1.0.0.Rec.709 - Full.Output Shaper.spi3d diff --git a/aces_1.0.0/luts/InvRRT.a1.0.0.Rec.709 - Legal.outputShaper.spi3d b/aces_1.0.0/luts/InvRRT.a1.0.0.Rec.709 - Legal.Output Shaper.spi3d similarity index 100% rename from aces_1.0.0/luts/InvRRT.a1.0.0.Rec.709 - Legal.outputShaper.spi3d rename to aces_1.0.0/luts/InvRRT.a1.0.0.Rec.709 - Legal.Output Shaper.spi3d diff --git a/aces_1.0.0/luts/InvRRT.a1.0.0.sRGB (D60 sim.).outputShaper.spi3d b/aces_1.0.0/luts/InvRRT.a1.0.0.sRGB (D60 sim.).Output Shaper.spi3d similarity index 100% rename from aces_1.0.0/luts/InvRRT.a1.0.0.sRGB (D60 sim.).outputShaper.spi3d rename to aces_1.0.0/luts/InvRRT.a1.0.0.sRGB (D60 sim.).Output Shaper.spi3d diff --git a/aces_1.0.0/luts/lmtShaper.ACES 1.0 to 0.1 emulation.spi3d b/aces_1.0.0/luts/LMT Shaper.ACES 1.0 to 0.1 emulation.spi3d similarity index 100% rename from aces_1.0.0/luts/lmtShaper.ACES 1.0 to 0.1 emulation.spi3d rename to aces_1.0.0/luts/LMT Shaper.ACES 1.0 to 0.1 emulation.spi3d diff --git a/aces_1.0.0/luts/lmtShaper.ACES 1.0 to 0.2 emulation.spi3d b/aces_1.0.0/luts/LMT Shaper.ACES 1.0 to 0.2 emulation.spi3d similarity index 100% rename from aces_1.0.0/luts/lmtShaper.ACES 1.0 to 0.2 emulation.spi3d rename to aces_1.0.0/luts/LMT Shaper.ACES 1.0 to 0.2 emulation.spi3d diff --git a/aces_1.0.0/luts/lmtShaper.ACES 1.0 to 0.7 emulation.spi3d b/aces_1.0.0/luts/LMT Shaper.ACES 1.0 to 0.7 emulation.spi3d similarity index 100% rename from aces_1.0.0/luts/lmtShaper.ACES 1.0 to 0.7 emulation.spi3d rename to aces_1.0.0/luts/LMT Shaper.ACES 1.0 to 0.7 emulation.spi3d diff --git a/aces_1.0.0/luts/lmtShaper_to_aces.spi1d b/aces_1.0.0/luts/LMT Shaper_to_aces.spi1d similarity index 100% rename from aces_1.0.0/luts/lmtShaper_to_aces.spi1d rename to aces_1.0.0/luts/LMT Shaper_to_aces.spi1d diff --git a/aces_1.0.0/luts/outputShaper.RRT.a1.0.0.DCDM (P3 gamut clip).spi3d b/aces_1.0.0/luts/Output Shaper.RRT.a1.0.0.DCDM (P3 gamut clip).spi3d similarity index 100% rename from aces_1.0.0/luts/outputShaper.RRT.a1.0.0.DCDM (P3 gamut clip).spi3d rename to aces_1.0.0/luts/Output Shaper.RRT.a1.0.0.DCDM (P3 gamut clip).spi3d diff --git a/aces_1.0.0/luts/outputShaper.RRT.a1.0.0.DCDM.spi3d b/aces_1.0.0/luts/Output Shaper.RRT.a1.0.0.DCDM.spi3d similarity index 100% rename from aces_1.0.0/luts/outputShaper.RRT.a1.0.0.DCDM.spi3d rename to aces_1.0.0/luts/Output Shaper.RRT.a1.0.0.DCDM.spi3d diff --git a/aces_1.0.0/luts/outputShaper.RRT.a1.0.0.P3-D60 PQ (1000 nits).spi3d b/aces_1.0.0/luts/Output Shaper.RRT.a1.0.0.P3-D60 PQ (1000 nits).spi3d similarity index 100% rename from aces_1.0.0/luts/outputShaper.RRT.a1.0.0.P3-D60 PQ (1000 nits).spi3d rename to aces_1.0.0/luts/Output Shaper.RRT.a1.0.0.P3-D60 PQ (1000 nits).spi3d diff --git a/aces_1.0.0/luts/outputShaper.RRT.a1.0.0.P3-D60 PQ (2000 nits).spi3d b/aces_1.0.0/luts/Output Shaper.RRT.a1.0.0.P3-D60 PQ (2000 nits).spi3d similarity index 100% rename from aces_1.0.0/luts/outputShaper.RRT.a1.0.0.P3-D60 PQ (2000 nits).spi3d rename to aces_1.0.0/luts/Output Shaper.RRT.a1.0.0.P3-D60 PQ (2000 nits).spi3d diff --git a/aces_1.0.0/luts/outputShaper.RRT.a1.0.0.P3-D60 PQ (4000 nits).spi3d b/aces_1.0.0/luts/Output Shaper.RRT.a1.0.0.P3-D60 PQ (4000 nits).spi3d similarity index 100% rename from aces_1.0.0/luts/outputShaper.RRT.a1.0.0.P3-D60 PQ (4000 nits).spi3d rename to aces_1.0.0/luts/Output Shaper.RRT.a1.0.0.P3-D60 PQ (4000 nits).spi3d diff --git a/aces_1.0.0/luts/outputShaper.RRT.a1.0.0.P3-D60.spi3d b/aces_1.0.0/luts/Output Shaper.RRT.a1.0.0.P3-D60.spi3d similarity index 100% rename from aces_1.0.0/luts/outputShaper.RRT.a1.0.0.P3-D60.spi3d rename to aces_1.0.0/luts/Output Shaper.RRT.a1.0.0.P3-D60.spi3d diff --git a/aces_1.0.0/luts/outputShaper.RRT.a1.0.0.P3-DCI.spi3d b/aces_1.0.0/luts/Output Shaper.RRT.a1.0.0.P3-DCI.spi3d similarity index 100% rename from aces_1.0.0/luts/outputShaper.RRT.a1.0.0.P3-DCI.spi3d rename to aces_1.0.0/luts/Output Shaper.RRT.a1.0.0.P3-DCI.spi3d diff --git a/aces_1.0.0/luts/outputShaper.RRT.a1.0.0.Rec.2020 - Full.spi3d b/aces_1.0.0/luts/Output Shaper.RRT.a1.0.0.Rec.2020 - Full.spi3d similarity index 100% rename from aces_1.0.0/luts/outputShaper.RRT.a1.0.0.Rec.2020 - Full.spi3d rename to aces_1.0.0/luts/Output Shaper.RRT.a1.0.0.Rec.2020 - Full.spi3d diff --git a/aces_1.0.0/luts/outputShaper.RRT.a1.0.0.Rec.2020 - Legal.spi3d b/aces_1.0.0/luts/Output Shaper.RRT.a1.0.0.Rec.2020 - Legal.spi3d similarity index 100% rename from aces_1.0.0/luts/outputShaper.RRT.a1.0.0.Rec.2020 - Legal.spi3d rename to aces_1.0.0/luts/Output Shaper.RRT.a1.0.0.Rec.2020 - Legal.spi3d diff --git a/aces_1.0.0/luts/outputShaper.RRT.a1.0.0.Rec.709 (D60 sim.) - Full.spi3d b/aces_1.0.0/luts/Output Shaper.RRT.a1.0.0.Rec.709 (D60 sim.) - Full.spi3d similarity index 100% rename from aces_1.0.0/luts/outputShaper.RRT.a1.0.0.Rec.709 (D60 sim.) - Full.spi3d rename to aces_1.0.0/luts/Output Shaper.RRT.a1.0.0.Rec.709 (D60 sim.) - Full.spi3d diff --git a/aces_1.0.0/luts/outputShaper.RRT.a1.0.0.Rec.709 (D60 sim.) - Legal.spi3d b/aces_1.0.0/luts/Output Shaper.RRT.a1.0.0.Rec.709 (D60 sim.) - Legal.spi3d similarity index 100% rename from aces_1.0.0/luts/outputShaper.RRT.a1.0.0.Rec.709 (D60 sim.) - Legal.spi3d rename to aces_1.0.0/luts/Output Shaper.RRT.a1.0.0.Rec.709 (D60 sim.) - Legal.spi3d diff --git a/aces_1.0.0/luts/outputShaper.RRT.a1.0.0.Rec.709 - Full.spi3d b/aces_1.0.0/luts/Output Shaper.RRT.a1.0.0.Rec.709 - Full.spi3d similarity index 100% rename from aces_1.0.0/luts/outputShaper.RRT.a1.0.0.Rec.709 - Full.spi3d rename to aces_1.0.0/luts/Output Shaper.RRT.a1.0.0.Rec.709 - Full.spi3d diff --git a/aces_1.0.0/luts/outputShaper.RRT.a1.0.0.Rec.709 - Legal.spi3d b/aces_1.0.0/luts/Output Shaper.RRT.a1.0.0.Rec.709 - Legal.spi3d similarity index 100% rename from aces_1.0.0/luts/outputShaper.RRT.a1.0.0.Rec.709 - Legal.spi3d rename to aces_1.0.0/luts/Output Shaper.RRT.a1.0.0.Rec.709 - Legal.spi3d diff --git a/aces_1.0.0/luts/outputShaper.RRT.a1.0.0.sRGB (D60 sim.).spi3d b/aces_1.0.0/luts/Output Shaper.RRT.a1.0.0.sRGB (D60 sim.).spi3d similarity index 100% rename from aces_1.0.0/luts/outputShaper.RRT.a1.0.0.sRGB (D60 sim.).spi3d rename to aces_1.0.0/luts/Output Shaper.RRT.a1.0.0.sRGB (D60 sim.).spi3d diff --git a/aces_1.0.0/luts/outputShaper_to_aces.spi1d b/aces_1.0.0/luts/Output Shaper_to_aces.spi1d similarity index 100% rename from aces_1.0.0/luts/outputShaper_to_aces.spi1d rename to aces_1.0.0/luts/Output Shaper_to_aces.spi1d diff --git a/aces_1.0.0/nuke_config.ocio b/aces_1.0.0/nuke_config.ocio index 1b38d61..bf59024 100644 --- a/aces_1.0.0/nuke_config.ocio +++ b/aces_1.0.0/nuke_config.ocio @@ -832,16 +832,16 @@ colorspaces: to_reference: ! {matrix: [0.680206, 0.236137, 0.083658, 0, 0.085415, 1.01747, -0.102886, 0, 0.002057, -0.062563, 1.06051, 0, 0, 0, 0, 1]} - ! - name: lmtShaper + name: LMT Shaper family: Utility - equalitygroup: lmtShaper + equalitygroup: LMT Shaper bitdepth: 32f description: | - The lmtShaper color space + The LMT Shaper color space isdata: false allocation: uniform allocationvars: [0, 1] - to_reference: ! {src: lmtShaper_to_aces.spi1d, interpolation: linear} + to_reference: ! {src: LMT Shaper_to_aces.spi1d, interpolation: linear} - ! name: ACES 1.0 to 0.1 emulation @@ -855,8 +855,8 @@ colorspaces: allocationvars: [0, 1] from_reference: ! children: - - ! {src: lmtShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: lmtShaper.ACES 1.0 to 0.1 emulation.spi3d, interpolation: tetrahedral} + - ! {src: LMT Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: LMT Shaper.ACES 1.0 to 0.1 emulation.spi3d, interpolation: tetrahedral} - ! name: ACES 1.0 to 0.2 emulation @@ -870,8 +870,8 @@ colorspaces: allocationvars: [0, 1] from_reference: ! children: - - ! {src: lmtShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: lmtShaper.ACES 1.0 to 0.2 emulation.spi3d, interpolation: tetrahedral} + - ! {src: LMT Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: LMT Shaper.ACES 1.0 to 0.2 emulation.spi3d, interpolation: tetrahedral} - ! name: ACES 1.0 to 0.7 emulation @@ -885,34 +885,34 @@ colorspaces: allocationvars: [0, 1] from_reference: ! children: - - ! {src: lmtShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: lmtShaper.ACES 1.0 to 0.7 emulation.spi3d, interpolation: tetrahedral} + - ! {src: LMT Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: LMT Shaper.ACES 1.0 to 0.7 emulation.spi3d, interpolation: tetrahedral} - ! - name: outputShaper + name: Output Shaper family: Utility - equalitygroup: outputShaper + equalitygroup: Output Shaper bitdepth: 32f description: | - The outputShaper color space + The Output Shaper color space isdata: false allocation: uniform allocationvars: [0, 1] - to_reference: ! {src: outputShaper_to_aces.spi1d, interpolation: linear} + to_reference: ! {src: Output Shaper_to_aces.spi1d, interpolation: linear} - ! - name: outputShaper AP1 + name: Output Shaper - AP1 family: Utility - equalitygroup: outputShaper + equalitygroup: Output Shaper bitdepth: 32f description: | - The outputShaper color space + The Output Shaper color space isdata: false allocation: uniform allocationvars: [0, 1] to_reference: ! children: - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear} - ! {matrix: [0.695452, 0.140679, 0.163869, 0, 0.0447946, 0.859671, 0.0955343, 0, -0.00552588, 0.00402521, 1.0015, 0, 0, 0, 0, 1]} - ! @@ -927,8 +927,8 @@ colorspaces: allocationvars: [0, 1] from_reference: ! children: - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: outputShaper.RRT.a1.0.0.DCDM (P3 gamut clip).spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: Output Shaper.RRT.a1.0.0.DCDM (P3 gamut clip).spi3d, interpolation: tetrahedral} - ! name: DCDM @@ -942,12 +942,12 @@ colorspaces: allocationvars: [0, 1] to_reference: ! children: - - ! {src: InvRRT.a1.0.0.DCDM.outputShaper.spi3d, interpolation: tetrahedral} - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear} + - ! {src: InvRRT.a1.0.0.DCDM.Output Shaper.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear} from_reference: ! children: - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: outputShaper.RRT.a1.0.0.DCDM.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: Output Shaper.RRT.a1.0.0.DCDM.spi3d, interpolation: tetrahedral} - ! name: P3-D60 PQ (1000 nits) @@ -961,12 +961,12 @@ colorspaces: allocationvars: [0, 1] to_reference: ! children: - - ! {src: InvRRT.a1.0.0.P3-D60 PQ (1000 nits).outputShaper.spi3d, interpolation: tetrahedral} - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear} + - ! {src: InvRRT.a1.0.0.P3-D60 PQ (1000 nits).Output Shaper.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear} from_reference: ! children: - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: outputShaper.RRT.a1.0.0.P3-D60 PQ (1000 nits).spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: Output Shaper.RRT.a1.0.0.P3-D60 PQ (1000 nits).spi3d, interpolation: tetrahedral} - ! name: P3-D60 PQ (2000 nits) @@ -980,12 +980,12 @@ colorspaces: allocationvars: [0, 1] to_reference: ! children: - - ! {src: InvRRT.a1.0.0.P3-D60 PQ (2000 nits).outputShaper.spi3d, interpolation: tetrahedral} - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear} + - ! {src: InvRRT.a1.0.0.P3-D60 PQ (2000 nits).Output Shaper.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear} from_reference: ! children: - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: outputShaper.RRT.a1.0.0.P3-D60 PQ (2000 nits).spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: Output Shaper.RRT.a1.0.0.P3-D60 PQ (2000 nits).spi3d, interpolation: tetrahedral} - ! name: P3-D60 PQ (4000 nits) @@ -999,12 +999,12 @@ colorspaces: allocationvars: [0, 1] to_reference: ! children: - - ! {src: InvRRT.a1.0.0.P3-D60 PQ (4000 nits).outputShaper.spi3d, interpolation: tetrahedral} - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear} + - ! {src: InvRRT.a1.0.0.P3-D60 PQ (4000 nits).Output Shaper.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear} from_reference: ! children: - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: outputShaper.RRT.a1.0.0.P3-D60 PQ (4000 nits).spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: Output Shaper.RRT.a1.0.0.P3-D60 PQ (4000 nits).spi3d, interpolation: tetrahedral} - ! name: P3-D60 @@ -1018,12 +1018,12 @@ colorspaces: allocationvars: [0, 1] to_reference: ! children: - - ! {src: InvRRT.a1.0.0.P3-D60.outputShaper.spi3d, interpolation: tetrahedral} - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear} + - ! {src: InvRRT.a1.0.0.P3-D60.Output Shaper.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear} from_reference: ! children: - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: outputShaper.RRT.a1.0.0.P3-D60.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: Output Shaper.RRT.a1.0.0.P3-D60.spi3d, interpolation: tetrahedral} - ! name: P3-DCI @@ -1037,12 +1037,12 @@ colorspaces: allocationvars: [0, 1] to_reference: ! children: - - ! {src: InvRRT.a1.0.0.P3-DCI.outputShaper.spi3d, interpolation: tetrahedral} - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear} + - ! {src: InvRRT.a1.0.0.P3-DCI.Output Shaper.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear} from_reference: ! children: - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: outputShaper.RRT.a1.0.0.P3-DCI.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: Output Shaper.RRT.a1.0.0.P3-DCI.spi3d, interpolation: tetrahedral} - ! name: Rec.2020 - Legal @@ -1056,12 +1056,12 @@ colorspaces: allocationvars: [0, 1] to_reference: ! children: - - ! {src: InvRRT.a1.0.0.Rec.2020 - Legal.outputShaper.spi3d, interpolation: tetrahedral} - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear} + - ! {src: InvRRT.a1.0.0.Rec.2020 - Legal.Output Shaper.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear} from_reference: ! children: - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: outputShaper.RRT.a1.0.0.Rec.2020 - Legal.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: Output Shaper.RRT.a1.0.0.Rec.2020 - Legal.spi3d, interpolation: tetrahedral} - ! name: Rec.2020 - Full @@ -1075,12 +1075,12 @@ colorspaces: allocationvars: [0, 1] to_reference: ! children: - - ! {src: InvRRT.a1.0.0.Rec.2020 - Full.outputShaper.spi3d, interpolation: tetrahedral} - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear} + - ! {src: InvRRT.a1.0.0.Rec.2020 - Full.Output Shaper.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear} from_reference: ! children: - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: outputShaper.RRT.a1.0.0.Rec.2020 - Full.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: Output Shaper.RRT.a1.0.0.Rec.2020 - Full.spi3d, interpolation: tetrahedral} - ! name: Rec.709 - Legal @@ -1094,12 +1094,12 @@ colorspaces: allocationvars: [0, 1] to_reference: ! children: - - ! {src: InvRRT.a1.0.0.Rec.709 - Legal.outputShaper.spi3d, interpolation: tetrahedral} - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear} + - ! {src: InvRRT.a1.0.0.Rec.709 - Legal.Output Shaper.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear} from_reference: ! children: - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: outputShaper.RRT.a1.0.0.Rec.709 - Legal.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: Output Shaper.RRT.a1.0.0.Rec.709 - Legal.spi3d, interpolation: tetrahedral} - ! name: Rec.709 - Full @@ -1113,12 +1113,12 @@ colorspaces: allocationvars: [0, 1] to_reference: ! children: - - ! {src: InvRRT.a1.0.0.Rec.709 - Full.outputShaper.spi3d, interpolation: tetrahedral} - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear} + - ! {src: InvRRT.a1.0.0.Rec.709 - Full.Output Shaper.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear} from_reference: ! children: - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: outputShaper.RRT.a1.0.0.Rec.709 - Full.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: Output Shaper.RRT.a1.0.0.Rec.709 - Full.spi3d, interpolation: tetrahedral} - ! name: Rec.709 (D60 sim.) - Legal @@ -1132,12 +1132,12 @@ colorspaces: allocationvars: [0, 1] to_reference: ! children: - - ! {src: InvRRT.a1.0.0.Rec.709 (D60 sim.) - Legal.outputShaper.spi3d, interpolation: tetrahedral} - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear} + - ! {src: InvRRT.a1.0.0.Rec.709 (D60 sim.) - Legal.Output Shaper.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear} from_reference: ! children: - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: outputShaper.RRT.a1.0.0.Rec.709 (D60 sim.) - Legal.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: Output Shaper.RRT.a1.0.0.Rec.709 (D60 sim.) - Legal.spi3d, interpolation: tetrahedral} - ! name: Rec.709 (D60 sim.) - Full @@ -1151,12 +1151,12 @@ colorspaces: allocationvars: [0, 1] to_reference: ! children: - - ! {src: InvRRT.a1.0.0.Rec.709 (D60 sim.) - Full.outputShaper.spi3d, interpolation: tetrahedral} - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear} + - ! {src: InvRRT.a1.0.0.Rec.709 (D60 sim.) - Full.Output Shaper.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear} from_reference: ! children: - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: outputShaper.RRT.a1.0.0.Rec.709 (D60 sim.) - Full.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: Output Shaper.RRT.a1.0.0.Rec.709 (D60 sim.) - Full.spi3d, interpolation: tetrahedral} - ! name: sRGB (D60 sim.) @@ -1170,9 +1170,33 @@ colorspaces: allocationvars: [0, 1] to_reference: ! children: - - ! {src: InvRRT.a1.0.0.sRGB (D60 sim.).outputShaper.spi3d, interpolation: tetrahedral} - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear} + - ! {src: InvRRT.a1.0.0.sRGB (D60 sim.).Output Shaper.spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear} from_reference: ! children: - - ! {src: outputShaper_to_aces.spi1d, interpolation: linear, direction: inverse} - - ! {src: outputShaper.RRT.a1.0.0.sRGB (D60 sim.).spi3d, interpolation: tetrahedral} + - ! {src: Output Shaper_to_aces.spi1d, interpolation: linear, direction: inverse} + - ! {src: Output Shaper.RRT.a1.0.0.sRGB (D60 sim.).spi3d, interpolation: tetrahedral} + + - ! + name: XYZ + family: Utility + equalitygroup: XYZ + bitdepth: 32f + description: | + The XYZ color space + isdata: false + allocation: uniform + allocationvars: [0, 1] + from_reference: ! {matrix: [0.952552, 0, 9.36786e-05, 0, 0.343966, 0.728166, -0.0721325, 0, 0, 0, 1.00883, 0, 0, 0, 0, 1]} + + - ! + name: Linear - AP1 + family: Utility + equalitygroup: Linear - AP1 + bitdepth: 32f + description: | + The Linear - AP1 color space + isdata: false + allocation: uniform + allocationvars: [0, 1] + to_reference: ! {matrix: [0.695452, 0.140679, 0.163869, 0, 0.0447946, 0.859671, 0.0955343, 0, -0.00552588, 0.00402521, 1.0015, 0, 0, 0, 0, 1]} diff --git a/aces_1.0.0/python/create_aces_config.py b/aces_1.0.0/python/create_aces_config.py index dce012b..29e3f8d 100755 --- a/aces_1.0.0/python/create_aces_config.py +++ b/aces_1.0.0/python/create_aces_config.py @@ -587,10 +587,15 @@ def generateLUTs(odtInfo, lmtInfo, shaperName, acesCTLReleaseDir, lutDir, lutRes configData['colorSpaces'] = [] # Matrix converting ACES AP1 primaries to AP0 - acesAP1toAP0 = [0.6954522414, 0.1406786965, 0.1638690622, - 0.0447945634, 0.8596711185, 0.0955343182, + acesAP1toAP0 = [ 0.6954522414, 0.1406786965, 0.1638690622, + 0.0447945634, 0.8596711185, 0.0955343182, -0.0055258826, 0.0040252103, 1.0015006723] + # Matrix converting ACES AP0 primaries to XYZ + acesAP0toXYZ = [0.9525523959, 0.0000000000, 0.0000936786, + 0.3439664498, 0.7281660966, -0.0721325464, + 0.0000000000, 0.0000000000, 1.0088251844] + # # ACEScc # @@ -604,7 +609,7 @@ def generateLUTs(odtInfo, lmtInfo, shaperName, acesCTLReleaseDir, lutDir, lutRes ctls = [ '%s/ACEScc/ACEScsc.ACEScc_to_ACES.a1.0.0.ctl' % acesCTLReleaseDir, # This transform gets back to the AP1 primaries - # Useful to the 1d LUT is only covering the transfer function + # Useful as the 1d LUT is only covering the transfer function # The primaries switch is covered by the matrix below '%s/ACEScg/ACEScsc.ACES_to_ACEScg.a1.0.0.ctl' % acesCTLReleaseDir ] @@ -655,7 +660,7 @@ def generateLUTs(odtInfo, lmtInfo, shaperName, acesCTLReleaseDir, lutDir, lutRes ctls = [ '%s/ACESproxy/ACEScsc.ACESproxy10i_to_ACES.a1.0.0.ctl' % acesCTLReleaseDir, # This transform gets back to the AP1 primaries - # Useful to the 1d LUT is only covering the transfer function + # Useful as the 1d LUT is only covering the transfer function # The primaries switch is covered by the matrix below '%s/ACEScg/ACEScsc.ACES_to_ACEScg.a1.0.0.ctl' % acesCTLReleaseDir ] @@ -1575,7 +1580,7 @@ def generateLUTs(odtInfo, lmtInfo, shaperName, acesCTLReleaseDir, lutDir, lutRes lmtLutResolution3d = max(65, lutResolution3d) # Log 2 shaper - lmtShaperName = 'lmtShaper' + lmtShaperName = 'LMT Shaper' lmtParams = { 'middleGrey' : 0.18, 'minExposure' : -10.0, @@ -1806,7 +1811,7 @@ def generateLUTs(odtInfo, lmtInfo, shaperName, acesCTLReleaseDir, lutDir, lutRes middleGrey=log2Params['middleGrey'], minExposure=log2Params['minExposure'], maxExposure=log2Params['maxExposure']) - log2ShaperAP1.name = "%s AP1" % log2ShaperAP1.name + log2ShaperAP1.name = "%s - AP1" % log2ShaperAP1.name # AP1 primaries to AP0 primaries log2ShaperAP1.toReferenceTransforms.append( { 'type':'matrix', @@ -1892,6 +1897,41 @@ def generateLUTs(odtInfo, lmtInfo, shaperName, acesCTLReleaseDir, lutDir, lutRes 'Log':ACEScc, 'Output Transform':csFull } + # + # Generic Matrix transform + # + def createGenericMatrix(name='matrix', + fromReferenceValues=[], + toReferenceValues=[]): + cs = ColorSpace(name) + cs.description = "The %s color space" % name + cs.equalityGroup = name + cs.family = 'Utility' + cs.isData=False + + cs.toReferenceTransforms = [] + if toReferenceValues != []: + cs.toReferenceTransforms.append( { + 'type':'matrix', + 'matrix':mat44FromMat33(toReferenceValues), + 'direction':'forward' + }) + + cs.fromReferenceTransforms = [] + if fromReferenceValues != []: + cs.fromReferenceTransforms.append( { + 'type':'matrix', + 'matrix':mat44FromMat33(fromReferenceValues), + 'direction':'forward' + }) + + return cs + + cs = createGenericMatrix('XYZ', fromReferenceValues=acesAP0toXYZ) + configData['colorSpaces'].append(cs) + + cs = createGenericMatrix('Linear - AP1', toReferenceValues=acesAP1toAP0) + configData['colorSpaces'].append(cs) print( "generateLUTs - end" ) return configData @@ -1954,7 +1994,7 @@ def generateBakedLUTs(odtInfo, shaperName, bakedDir, configPath, lutResolution1d args += ["--outputspace", "%s" % odtName ] args += ["--description", "%s - %s for %s data" % (odtPrefix, odtName, inputspace) ] if inputspace == 'ACEScg': - linShaperName = "%s AP1" % shaperName + linShaperName = "%s - AP1" % shaperName else: linShaperName = shaperName args += ["--shaperspace", linShaperName, "--shapersize", str(lutResolutionShaper) ] @@ -2153,7 +2193,7 @@ def createACESConfig(acesCTLReleaseDir, # Generate config data and LUTs for different transforms lutDir = "%s/luts" % configDir - shaperName = 'outputShaper' + shaperName = 'Output Shaper' configData = generateLUTs(odtInfo, lmtInfo, shaperName, acesCTLReleaseDir, lutDir, lutResolution1d, lutResolution3d, cleanup) # Create the config using the generated LUTs -- 1.7.10.4