From f4645c77f9ef867c32aa90d5143f252556456776 Mon Sep 17 00:00:00 2001 From: Haarm-Pieter Duiker Date: Thu, 30 Apr 2015 11:48:42 -0700 Subject: [PATCH] Added vendor-specific names in front of gamuts that may be confused with non-vendor specific gamuts if presented in a single long list of color spaces. Marked the GoPro Protune Native gamut as experimental as it may change. --- aces_1.0.0/config.ocio | 162 +++++++++---------- aces_1.0.0/nuke_config.ocio | 166 ++++++++++---------- aces_1.0.0/python/aces_ocio/create_aces_config.py | 2 +- .../python/aces_ocio/create_arri_colorspaces.py | 2 +- .../python/aces_ocio/create_canon_colorspaces.py | 14 +- .../python/aces_ocio/create_gopro_colorspaces.py | 10 +- 6 files changed, 179 insertions(+), 177 deletions(-) diff --git a/aces_1.0.0/config.ocio b/aces_1.0.0/config.ocio index dd1ad3b..65cfbd7 100644 --- a/aces_1.0.0/config.ocio +++ b/aces_1.0.0/config.ocio @@ -212,6 +212,30 @@ colorspaces: - ! {matrix: [0.72286, 0.1263, 0.15084, 0, 0.11923, 0.76418, 0.11659, 0, 0.01427, 0.08213, 0.90359, 0, 0, 0, 0, 1]} - ! + name: Output Shaper + family: Utility + equalitygroup: Output Shaper + bitdepth: 32f + description: | + The Output Shaper color space + isdata: false + allocation: uniform + allocationvars: [0, 1] + to_reference: ! {src: Output_Shaper_to_linear.spi1d, interpolation: linear} + + - ! + name: crv_outputshaper + family: Aliases + equalitygroup: Output Shaper + bitdepth: 32f + description: | + The Output Shaper color space + isdata: false + allocation: uniform + allocationvars: [0, 1] + from_reference: ! {src: ACES2065-1, dst: Output Shaper} + + - ! name: ACES 1.0 to 0.1 emulation family: Look equalitygroup: "" @@ -368,12 +392,12 @@ colorspaces: from_reference: ! {src: ACES2065-1, dst: Dolby PQ 10000} - ! - name: Linear - Wide Gamut + name: Linear - ARRI Wide Gamut family: Input/ARRI equalitygroup: "" bitdepth: 32f description: | - Linear - Wide Gamut + Linear - ARRI Wide Gamut isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] @@ -385,11 +409,11 @@ colorspaces: equalitygroup: "" bitdepth: 32f description: | - Linear - Wide Gamut + Linear - ARRI Wide Gamut isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] - from_reference: ! {src: ACES2065-1, dst: Linear - Wide Gamut} + from_reference: ! {src: ACES2065-1, dst: Linear - ARRI Wide Gamut} - ! name: Dolby PQ Scaled @@ -1076,33 +1100,6 @@ colorspaces: from_reference: ! {src: ACES2065-1, dst: V3 LogC (EI1000) - Wide Gamut} - ! - name: V3 LogC (EI1280) - Wide Gamut - family: Input/ARRI - equalitygroup: "" - bitdepth: 32f - description: | - V3 LogC (EI1280) - Wide Gamut - isdata: false - allocation: uniform - allocationvars: [0, 1] - to_reference: ! - children: - - ! {src: V3_LogC_1280_to_linear.spi1d, interpolation: linear} - - ! {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: logc3ei1280_arriwide - family: Aliases - equalitygroup: "" - bitdepth: 32f - description: | - V3 LogC (EI1280) - Wide Gamut - isdata: false - allocation: uniform - allocationvars: [0, 1] - from_reference: ! {src: ACES2065-1, dst: V3 LogC (EI1280) - Wide Gamut} - - - ! name: ADX16 family: ADX equalitygroup: "" @@ -1145,28 +1142,31 @@ colorspaces: from_reference: ! {src: ACES2065-1, dst: LMT Shaper} - ! - name: Output Shaper - family: Utility - equalitygroup: Output Shaper + name: V3 LogC (EI1280) - Wide Gamut + family: Input/ARRI + equalitygroup: "" bitdepth: 32f description: | - The Output Shaper color space + V3 LogC (EI1280) - Wide Gamut isdata: false allocation: uniform allocationvars: [0, 1] - to_reference: ! {src: Output_Shaper_to_linear.spi1d, interpolation: linear} + to_reference: ! + children: + - ! {src: V3_LogC_1280_to_linear.spi1d, interpolation: linear} + - ! {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: crv_outputshaper + name: logc3ei1280_arriwide family: Aliases - equalitygroup: Output Shaper + equalitygroup: "" bitdepth: 32f description: | - The Output Shaper color space + V3 LogC (EI1280) - Wide Gamut isdata: false allocation: uniform allocationvars: [0, 1] - from_reference: ! {src: ACES2065-1, dst: Output Shaper} + from_reference: ! {src: ACES2065-1, dst: V3 LogC (EI1280) - Wide Gamut} - ! name: V3 LogC (EI1600) - Wide Gamut @@ -1487,172 +1487,172 @@ colorspaces: from_reference: ! {src: ACES2065-1, dst: Canon-Log} - ! - name: Linear - Rec. 709 Daylight + name: Linear - Canon Rec. 709 Daylight family: Input/Canon equalitygroup: "" bitdepth: 32f description: | - Linear - Rec. 709 Daylight + Linear - Canon Rec. 709 Daylight isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] to_reference: ! {matrix: [0.561539, 0.40206, 0.0364009, 0, 0.0927396, 0.924121, -0.0168608, 0, 0.084813, 0.00637383, 0.908813, 0, 0, 0, 0, 1]} - ! - name: lin_rec709day + name: lin_canonrec709day family: Aliases equalitygroup: "" bitdepth: 32f description: | - Linear - Rec. 709 Daylight + Linear - Canon Rec. 709 Daylight isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] - from_reference: ! {src: ACES2065-1, dst: Linear - Rec. 709 Daylight} + from_reference: ! {src: ACES2065-1, dst: Linear - Canon Rec. 709 Daylight} - ! - name: Linear - Rec. 709 Tungsten + name: Linear - Canon Rec. 709 Tungsten family: Input/Canon equalitygroup: "" bitdepth: 32f description: | - Linear - Rec. 709 Tungsten + Linear - Canon Rec. 709 Tungsten isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] to_reference: ! {matrix: [0.566996, 0.365079, 0.0679242, 0, 0.070901, 0.880331, 0.0487679, 0, 0.0730135, -0.0665409, 0.993527, 0, 0, 0, 0, 1]} - ! - name: lin_rec709tung + name: lin_canonrec709tung family: Aliases equalitygroup: "" bitdepth: 32f description: | - Linear - Rec. 709 Tungsten + Linear - Canon Rec. 709 Tungsten isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] - from_reference: ! {src: ACES2065-1, dst: Linear - Rec. 709 Tungsten} + from_reference: ! {src: ACES2065-1, dst: Linear - Canon Rec. 709 Tungsten} - ! - name: Linear - DCI-P3 Daylight + name: Linear - Canon DCI-P3 Daylight family: Input/Canon equalitygroup: "" bitdepth: 32f description: | - Linear - DCI-P3 Daylight + Linear - Canon DCI-P3 Daylight isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] to_reference: ! {matrix: [0.607161, 0.299507, 0.0933321, 0, 0.00496812, 1.05098, -0.0559503, 0, -0.00783994, 0.000809127, 1.00703, 0, 0, 0, 0, 1]} - ! - name: lin_dcip3day + name: lin_canondcip3day family: Aliases equalitygroup: "" bitdepth: 32f description: | - Linear - DCI-P3 Daylight + Linear - Canon DCI-P3 Daylight isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] - from_reference: ! {src: ACES2065-1, dst: Linear - DCI-P3 Daylight} + from_reference: ! {src: ACES2065-1, dst: Linear - Canon DCI-P3 Daylight} - ! - name: Linear - DCI-P3 Tungsten + name: Linear - Canon DCI-P3 Tungsten family: Input/Canon equalitygroup: "" bitdepth: 32f description: | - Linear - DCI-P3 Tungsten + Linear - Canon DCI-P3 Tungsten isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] to_reference: ! {matrix: [0.650279, 0.25388, 0.0958407, 0, -0.026138, 1.0179, 0.00823746, 0, 0.00775756, -0.0630817, 1.05532, 0, 0, 0, 0, 1]} - ! - name: lin_dcip3tung + name: lin_canondcip3tung family: Aliases equalitygroup: "" bitdepth: 32f description: | - Linear - DCI-P3 Tungsten + Linear - Canon DCI-P3 Tungsten isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] - from_reference: ! {src: ACES2065-1, dst: Linear - DCI-P3 Tungsten} + from_reference: ! {src: ACES2065-1, dst: Linear - Canon DCI-P3 Tungsten} - ! - name: Linear - Cinema Gamut Daylight + name: Linear - Canon Cinema Gamut Daylight family: Input/Canon equalitygroup: "" bitdepth: 32f description: | - Linear - Cinema Gamut Daylight + Linear - Canon Cinema Gamut Daylight isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] to_reference: ! {matrix: [0.763064, 0.149021, 0.0879144, 0, 0.00365746, 1.10696, -0.110618, 0, -0.00940779, -0.218383, 1.22779, 0, 0, 0, 0, 1]} - ! - name: lin_cgamutday + name: lin_canoncgamutday family: Aliases equalitygroup: "" bitdepth: 32f description: | - Linear - Cinema Gamut Daylight + Linear - Canon Cinema Gamut Daylight isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] - from_reference: ! {src: ACES2065-1, dst: Linear - Cinema Gamut Daylight} + from_reference: ! {src: ACES2065-1, dst: Linear - Canon Cinema Gamut Daylight} - ! - name: Linear - Cinema Gamut Tungsten + name: Linear - Canon Cinema Gamut Tungsten family: Input/Canon equalitygroup: "" bitdepth: 32f description: | - Linear - Cinema Gamut Tungsten + Linear - Canon Cinema Gamut Tungsten isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] to_reference: ! {matrix: [0.817416, 0.0907557, 0.091828, 0, -0.0353614, 1.06569, -0.0303292, 0, 0.0103904, -0.299271, 1.28888, 0, 0, 0, 0, 1]} - ! - name: lin_cgamuttung + name: lin_canoncgamuttung family: Aliases equalitygroup: "" bitdepth: 32f description: | - Linear - Cinema Gamut Tungsten + Linear - Canon Cinema Gamut Tungsten isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] - from_reference: ! {src: ACES2065-1, dst: Linear - Cinema Gamut Tungsten} + from_reference: ! {src: ACES2065-1, dst: Linear - Canon Cinema Gamut Tungsten} - ! - name: Protune Flat - Protune Native + name: Protune Flat - Protune Native - Experimental family: Input/GoPro equalitygroup: "" bitdepth: 32f description: | - Protune Flat - Protune Native + Protune Flat - Protune Native - Experimental isdata: false allocation: uniform allocationvars: [0, 1] to_reference: ! {src: Protune_Flat_to_linear.spi1d, interpolation: linear} - ! - name: protuneflat_protunegamut + name: protuneflat_protunegamutexp family: Aliases equalitygroup: "" bitdepth: 32f description: | - Protune Flat - Protune Native + Protune Flat - Protune Native - Experimental isdata: false allocation: uniform allocationvars: [0, 1] - from_reference: ! {src: ACES2065-1, dst: Protune Flat - Protune Native} + from_reference: ! {src: ACES2065-1, dst: Protune Flat - Protune Native - Experimental} - ! name: Protune Flat @@ -1679,28 +1679,28 @@ colorspaces: from_reference: ! {src: ACES2065-1, dst: Protune Flat} - ! - name: Linear - Protune Native + name: Linear - Protune Native - Experimental family: Input/GoPro equalitygroup: "" bitdepth: 32f description: | - Linear - Protune Native + Linear - Protune Native - Experimental isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] - ! - name: lin_protunegamut + name: lin_protunegamutexp family: Aliases equalitygroup: "" bitdepth: 32f description: | - Linear - Protune Native + Linear - Protune Native - Experimental isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] - to_reference: ! {src: Linear - Protune Native, dst: ACES2065-1} - from_reference: ! {src: ACES2065-1, dst: Linear - Protune Native} + to_reference: ! {src: Linear - Protune Native - Experimental, dst: ACES2065-1} + from_reference: ! {src: ACES2065-1, dst: Linear - Protune Native - Experimental} - ! name: V-Log - V-Gamut diff --git a/aces_1.0.0/nuke_config.ocio b/aces_1.0.0/nuke_config.ocio index 4a3430e..ddbbd19 100644 --- a/aces_1.0.0/nuke_config.ocio +++ b/aces_1.0.0/nuke_config.ocio @@ -18,7 +18,7 @@ roles: texture_paint: Raw displays: - Output: + ACES: - ! {name: DCDM, colorspace: DCDM} - ! {name: DCDM (P3 gamut clip), colorspace: DCDM (P3 gamut clip)} - ! {name: P3-D60, colorspace: P3-D60} @@ -36,7 +36,7 @@ displays: - ! {name: Linear, colorspace: ACES2065-1} - ! {name: Log, colorspace: ACEScc} -active_displays: [Output] +active_displays: [ACES] active_views: [DCDM, DCDM (P3 gamut clip), P3-D60, P3-D60 PQ (1000 nits), P3-D60 PQ (2000 nits), P3-D60 PQ (4000 nits), P3-DCI, Rec.2020 - Full, Rec.2020 - Legal, Rec.709 (D60 sim.) - Full, Rec.709 (D60 sim.) - Legal, Rec.709 - Full, Rec.709 - Legal, sRGB (D60 sim.), Linear, Log] colorspaces: @@ -173,6 +173,30 @@ colorspaces: - ! {matrix: [0.72286, 0.1263, 0.15084, 0, 0.11923, 0.76418, 0.11659, 0, 0.01427, 0.08213, 0.90359, 0, 0, 0, 0, 1]} - ! + name: Output Shaper + family: Utility + equalitygroup: Output Shaper + bitdepth: 32f + description: | + The Output Shaper color space + isdata: false + allocation: uniform + allocationvars: [0, 1] + to_reference: ! {src: Output_Shaper_to_linear.spi1d, interpolation: linear} + + - ! + name: crv_outputshaper + family: Aliases + equalitygroup: Output Shaper + bitdepth: 32f + description: | + The Output Shaper color space + isdata: false + allocation: uniform + allocationvars: [0, 1] + from_reference: ! {src: ACES2065-1, dst: Output Shaper} + + - ! name: ACES 1.0 to 0.1 emulation family: Look equalitygroup: "" @@ -329,12 +353,12 @@ colorspaces: from_reference: ! {src: ACES2065-1, dst: Dolby PQ 10000} - ! - name: Linear - Wide Gamut + name: Linear - ARRI Wide Gamut family: Input/ARRI equalitygroup: "" bitdepth: 32f description: | - Linear - Wide Gamut + Linear - ARRI Wide Gamut isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] @@ -346,11 +370,11 @@ colorspaces: equalitygroup: "" bitdepth: 32f description: | - Linear - Wide Gamut + Linear - ARRI Wide Gamut isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] - from_reference: ! {src: ACES2065-1, dst: Linear - Wide Gamut} + from_reference: ! {src: ACES2065-1, dst: Linear - ARRI Wide Gamut} - ! name: Dolby PQ Scaled @@ -1037,33 +1061,6 @@ colorspaces: from_reference: ! {src: ACES2065-1, dst: V3 LogC (EI1000) - Wide Gamut} - ! - name: V3 LogC (EI1280) - Wide Gamut - family: Input/ARRI - equalitygroup: "" - bitdepth: 32f - description: | - V3 LogC (EI1280) - Wide Gamut - isdata: false - allocation: uniform - allocationvars: [0, 1] - to_reference: ! - children: - - ! {src: V3_LogC_1280_to_linear.spi1d, interpolation: linear} - - ! {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: logc3ei1280_arriwide - family: Aliases - equalitygroup: "" - bitdepth: 32f - description: | - V3 LogC (EI1280) - Wide Gamut - isdata: false - allocation: uniform - allocationvars: [0, 1] - from_reference: ! {src: ACES2065-1, dst: V3 LogC (EI1280) - Wide Gamut} - - - ! name: ADX16 family: ADX equalitygroup: "" @@ -1106,28 +1103,31 @@ colorspaces: from_reference: ! {src: ACES2065-1, dst: LMT Shaper} - ! - name: Output Shaper - family: Utility - equalitygroup: Output Shaper + name: V3 LogC (EI1280) - Wide Gamut + family: Input/ARRI + equalitygroup: "" bitdepth: 32f description: | - The Output Shaper color space + V3 LogC (EI1280) - Wide Gamut isdata: false allocation: uniform allocationvars: [0, 1] - to_reference: ! {src: Output_Shaper_to_linear.spi1d, interpolation: linear} + to_reference: ! + children: + - ! {src: V3_LogC_1280_to_linear.spi1d, interpolation: linear} + - ! {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: crv_outputshaper + name: logc3ei1280_arriwide family: Aliases - equalitygroup: Output Shaper + equalitygroup: "" bitdepth: 32f description: | - The Output Shaper color space + V3 LogC (EI1280) - Wide Gamut isdata: false allocation: uniform allocationvars: [0, 1] - from_reference: ! {src: ACES2065-1, dst: Output Shaper} + from_reference: ! {src: ACES2065-1, dst: V3 LogC (EI1280) - Wide Gamut} - ! name: V3 LogC (EI1600) - Wide Gamut @@ -1448,172 +1448,172 @@ colorspaces: from_reference: ! {src: ACES2065-1, dst: Canon-Log} - ! - name: Linear - Rec. 709 Daylight + name: Linear - Canon Rec. 709 Daylight family: Input/Canon equalitygroup: "" bitdepth: 32f description: | - Linear - Rec. 709 Daylight + Linear - Canon Rec. 709 Daylight isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] to_reference: ! {matrix: [0.561539, 0.40206, 0.0364009, 0, 0.0927396, 0.924121, -0.0168608, 0, 0.084813, 0.00637383, 0.908813, 0, 0, 0, 0, 1]} - ! - name: lin_rec709day + name: lin_canonrec709day family: Aliases equalitygroup: "" bitdepth: 32f description: | - Linear - Rec. 709 Daylight + Linear - Canon Rec. 709 Daylight isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] - from_reference: ! {src: ACES2065-1, dst: Linear - Rec. 709 Daylight} + from_reference: ! {src: ACES2065-1, dst: Linear - Canon Rec. 709 Daylight} - ! - name: Linear - Rec. 709 Tungsten + name: Linear - Canon Rec. 709 Tungsten family: Input/Canon equalitygroup: "" bitdepth: 32f description: | - Linear - Rec. 709 Tungsten + Linear - Canon Rec. 709 Tungsten isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] to_reference: ! {matrix: [0.566996, 0.365079, 0.0679242, 0, 0.070901, 0.880331, 0.0487679, 0, 0.0730135, -0.0665409, 0.993527, 0, 0, 0, 0, 1]} - ! - name: lin_rec709tung + name: lin_canonrec709tung family: Aliases equalitygroup: "" bitdepth: 32f description: | - Linear - Rec. 709 Tungsten + Linear - Canon Rec. 709 Tungsten isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] - from_reference: ! {src: ACES2065-1, dst: Linear - Rec. 709 Tungsten} + from_reference: ! {src: ACES2065-1, dst: Linear - Canon Rec. 709 Tungsten} - ! - name: Linear - DCI-P3 Daylight + name: Linear - Canon DCI-P3 Daylight family: Input/Canon equalitygroup: "" bitdepth: 32f description: | - Linear - DCI-P3 Daylight + Linear - Canon DCI-P3 Daylight isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] to_reference: ! {matrix: [0.607161, 0.299507, 0.0933321, 0, 0.00496812, 1.05098, -0.0559503, 0, -0.00783994, 0.000809127, 1.00703, 0, 0, 0, 0, 1]} - ! - name: lin_dcip3day + name: lin_canondcip3day family: Aliases equalitygroup: "" bitdepth: 32f description: | - Linear - DCI-P3 Daylight + Linear - Canon DCI-P3 Daylight isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] - from_reference: ! {src: ACES2065-1, dst: Linear - DCI-P3 Daylight} + from_reference: ! {src: ACES2065-1, dst: Linear - Canon DCI-P3 Daylight} - ! - name: Linear - DCI-P3 Tungsten + name: Linear - Canon DCI-P3 Tungsten family: Input/Canon equalitygroup: "" bitdepth: 32f description: | - Linear - DCI-P3 Tungsten + Linear - Canon DCI-P3 Tungsten isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] to_reference: ! {matrix: [0.650279, 0.25388, 0.0958407, 0, -0.026138, 1.0179, 0.00823746, 0, 0.00775756, -0.0630817, 1.05532, 0, 0, 0, 0, 1]} - ! - name: lin_dcip3tung + name: lin_canondcip3tung family: Aliases equalitygroup: "" bitdepth: 32f description: | - Linear - DCI-P3 Tungsten + Linear - Canon DCI-P3 Tungsten isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] - from_reference: ! {src: ACES2065-1, dst: Linear - DCI-P3 Tungsten} + from_reference: ! {src: ACES2065-1, dst: Linear - Canon DCI-P3 Tungsten} - ! - name: Linear - Cinema Gamut Daylight + name: Linear - Canon Cinema Gamut Daylight family: Input/Canon equalitygroup: "" bitdepth: 32f description: | - Linear - Cinema Gamut Daylight + Linear - Canon Cinema Gamut Daylight isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] to_reference: ! {matrix: [0.763064, 0.149021, 0.0879144, 0, 0.00365746, 1.10696, -0.110618, 0, -0.00940779, -0.218383, 1.22779, 0, 0, 0, 0, 1]} - ! - name: lin_cgamutday + name: lin_canoncgamutday family: Aliases equalitygroup: "" bitdepth: 32f description: | - Linear - Cinema Gamut Daylight + Linear - Canon Cinema Gamut Daylight isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] - from_reference: ! {src: ACES2065-1, dst: Linear - Cinema Gamut Daylight} + from_reference: ! {src: ACES2065-1, dst: Linear - Canon Cinema Gamut Daylight} - ! - name: Linear - Cinema Gamut Tungsten + name: Linear - Canon Cinema Gamut Tungsten family: Input/Canon equalitygroup: "" bitdepth: 32f description: | - Linear - Cinema Gamut Tungsten + Linear - Canon Cinema Gamut Tungsten isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] to_reference: ! {matrix: [0.817416, 0.0907557, 0.091828, 0, -0.0353614, 1.06569, -0.0303292, 0, 0.0103904, -0.299271, 1.28888, 0, 0, 0, 0, 1]} - ! - name: lin_cgamuttung + name: lin_canoncgamuttung family: Aliases equalitygroup: "" bitdepth: 32f description: | - Linear - Cinema Gamut Tungsten + Linear - Canon Cinema Gamut Tungsten isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] - from_reference: ! {src: ACES2065-1, dst: Linear - Cinema Gamut Tungsten} + from_reference: ! {src: ACES2065-1, dst: Linear - Canon Cinema Gamut Tungsten} - ! - name: Protune Flat - Protune Native + name: Protune Flat - Protune Native - Experimental family: Input/GoPro equalitygroup: "" bitdepth: 32f description: | - Protune Flat - Protune Native + Protune Flat - Protune Native - Experimental isdata: false allocation: uniform allocationvars: [0, 1] to_reference: ! {src: Protune_Flat_to_linear.spi1d, interpolation: linear} - ! - name: protuneflat_protunegamut + name: protuneflat_protunegamutexp family: Aliases equalitygroup: "" bitdepth: 32f description: | - Protune Flat - Protune Native + Protune Flat - Protune Native - Experimental isdata: false allocation: uniform allocationvars: [0, 1] - from_reference: ! {src: ACES2065-1, dst: Protune Flat - Protune Native} + from_reference: ! {src: ACES2065-1, dst: Protune Flat - Protune Native - Experimental} - ! name: Protune Flat @@ -1640,28 +1640,28 @@ colorspaces: from_reference: ! {src: ACES2065-1, dst: Protune Flat} - ! - name: Linear - Protune Native + name: Linear - Protune Native - Experimental family: Input/GoPro equalitygroup: "" bitdepth: 32f description: | - Linear - Protune Native + Linear - Protune Native - Experimental isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] - ! - name: lin_protunegamut + name: lin_protunegamutexp family: Aliases equalitygroup: "" bitdepth: 32f description: | - Linear - Protune Native + Linear - Protune Native - Experimental isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] - to_reference: ! {src: Linear - Protune Native, dst: ACES2065-1} - from_reference: ! {src: ACES2065-1, dst: Linear - Protune Native} + to_reference: ! {src: Linear - Protune Native - Experimental, dst: ACES2065-1} + from_reference: ! {src: ACES2065-1, dst: Linear - Protune Native - Experimental} - ! name: V-Log - V-Gamut diff --git a/aces_1.0.0/python/aces_ocio/create_aces_config.py b/aces_1.0.0/python/aces_ocio/create_aces_config.py index 3fedf31..0ad1278 100755 --- a/aces_1.0.0/python/aces_ocio/create_aces_config.py +++ b/aces_1.0.0/python/aces_ocio/create_aces_config.py @@ -391,7 +391,7 @@ def create_config(config_data, nuke=False): # Defining the *Nuke* specific set of *views* and *displays*. else: - display_name = 'Output' + display_name = 'ACES' displays.append(display_name) display_names = sorted(config_data['displays']) diff --git a/aces_1.0.0/python/aces_ocio/create_arri_colorspaces.py b/aces_1.0.0/python/aces_ocio/create_arri_colorspaces.py index e0ec467..050dea2 100644 --- a/aces_1.0.0/python/aces_ocio/create_arri_colorspaces.py +++ b/aces_1.0.0/python/aces_ocio/create_arri_colorspaces.py @@ -53,7 +53,7 @@ def create_log_c(gamut, name = '%s (EI%s) - %s' % (transfer_function, exposure_index, gamut) if transfer_function == '': - name = 'Linear - %s' % gamut + name = 'Linear - ARRI %s' % gamut if gamut == '': name = '%s (EI%s)' % (transfer_function, exposure_index) diff --git a/aces_1.0.0/python/aces_ocio/create_canon_colorspaces.py b/aces_1.0.0/python/aces_ocio/create_canon_colorspaces.py index 1d0ee38..5fa0e91 100644 --- a/aces_1.0.0/python/aces_ocio/create_canon_colorspaces.py +++ b/aces_1.0.0/python/aces_ocio/create_canon_colorspaces.py @@ -50,7 +50,7 @@ def create_c_log(gamut, name = '%s - %s' % (transfer_function, gamut) if transfer_function == '': - name = 'Linear - %s' % gamut + name = 'Linear - Canon %s' % gamut if gamut == '': name = '%s' % transfer_function @@ -245,7 +245,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'Canon-Log', lut_directory, lut_resolution_1d, - ["lin_rec709day"]) + ["lin_canonrec709day"]) colorspaces.append(c_log_8) c_log_9 = create_c_log( @@ -254,7 +254,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'Canon-Log', lut_directory, lut_resolution_1d, - ["lin_rec709tung"]) + ["lin_canonrec709tung"]) colorspaces.append(c_log_9) c_log_10 = create_c_log( @@ -263,7 +263,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'Canon-Log', lut_directory, lut_resolution_1d, - ["lin_dcip3day"]) + ["lin_canondcip3day"]) colorspaces.append(c_log_10) c_log_11 = create_c_log( @@ -272,7 +272,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'Canon-Log', lut_directory, lut_resolution_1d, - ["lin_dcip3tung"]) + ["lin_canondcip3tung"]) colorspaces.append(c_log_11) c_log_12 = create_c_log( @@ -281,7 +281,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'Canon-Log', lut_directory, lut_resolution_1d, - ["lin_cgamutday"]) + ["lin_canoncgamutday"]) colorspaces.append(c_log_12) c_log_13 = create_c_log( @@ -290,7 +290,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'Canon-Log', lut_directory, lut_resolution_1d, - ["lin_cgamuttung"]) + ["lin_canoncgamuttung"]) colorspaces.append(c_log_13) return colorspaces diff --git a/aces_1.0.0/python/aces_ocio/create_gopro_colorspaces.py b/aces_1.0.0/python/aces_ocio/create_gopro_colorspaces.py index f7c4f0f..b032baa 100644 --- a/aces_1.0.0/python/aces_ocio/create_gopro_colorspaces.py +++ b/aces_1.0.0/python/aces_ocio/create_gopro_colorspaces.py @@ -48,9 +48,11 @@ def create_protune(gamut, Return value description. """ - name = '%s - %s' % (transfer_function, gamut) + # The gamut should be marked as experimental until + # matrices are fully verified + name = '%s - %s - Experimental' % (transfer_function, gamut) if transfer_function == '': - name = 'Linear - %s' % gamut + name = 'Linear - %s - Experimental' % gamut if gamut == '': name = '%s' % transfer_function @@ -134,7 +136,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'Protune', lut_directory, lut_resolution_1d, - ["protuneflat_protunegamut"]) + ["protuneflat_protunegamutexp"]) colorspaces.append(protune_1) # Linearization Only @@ -154,7 +156,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'Protune', lut_directory, lut_resolution_1d, - ["lin_protunegamut"]) + ["lin_protunegamutexp"]) colorspaces.append(protune_3) return colorspaces -- 1.7.10.4