[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50381] branches/soc-2011-tomato/release/ datafiles/colormanagement: Color Management: OpenCOlorIO configuration file cleanup
Sergey Sharybin
sergey.vfx at gmail.com
Tue Sep 4 14:32:25 CEST 2012
Revision: 50381
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50381
Author: nazgul
Date: 2012-09-04 12:32:25 +0000 (Tue, 04 Sep 2012)
Log Message:
-----------
Color Management: OpenCOlorIO configuration file cleanup
- Remove unused color space and LUTs/matrices
There were couple of spaces for specific cameras which are unlikely
be used by general blender users. Think better to keep this things
as clean as possible for official builds, it could easily be extended
for some specific pipeline.
- Move rec709 view to it's own display. Such way makes more sense.
Probably it'll actually make sense to remove p3dci and rec709
displays from default configuration. Not sure how often such a
displays are used by blender users.
XYZ display could still be useful to help generating DCP.
- Reshuffled views a bit. Added Default view to most of displays which
is default sRGB transformation for sRGB display, ACES -> CIE XYZ for
XYZ display.
Should make things a bit clearer for understanding.
Modified Paths:
--------------
branches/soc-2011-tomato/release/datafiles/colormanagement/config.ocio
Added Paths:
-----------
branches/soc-2011-tomato/release/datafiles/colormanagement/luts/aces_to_xyz.spimtx
branches/soc-2011-tomato/release/datafiles/colormanagement/luts/dci_xyz.spi1d
Removed Paths:
-------------
branches/soc-2011-tomato/release/datafiles/colormanagement/luts/adx_adx16_to_cdd.spimtx
branches/soc-2011-tomato/release/datafiles/colormanagement/luts/adx_cid_to_rle.py
branches/soc-2011-tomato/release/datafiles/colormanagement/luts/logc800.py
branches/soc-2011-tomato/release/datafiles/colormanagement/luts/logc800.spi1d
branches/soc-2011-tomato/release/datafiles/colormanagement/luts/logc_to_aces.spimtx
branches/soc-2011-tomato/release/datafiles/colormanagement/luts/rrt_ut33_p3d60.spi3d
branches/soc-2011-tomato/release/datafiles/colormanagement/luts/slog.py
branches/soc-2011-tomato/release/datafiles/colormanagement/luts/slog.spi1d
branches/soc-2011-tomato/release/datafiles/colormanagement/luts/slog10.spi1d
branches/soc-2011-tomato/release/datafiles/colormanagement/luts/slog2.py
branches/soc-2011-tomato/release/datafiles/colormanagement/luts/slogf35_to_aces.spimtx
branches/soc-2011-tomato/release/datafiles/colormanagement/luts/slogf65_to_aces_3200.spimtx
branches/soc-2011-tomato/release/datafiles/colormanagement/luts/slogf65_to_aces_5500.spimtx
branches/soc-2011-tomato/release/datafiles/colormanagement/luts/ten_bit_scale.spimtx
branches/soc-2011-tomato/release/datafiles/colormanagement/luts/xyz_dci.spi1d
Modified: branches/soc-2011-tomato/release/datafiles/colormanagement/config.ocio
===================================================================
--- branches/soc-2011-tomato/release/datafiles/colormanagement/config.ocio 2012-09-04 12:32:18 UTC (rev 50380)
+++ branches/soc-2011-tomato/release/datafiles/colormanagement/config.ocio 2012-09-04 12:32:25 UTC (rev 50381)
@@ -14,25 +14,28 @@
sequencer: vd16
displays:
- p3dci:
- - !<View> {name: Raw, colorspace: raw}
- - !<View> {name: Log, colorspace: adx10}
- - !<View> {name: RRT, colorspace: rrt_p3dci}
sRGB:
- - !<View> {name: Gamma2.2, colorspace: sRGB}
- - !<View> {name: Raw, colorspace: raw}
+ - !<View> {name: Default, colorspace: sRGB}
- !<View> {name: RRT, colorspace: rrt_srgb}
- !<View> {name: Film, colorspace: srgb8}
+ - !<View> {name: Raw, colorspace: raw}
- !<View> {name: Log, colorspace: lg10}
- - !<View> {name: rec709, colorspace: nuke_rec709}
- xyz:
+ P3DCI:
+ - !<View> {name: RRT, colorspace: rrt_p3dci}
- !<View> {name: Raw, colorspace: raw}
- !<View> {name: Log, colorspace: adx10}
+ Rec709:
+ - !<View> {name: Default, colorspace: nuke_rec709}
+ - !<View> {name: RRT, colorspace: rrt_rec709}
+ XYZ:
+ - !<View> {name: Default, colorspace: xyz}
- !<View> {name: RRT, colorspace: rrt_xyz}
- - !<View> {name: DCI, colorspace: xyz_DCI}
+ - !<View> {name: DCI, colorspace: dci_xyz}
+ - !<View> {name: Raw, colorspace: raw}
+ - !<View> {name: Log, colorspace: adx10}
-active_displays: [sRGB, p3dci, xyz]
-active_views: [Gamma2.2, RRT, Log, Film, Log, Raw, rec709]
+active_displays: [sRGB, P3DCI, Rec709, XYZ]
+active_views: [Default, RRT, Raw, Log]
colorspaces:
- !<ColorSpace>
@@ -73,119 +76,47 @@
- !<FileTransform> {src: adx_exp_to_aces.spimtx}
- !<ColorSpace>
- name: adx16
- family: adx
+ name: rec709
+ family:
equalitygroup:
- bitdepth: 16ui
+ bitdepth: 32f
description: |
- Film Scan, using the 16-bit Academy Density Encoding
-
+ Rec. 709 (Full Range), Blender native internal space
isdata: false
allocation: uniform
- allocationvars: [0, 1]
- to_reference: !<GroupTransform>
- children:
- - !<FileTransform> {src: adx_adx16_to_cdd.spimtx}
- - !<FileTransform> {src: adx_cdd_to_cid.spimtx}
- - !<FileTransform> {src: adx_cid_to_rle.spi1d, interpolation: linear}
- - !<LogTransform> {base: 10, direction: inverse}
- - !<FileTransform> {src: adx_exp_to_aces.spimtx}
+ allocationvars: [-0.125, 1.125]
+ to_reference: !<FileTransform> {src: rec709_to_aces.spimtx, interpolation: nearest}
- !<ColorSpace>
- name: slogf35
- family: sony
+ name: rrt_srgb
+ family: rrt
equalitygroup:
- bitdepth: 10ui
- description: |
- Sony 10-bit S-Log, with f35 color primaries
-
- isdata: false
- allocation: uniform
- allocationvars: [0, 1]
- to_reference: !<GroupTransform>
- children:
- - !<FileTransform> {src: slog10.spi1d, interpolation: linear}
- - !<FileTransform> {src: slogf35_to_aces.spimtx, interpolation: linear}
-
- - !<ColorSpace>
- name: slogf65_3200
- family: sony
- equalitygroup:
- bitdepth: 10ui
- description: |
- Sony 10-bit S-Log, with f65 color primaries
-
- isdata: false
- allocation: uniform
- allocationvars: [0, 1]
- to_reference: !<GroupTransform>
- children:
- - !<FileTransform> {src: slog10.spi1d, interpolation: linear}
- - !<FileTransform> {src: slogf65_to_aces_3200.spimtx, interpolation: linear}
-
- - !<ColorSpace>
- name: slogf65_5500
- family: sony
- equalitygroup:
- bitdepth: 10ui
- description: |
- Sony 10-bit S-Log, with f65 color primaries
-
- isdata: false
- allocation: uniform
- allocationvars: [0, 1]
- to_reference: !<GroupTransform>
- children:
- - !<FileTransform> {src: slog10.spi1d, interpolation: linear}
- - !<FileTransform> {src: slogf65_to_aces_5500.spimtx, interpolation: linear}
-
- - !<ColorSpace>
- name: logc
- family: arri
- equalitygroup:
- bitdepth: 10ui
- description: |
- Arri Alexa LogC, V3, Exposure Index 800
-
- isdata: false
- allocation: uniform
- allocationvars: [0, 1]
- to_reference: !<GroupTransform>
- children:
- - !<FileTransform> {src: logc800.spi1d, interpolation: linear}
- - !<FileTransform> {src: logc_to_aces.spimtx}
-
- - !<ColorSpace>
- name: log
- family: log
- equalitygroup:
bitdepth: 32f
- description: |
- A mathematically idealized log space, which spans the dynamic range
- currently being utilized by the ACES RRT. Note: this does not correspond
- to scanned plates, adx10 is preferred for that purpose.
-
isdata: false
allocation: uniform
allocationvars: [0, 1]
from_reference: !<GroupTransform>
children:
- !<AllocationTransform> {allocation: lg2, vars: [-8.5, 5]}
+ - !<FileTransform> {src: rrt_ut33_sRGB.spi3d, interpolation: tetrahedral}
- !<ColorSpace>
- name: rec709
- family: ""
- equalitygroup: ""
+ name: nuke_rec709
+ family:
+ equalitygroup:
bitdepth: 32f
description: |
- Rec. 709 (Full Range), Blender native internal space
+ Rec. 709 (Full Range) Display Space
isdata: false
allocation: uniform
allocationvars: [-0.125, 1.125]
- to_reference: !<FileTransform> {src: rec709_to_aces.spimtx, interpolation: nearest}
+ to_reference: !<GroupTransform>
+ children:
+ - !<FileTransform> {src: rec709.spi1d, interpolation: linear}
+ - !<FileTransform> {src: rec709_to_aces.spimtx, interpolation: nearest}
- !<ColorSpace>
- name: rrt_srgb
+ name: rrt_rec709
family: rrt
equalitygroup:
bitdepth: 32f
@@ -195,10 +126,10 @@
from_reference: !<GroupTransform>
children:
- !<AllocationTransform> {allocation: lg2, vars: [-8.5, 5]}
- - !<FileTransform> {src: rrt_ut33_sRGB.spi3d, interpolation: tetrahedral}
+ - !<FileTransform> {src: rrt_ut33_rec709.spi3d, interpolation: tetrahedral}
- !<ColorSpace>
- name: rrt_rec709
+ name: rrt_p3dci
family: rrt
equalitygroup:
bitdepth: 32f
@@ -208,11 +139,11 @@
from_reference: !<GroupTransform>
children:
- !<AllocationTransform> {allocation: lg2, vars: [-8.5, 5]}
- - !<FileTransform> {src: rrt_ut33_rec709.spi3d, interpolation: tetrahedral}
+ - !<FileTransform> {src: rrt_ut33_p3dci.spi3d, interpolation: tetrahedral}
- !<ColorSpace>
- name: rrt_p3dci
- family: rrt
+ name: xyz
+ family:
equalitygroup:
bitdepth: 32f
isdata: false
@@ -220,11 +151,10 @@
allocationvars: [0, 1]
from_reference: !<GroupTransform>
children:
- - !<AllocationTransform> {allocation: lg2, vars: [-8.5, 5]}
- - !<FileTransform> {src: rrt_ut33_p3dci.spi3d, interpolation: tetrahedral}
+ - !<FileTransform> {src: aces_to_xyz.spimtx, interpolation: linear}
- !<ColorSpace>
- name: rrt_p3d60
+ name: rrt_xyz
family: rrt
equalitygroup:
bitdepth: 32f
@@ -234,22 +164,24 @@
from_reference: !<GroupTransform>
children:
- !<AllocationTransform> {allocation: lg2, vars: [-8.5, 5]}
- - !<FileTransform> {src: rrt_ut33_p3d60.spi3d, interpolation: tetrahedral}
+ - !<FileTransform> {src: rrt_ut33_dcdm.spi3d, interpolation: tetrahedral}
- !<ColorSpace>
- name: rrt_xyz
- family: rrt
+ name: dci_xyz
+ family:
equalitygroup:
- bitdepth: 32f
+ bitdepth: 16f
+ description: |
+ OpenDCP output LUT with DCI reference white and Gamma 2.6
isdata: false
allocation: uniform
allocationvars: [0, 1]
from_reference: !<GroupTransform>
children:
- - !<AllocationTransform> {allocation: lg2, vars: [-8.5, 5]}
- - !<FileTransform> {src: rrt_ut33_dcdm.spi3d, interpolation: tetrahedral}
+ - !<FileTransform> {src: rec709_to_aces.spimtx, interpolation: linear, direction: inverse}
+ - !<FileTransform> {src: srgb_to_xyz.spimtx, interpolation: linear}
+ - !<FileTransform> {src: dci_xyz.spi1d, interpolation: linear}
- # spi-vfx
- !<ColorSpace>
name: lg10
family: lg
@@ -278,26 +210,10 @@
- !<ColorSpaceTransform> {src: aces, dst: lg10}
- !<FileTransform> {src: spi_ocio_srgb_test.spi3d, interpolation: linear}
- # nuke-default
- !<ColorSpace>
- name: nuke_rec709
- family: ""
- equalitygroup: ""
- bitdepth: 32f
- description: |
- Rec. 709 (Full Range) Display Space
- isdata: false
- allocation: uniform
- allocationvars: [-0.125, 1.125]
- to_reference: !<GroupTransform>
- children:
- - !<FileTransform> {src: rec709.spi1d, interpolation: linear}
- - !<FileTransform> {src: rec709_to_aces.spimtx, interpolation: nearest}
-
- - !<ColorSpace>
name: sRGB
- family: ""
- equalitygroup: ""
+ family:
+ equalitygroup:
bitdepth: 32f
description: |
Standard RGB Display Space
@@ -322,35 +238,3 @@
children:
- !<FileTransform> {src: vd16.spi1d, interpolation: nearest}
- !<FileTransform> {src: rec709_to_aces.spimtx, interpolation: linear}
-
- - !<ColorSpace>
- name: Gamma2.2
- family: ""
- equalitygroup: ""
- bitdepth: 32f
- description: |
- Emulates a idealized Gamma 2.2 display device.
- isdata: false
- allocation: uniform
- allocationvars: [0, 1]
- to_reference: !<GroupTransform>
- children:
- #- !<FileTransform> {src: rec709.spi1d, interpolation: linear}
- - !<ExponentTransform> {value: [2.2, 2.2, 2.2, 1]}
- - !<FileTransform> {src: rec709_to_aces.spimtx, interpolation: linear}
-
- - !<ColorSpace>
- name: xyz_DCI
- family: ""
- equalitygroup: ""
- bitdepth: 16f
- description: |
- OpenDCP output LUT with DCI reference white and Gamma 2.6
- isdata: false
- allocation: uniform
- allocationvars: [0, 1]
- from_reference: !<GroupTransform>
- children:
- - !<FileTransform> {src: rec709_to_aces.spimtx, interpolation: linear, direction: inverse}
- - !<FileTransform> {src: srgb_to_xyz.spimtx, interpolation: linear}
- - !<FileTransform> {src: xyz_dci.spi1d, interpolation: linear}
Added: branches/soc-2011-tomato/release/datafiles/colormanagement/luts/aces_to_xyz.spimtx
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list