oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/olive-editor/olive.git

Browse Source
This commit is contained in:
itsmattkc
2020-06-16 03:10:19 +10:00
parent 6a4f3f613c 49cec970f2
commit 3a4e13a04f
1 changed files with 9 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/render/ocioconf/config.ocio
+9 -46
View File
@@ -45,16 +45,6 @@ displays:
- !<View> {name: Non-Colour Data, colorspace: Non-Colour Data}
- !<View> {name: Linear Raw, colorspace: Linear}
- !<View> {name: Filmic Log Encoding Base, colorspace: AppleP3 Filmic Log Encoding}
# VRay users should uncomment the Filmic views below as VRay doesn't permit Looks
# - !<View> {name: Filmic Very High Contrast, colorspace: Filmic Log Encoding, look: +Very High Contrast}
# - !<View> {name: Filmic High Contrast, colorspace: Filmic Log Encoding, look: +High Contrast}
# - !<View> {name: Filmic Medium High Contrast, colorspace: Filmic Log Encoding, look: +Medium High Contrast}
# - !<View> {name: Filmic Very Low Contrast, colorspace: Filmic Log Encoding, look: +Very Low Contrast}
# - !<View> {name: Filmic Medium Low Contrast, colorspace: Filmic Log Encoding, look: +Medium Low Contrast}
# - !<View> {name: Filmic Low Contrast, colorspace: Filmic Log Encoding, look: +Low Contrast}
# - !<View> {name: Filmic Base Contrast, colorspace: Filmic Log Encoding, look: +Base Contrast}
# - !<View> {name: Filmic False Colour, colorspace: Filmic Log Encoding, look: +False Colour}
# - !<View> {name: Debug, colorspace: Debug}
active_displays: [sRGB, BT.1886, Apple Display P3, None]
#active_views: [Filmic Log Encoding Base, sRGB OETF, Non-Colour Data, Linear Raw, No View]
@@ -69,22 +59,7 @@ colorspaces:
ITU BT.709 primaries based scene referred linear space.
isdata: false
allocation: lg2
allocationvars: [-10.0, 10.0, 0.00392156862]
# - !<ColorSpace>
# name: Debug
# family:
# equalitygroup:
# bitdepth: 32f
# description: |
# Debug purposes only. Do not use.
# isdata: false
# allocation: lg2
# allocationvars: [-10.0, 10.0, 0.00392156862]
# from_reference: !<GroupTransform>
# children:
# - !<AllocationTransform> {allocation: lg2, vars: [-10.0, 10.0, 0.00392156862]} #[-12.473931188, 7.526068812]}
# - !<AllocationTransform> {allocation: uniform, vars: [0, 0.66]} #0.825
allocationvars: [-12.4739311883, 12.5260688117, 0.00392156862]
- !<ColorSpace>
name: Filmic Log Encoding
@@ -95,25 +70,13 @@ colorspaces:
Log based filmic shaper with 16.5 stops of latitude, and 25 stops of dynamic range.
isdata: false
allocation: lg2
allocationvars: [-10.0, 10.0, 0.00392156862]
allocationvars: [-12.4739311883, 12.5260688117, 0.00392156862]
from_reference: !<GroupTransform>
children:
- !<AllocationTransform> {allocation: lg2, vars: [-10.0, 10.0, 0.00392156862]}
- !<AllocationTransform> {allocation: lg2, vars: [-12.4739311883, 12.5260688117, 0.00392156862]}
- !<FileTransform> {src: desat65cube.spi3d, interpolation: best}
- !<AllocationTransform> {allocation: uniform, vars: [0, 0.66]}
to_reference: !<AllocationTransform> {allocation: lg2, vars: [-10, 6.5, 0.00392156862], direction: inverse}
# - !<ColorSpace>
# name: Desat Log Encoding
# family:
# equalitygroup:
# bitdepth: 32f
# description: |
# Desaturation transform for proper crosstalk. Not intended for use.
# isdata: false
# allocation: lg2
# allocationvars: [-10.0, 10.0, 0.00392156862]
# to_reference: !<AllocationTransform> {allocation: lg2, vars: [-10.0, 10.0, 0.00392156862], direction: inverse}
to_reference: !<AllocationTransform> {allocation: lg2, vars: [-12.4739311883, 4.02606881167, 0.00392156862], direction: inverse}
- !<ColorSpace>
name: sRGB OETF
@@ -134,7 +97,7 @@ colorspaces:
bitdepth: 32f
isdata: false
allocation: lg2
allocationvars: [-10.0, 10.0, 0.00392156862]
allocationvars: [-12.4739311883, 12.5260688117, 0.00392156862]
to_reference: !<GroupTransform>
children:
- !<MatrixTransform> {matrix: [0.515121, 0.291977, 0.157104, 0, 0.241196, 0.692245, 0.0665741, 0, -0.00105286, 0.0418854, 0.784073, 0, 0, 0, 0, 1]}
@@ -177,7 +140,7 @@ colorspaces:
Log based filmic shaper with 16.5 stops of latitude, and 25 stops of dynamic range with Apple P3 primaries.
isdata: false
allocation: lg2
allocationvars: [-10.0, 10.0, 0.00392156862]
allocationvars: [-12.4739311883, 12.5260688117, 0.00392156862]
from_reference: !<GroupTransform>
children:
- !<ColorSpaceTransform> {src: Linear, dst: Filmic Log Encoding}
@@ -189,7 +152,7 @@ colorspaces:
- !<ExponentTransform> {value: [2.2, 2.2, 2.2, 1.0]}
- !<ColorSpaceTransform> {src: Apple DCI-P3 D65, dst: Linear}
- !<ExponentTransform> {value: [2.2, 2.2, 2.2, 1.0], direction: inverse}
- !<AllocationTransform> {allocation: lg2, vars: [-10.0, 6.5, 0.00392156862], direction: inverse}
- !<AllocationTransform> {allocation: lg2, vars: [-12.4739311883, 4.02606881167, 0.00392156862], direction: inverse}
- !<ColorSpace>
name: BT.1886 Filmic Log Encoding
@@ -200,7 +163,7 @@ colorspaces:
Log based filmic shaper with 16.5 stops of latitude, and 25 stops of dynamic range with REC.709 primaries.
isdata: false
allocation: lg2
allocationvars: [-10.0, 10.0, 0.00392156862]
allocationvars: [-12.4739311883, 12.5260688117, 0.00392156862]
from_reference: !<GroupTransform>
children:
- !<ColorSpaceTransform> {src: Linear, dst: Filmic Log Encoding}
@@ -210,7 +173,7 @@ colorspaces:
children:
- !<ExponentTransform> {value: [2.4, 2.4, 2.4, 1.0]}
- !<ExponentTransform> {value: [2.2, 2.2, 2.2, 1.0], direction: inverse}
- !<AllocationTransform> {allocation: lg2, vars: [-10.0, 10.0, 0.00392156862], direction: inverse}
- !<AllocationTransform> {allocation: lg2, vars: [-12.4739311883, 4.02606881167, 0.00392156862], direction: inverse}
- !<ColorSpace>
name: Fuji F-Log OETF