From: Haarm-Pieter Duiker Date: Tue, 23 Jun 2015 19:56:47 +0000 (-0700) Subject: The 'Linear' view is now called 'Raw'. Includes a number of other minor fixes. X-Git-Url: http://users.mur.at/ms/git/gitweb/?p=OpenColorIO-Configs.git;a=commitdiff_plain;h=017897501f34f5a847559bbed65c5b3da7badb35 The 'Linear' view is now called 'Raw'. Includes a number of other minor fixes. --- diff --git a/aces_1.0.0/config.ocio b/aces_1.0.0/config.ocio index d0ef224..519a4c7 100644 --- a/aces_1.0.0/config.ocio +++ b/aces_1.0.0/config.ocio @@ -35,11 +35,11 @@ displays: - ! {name: Rec.709 D60 sim. - Legal, colorspace: Output - Rec.709 (D60 sim.) - Legal} - ! {name: Rec.709 - Full, colorspace: Output - Rec.709 - Full} - ! {name: Rec.709 - Legal, colorspace: Output - Rec.709 - Legal} - - ! {name: Linear, colorspace: ACES - ACEScg} + - ! {name: Raw, colorspace: ACES - ACEScg} - ! {name: Log, colorspace: ACES - ACEScc} active_displays: [ACEScg] -active_views: [sRGB D60 sim., 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, Linear, Log] +active_views: [sRGB D60 sim., 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, Raw, Log] colorspaces: - ! @@ -313,23 +313,23 @@ colorspaces: - ! {src: Output_Shaper.RRT.a1.0.0.DCDM.spi3d, interpolation: tetrahedral} - ! - name: Output - P3-D60 + name: Output - Rec.2020 - Full family: Output equalitygroup: "" bitdepth: 32f description: | - ACES 1.0 Output - P3-D60 Output Transform + ACES 1.0 Output - Rec.2020 - Full Output Transform isdata: false allocation: uniform allocationvars: [0, 1] to_reference: ! children: - - ! {src: InvRRT.a1.0.0.P3-D60.Output_Shaper.spi3d, interpolation: tetrahedral} + - ! {src: InvRRT.a1.0.0.Rec.2020_-_Full.Output_Shaper.spi3d, interpolation: tetrahedral} - ! {src: Output_Shaper_to_linear.spi1d, interpolation: linear} from_reference: ! children: - ! {src: Output_Shaper_to_linear.spi1d, interpolation: linear, direction: inverse} - - ! {src: Output_Shaper.RRT.a1.0.0.P3-D60.spi3d, interpolation: tetrahedral} + - ! {src: Output_Shaper.RRT.a1.0.0.Rec.2020_-_Full.spi3d, interpolation: tetrahedral} - ! name: Output - P3-D60 PQ (1000 nits) @@ -351,80 +351,80 @@ colorspaces: - ! {src: Output_Shaper.RRT.a1.0.0.P3-D60_PQ__1000_nits_.spi3d, interpolation: tetrahedral} - ! - name: Output - P3-D60 PQ (4000 nits) + name: Output - P3-D60 PQ (2000 nits) family: Output equalitygroup: "" bitdepth: 32f description: | - ACES 1.0 Output - P3-D60 PQ (4000 nits) Output Transform + ACES 1.0 Output - P3-D60 PQ (2000 nits) Output Transform isdata: false allocation: uniform allocationvars: [0, 1] to_reference: ! children: - - ! {src: InvRRT.a1.0.0.P3-D60_PQ__4000_nits_.Output_Shaper.spi3d, interpolation: tetrahedral} + - ! {src: InvRRT.a1.0.0.P3-D60_PQ__2000_nits_.Output_Shaper.spi3d, interpolation: tetrahedral} - ! {src: Output_Shaper_to_linear.spi1d, interpolation: linear} from_reference: ! children: - ! {src: Output_Shaper_to_linear.spi1d, interpolation: linear, direction: inverse} - - ! {src: Output_Shaper.RRT.a1.0.0.P3-D60_PQ__4000_nits_.spi3d, interpolation: tetrahedral} + - ! {src: Output_Shaper.RRT.a1.0.0.P3-D60_PQ__2000_nits_.spi3d, interpolation: tetrahedral} - ! - name: Output - P3-D60 PQ (2000 nits) + name: Output - P3-D60 family: Output equalitygroup: "" bitdepth: 32f description: | - ACES 1.0 Output - P3-D60 PQ (2000 nits) Output Transform + ACES 1.0 Output - P3-D60 Output Transform isdata: false allocation: uniform allocationvars: [0, 1] to_reference: ! children: - - ! {src: InvRRT.a1.0.0.P3-D60_PQ__2000_nits_.Output_Shaper.spi3d, interpolation: tetrahedral} + - ! {src: InvRRT.a1.0.0.P3-D60.Output_Shaper.spi3d, interpolation: tetrahedral} - ! {src: Output_Shaper_to_linear.spi1d, interpolation: linear} from_reference: ! children: - ! {src: Output_Shaper_to_linear.spi1d, interpolation: linear, direction: inverse} - - ! {src: Output_Shaper.RRT.a1.0.0.P3-D60_PQ__2000_nits_.spi3d, interpolation: tetrahedral} + - ! {src: Output_Shaper.RRT.a1.0.0.P3-D60.spi3d, interpolation: tetrahedral} - ! - name: Output - P3-DCI + name: Output - P3-D60 PQ (4000 nits) family: Output equalitygroup: "" bitdepth: 32f description: | - ACES 1.0 Output - P3-DCI Output Transform + ACES 1.0 Output - P3-D60 PQ (4000 nits) Output Transform isdata: false allocation: uniform allocationvars: [0, 1] to_reference: ! children: - - ! {src: InvRRT.a1.0.0.P3-DCI.Output_Shaper.spi3d, interpolation: tetrahedral} + - ! {src: InvRRT.a1.0.0.P3-D60_PQ__4000_nits_.Output_Shaper.spi3d, interpolation: tetrahedral} - ! {src: Output_Shaper_to_linear.spi1d, interpolation: linear} from_reference: ! children: - ! {src: Output_Shaper_to_linear.spi1d, interpolation: linear, direction: inverse} - - ! {src: Output_Shaper.RRT.a1.0.0.P3-DCI.spi3d, interpolation: tetrahedral} + - ! {src: Output_Shaper.RRT.a1.0.0.P3-D60_PQ__4000_nits_.spi3d, interpolation: tetrahedral} - ! - name: Output - Rec.2020 - Full + name: Output - P3-DCI family: Output equalitygroup: "" bitdepth: 32f description: | - ACES 1.0 Output - Rec.2020 - Full Output Transform + ACES 1.0 Output - P3-DCI Output Transform isdata: false allocation: uniform allocationvars: [0, 1] to_reference: ! children: - - ! {src: InvRRT.a1.0.0.Rec.2020_-_Full.Output_Shaper.spi3d, interpolation: tetrahedral} + - ! {src: InvRRT.a1.0.0.P3-DCI.Output_Shaper.spi3d, interpolation: tetrahedral} - ! {src: Output_Shaper_to_linear.spi1d, interpolation: linear} from_reference: ! children: - ! {src: Output_Shaper_to_linear.spi1d, interpolation: linear, direction: inverse} - - ! {src: Output_Shaper.RRT.a1.0.0.Rec.2020_-_Full.spi3d, interpolation: tetrahedral} + - ! {src: Output_Shaper.RRT.a1.0.0.P3-DCI.spi3d, interpolation: tetrahedral} - ! name: Output - Rec.2020 - Legal @@ -946,7 +946,10 @@ colorspaces: isdata: false allocation: uniform allocationvars: [0, 1] - to_reference: ! {src: Protune_Flat_to_linear.spi1d, interpolation: linear} + to_reference: ! + children: + - ! {src: Protune_Flat_to_linear.spi1d, interpolation: linear} + - ! {matrix: [0.533448, 0.324139, 0.142412, 0, -0.0507299, 1.07572, -0.0249904, 0, 0.0714197, -0.290522, 1.2191, 0, 0, 0, 0, 1]} - ! name: Input - GoPro - Curve - Protune Flat @@ -970,6 +973,7 @@ colorspaces: isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] + to_reference: ! {matrix: [0.533448, 0.324139, 0.142412, 0, -0.0507299, 1.07572, -0.0249904, 0, 0.0714197, -0.290522, 1.2191, 0, 0, 0, 0, 1]} - ! name: Input - Panasonic - V-Log - V-Gamut @@ -1668,6 +1672,18 @@ colorspaces: allocationvars: [-8, 5, 0.00390625] - ! + name: acescc + family: Aliases + equalitygroup: "" + bitdepth: 32f + description: | + The ACEScc color space + isdata: false + allocation: uniform + allocationvars: [-0.3584, 1.468] + to_reference: ! {src: ACES - ACEScc, dst: ACES - ACES2065-1} + + - ! name: acescc_ap1 family: Aliases equalitygroup: "" @@ -1680,6 +1696,18 @@ colorspaces: to_reference: ! {src: ACES - ACEScc, dst: ACES - ACES2065-1} - ! + name: acesproxy + family: Aliases + equalitygroup: "" + bitdepth: 32f + description: | + The ACESproxy color space + isdata: false + allocation: uniform + allocationvars: [0, 1] + to_reference: ! {src: ACES - ACESproxy, dst: ACES - ACES2065-1} + + - ! name: acesproxy_ap1 family: Aliases equalitygroup: "" @@ -1692,6 +1720,18 @@ colorspaces: to_reference: ! {src: ACES - ACESproxy, dst: ACES - ACES2065-1} - ! + name: acescg + family: Aliases + equalitygroup: "" + bitdepth: 32f + description: | + The ACEScg color space + isdata: false + allocation: lg2 + allocationvars: [-8, 5, 0.00390625] + to_reference: ! {src: ACES - ACEScg, dst: ACES - ACES2065-1} + + - ! name: lin_ap1 family: Aliases equalitygroup: Linear - AP1 @@ -1886,17 +1926,17 @@ colorspaces: from_reference: ! {src: ACES - ACES2065-1, dst: Output - DCDM} - ! - name: out_p3d60 + name: out_rec2020full family: Aliases equalitygroup: "" bitdepth: 32f description: | - ACES 1.0 Output - P3-D60 Output Transform + ACES 1.0 Output - Rec.2020 - Full Output Transform isdata: false allocation: uniform allocationvars: [0, 1] - to_reference: ! {src: Output - P3-D60, dst: ACES - ACES2065-1} - from_reference: ! {src: ACES - ACES2065-1, dst: Output - P3-D60} + to_reference: ! {src: Output - Rec.2020 - Full, dst: ACES - ACES2065-1} + from_reference: ! {src: ACES - ACES2065-1, dst: Output - Rec.2020 - Full} - ! name: out_p3d60pq1000nits @@ -1912,56 +1952,56 @@ colorspaces: from_reference: ! {src: ACES - ACES2065-1, dst: Output - P3-D60 PQ (1000 nits)} - ! - name: out_p3d60pq4000nits + name: out_p3d60pq2000nits family: Aliases equalitygroup: "" bitdepth: 32f description: | - ACES 1.0 Output - P3-D60 PQ (4000 nits) Output Transform + ACES 1.0 Output - P3-D60 PQ (2000 nits) Output Transform isdata: false allocation: uniform allocationvars: [0, 1] - to_reference: ! {src: Output - P3-D60 PQ (4000 nits), dst: ACES - ACES2065-1} - from_reference: ! {src: ACES - ACES2065-1, dst: Output - P3-D60 PQ (4000 nits)} + to_reference: ! {src: Output - P3-D60 PQ (2000 nits), dst: ACES - ACES2065-1} + from_reference: ! {src: ACES - ACES2065-1, dst: Output - P3-D60 PQ (2000 nits)} - ! - name: out_p3d60pq2000nits + name: out_p3d60 family: Aliases equalitygroup: "" bitdepth: 32f description: | - ACES 1.0 Output - P3-D60 PQ (2000 nits) Output Transform + ACES 1.0 Output - P3-D60 Output Transform isdata: false allocation: uniform allocationvars: [0, 1] - to_reference: ! {src: Output - P3-D60 PQ (2000 nits), dst: ACES - ACES2065-1} - from_reference: ! {src: ACES - ACES2065-1, dst: Output - P3-D60 PQ (2000 nits)} + to_reference: ! {src: Output - P3-D60, dst: ACES - ACES2065-1} + from_reference: ! {src: ACES - ACES2065-1, dst: Output - P3-D60} - ! - name: out_p3dci + name: out_p3d60pq4000nits family: Aliases equalitygroup: "" bitdepth: 32f description: | - ACES 1.0 Output - P3-DCI Output Transform + ACES 1.0 Output - P3-D60 PQ (4000 nits) Output Transform isdata: false allocation: uniform allocationvars: [0, 1] - to_reference: ! {src: Output - P3-DCI, dst: ACES - ACES2065-1} - from_reference: ! {src: ACES - ACES2065-1, dst: Output - P3-DCI} + to_reference: ! {src: Output - P3-D60 PQ (4000 nits), dst: ACES - ACES2065-1} + from_reference: ! {src: ACES - ACES2065-1, dst: Output - P3-D60 PQ (4000 nits)} - ! - name: out_rec2020full + name: out_p3dci family: Aliases equalitygroup: "" bitdepth: 32f description: | - ACES 1.0 Output - Rec.2020 - Full Output Transform + ACES 1.0 Output - P3-DCI Output Transform isdata: false allocation: uniform allocationvars: [0, 1] - to_reference: ! {src: Output - Rec.2020 - Full, dst: ACES - ACES2065-1} - from_reference: ! {src: ACES - ACES2065-1, dst: Output - Rec.2020 - Full} + to_reference: ! {src: Output - P3-DCI, dst: ACES - ACES2065-1} + from_reference: ! {src: ACES - ACES2065-1, dst: Output - P3-DCI} - ! name: out_rec2020legal @@ -2411,6 +2451,7 @@ colorspaces: isdata: false allocation: lg2 allocationvars: [-8, 5, 0.00390625] + to_reference: ! {src: Input - GoPro - Linear - Protune Native - Experimental, dst: ACES - ACES2065-1} - ! name: vlog_vgamut