[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50521] branches/soc-2011-tomato: Color Management: color space cleanup

Sergey Sharybin sergey.vfx at gmail.com
Tue Sep 11 11:07:46 CEST 2012


Revision: 50521
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50521
Author:   nazgul
Date:     2012-09-11 09:07:46 +0000 (Tue, 11 Sep 2012)
Log Message:
-----------
Color Management: color space cleanup

Hide all meaningless for Blender input color spaces and made naming
for rest of them to match Blender's interface better.

Not sure if we'll need to support logarithmic color space as input.

Renamed P3DCI to DCI-P3 which seems to be more common naming.

Also added Film view for DCI-P3 display.

Modified Paths:
--------------
    branches/soc-2011-tomato/release/datafiles/colormanagement/config.ocio
    branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c

Added Paths:
-----------
    branches/soc-2011-tomato/release/datafiles/colormanagement/luts/colorworks_filmlg_to_p3.3dl

Modified: branches/soc-2011-tomato/release/datafiles/colormanagement/config.ocio
===================================================================
--- branches/soc-2011-tomato/release/datafiles/colormanagement/config.ocio	2012-09-11 07:56:47 UTC (rev 50520)
+++ branches/soc-2011-tomato/release/datafiles/colormanagement/config.ocio	2012-09-11 09:07:46 UTC (rev 50521)
@@ -11,53 +11,54 @@
 description: RRT version ut33
 
 roles:
-  reference: aces
+  reference: Linear ACES
 
   # Internal scene linear space
-  scene_linear: rec709
+  scene_linear: Linear
 
   # Default color space for byte image
   default_byte: sRGB
 
   # Default color space for float images
-  default_float: rec709
+  default_float: Linear
 
   # Default color space sequencer is working in
   default_sequencer: sRGB
 
   # Color spaces for color picking and exture painting (not internally supported yet)
-  color_picking: raw
-  texture_paint: raw
+  color_picking: Raw
+  texture_paint: Raw
 
 displays:
   sRGB:
     - !<View> {name: Default, colorspace: sRGB}
     - !<View> {name: RRT, colorspace: rrt_srgb}
     - !<View> {name: Film, colorspace: srgb8}
-    - !<View> {name: Raw, colorspace: raw}
+    - !<View> {name: Raw, colorspace: Raw}
     - !<View> {name: Log, colorspace: lg10}
-  P3DCI:
+  DCI-P3:
     - !<View> {name: RRT, colorspace: rrt_p3dci}
-    - !<View> {name: Raw, colorspace: raw}
+    - !<View> {name: Film, colorspace: p3dci8}
+    - !<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: Default, colorspace: XYZ}
     - !<View> {name: RRT, colorspace: rrt_xyz}
     - !<View> {name: DCI, colorspace: dci_xyz}
-    - !<View> {name: Raw, colorspace: raw}
+    - !<View> {name: Raw, colorspace: Raw}
     - !<View> {name: Log, colorspace: adx10}
   None:
     - !<View> {name: Default, colorspace: raw}
 
-active_displays: [sRGB, P3DCI, Rec709, XYZ, None]
+active_displays: [sRGB, DCIP3, Rec709, XYZ, None]
 active_views: [Default, RRT, Raw, Log]
 
 colorspaces:
   - !<ColorSpace>
-    name: aces
+    name: Linear ACES
     family: aces
     equalitygroup:
     bitdepth: 32f
@@ -66,7 +67,7 @@
     allocationvars: [-8.5, 5]
 
   - !<ColorSpace>
-    name: raw
+    name: Raw
     family: raw
     equalitygroup:
     bitdepth: 32f
@@ -76,7 +77,7 @@
 
   - !<ColorSpace>
     name: adx10
-    family: adx
+    family: display
     equalitygroup:
     bitdepth: 10ui
     description: |
@@ -94,12 +95,12 @@
         - !<FileTransform> {src: adx_exp_to_aces.spimtx}
 
   - !<ColorSpace>
-    name: rec709
+    name: Linear
     family:
     equalitygroup:
     bitdepth: 32f
     description: |
-      Rec. 709 (Full Range), Blender native internal space
+      Rec. 709 (Full Range), Blender native linear space
     isdata: false
     allocation: uniform
     allocationvars: [-0.125, 1.125]
@@ -160,7 +161,7 @@
         - !<FileTransform> {src: rrt_ut33_p3dci.spi3d, interpolation: tetrahedral}
 
   - !<ColorSpace>
-    name: xyz
+    name: XYZ
     family:
     equalitygroup:
     bitdepth: 32f
@@ -202,11 +203,11 @@
 
   - !<ColorSpace>
     name: lg10
-    family: lg
+    family: display
     equalitygroup:
     bitdepth: 10ui
     description: |
-      lg10 : conversion from film log
+      conversion from film log
     isdata: false
     allocation: uniform
     to_reference: !<GroupTransform>
@@ -220,12 +221,12 @@
     equalitygroup:
     bitdepth: 8ui
     description: |
-      srgb8 :rgb display space for the srgb standard.
+      RGB display space for the sRGB standard.
     isdata: false
     allocation: uniform
     from_reference: !<GroupTransform>
       children:
-        - !<ColorSpaceTransform> {src: aces, dst: lg10}
+        - !<ColorSpaceTransform> {src: Linear ACES, dst: lg10}
         - !<FileTransform> {src: spi_ocio_srgb_test.spi3d, interpolation: linear}
 
   - !<ColorSpace>
@@ -244,12 +245,12 @@
         - !<FileTransform> {src: rec709_to_aces.spimtx, interpolation: nearest}
 
   - !<ColorSpace>
-    name: vd16
+    name: VD16
     family: vd
     equalitygroup:
     bitdepth: 16ui
     description: |
-      vd16 : The simple video conversion from a gamma 2.2 srgb space
+      The simple video conversion from a gamma 2.2 sRGB space
     isdata: false
     allocation: uniform
     to_reference: !<GroupTransform>
@@ -267,3 +268,17 @@
     isdata: true
     allocation: uniform
     allocationvars: [0, 1]
+
+  - !<ColorSpace>
+    name: p3dci8
+    family: display
+    equalitygroup:
+    bitdepth: 8ui
+    description: |
+      p3dci8 :rgb display space for gamma 2.6 P3 projection.
+    isdata: false
+    allocation: uniform
+    from_reference: !<GroupTransform>
+      children:
+        - !<ColorSpaceTransform> {src: Linear ACES, dst: lg10}
+        - !<FileTransform> {src: colorworks_filmlg_to_p3.3dl, interpolation: linear}

Added: branches/soc-2011-tomato/release/datafiles/colormanagement/luts/colorworks_filmlg_to_p3.3dl
===================================================================
--- branches/soc-2011-tomato/release/datafiles/colormanagement/luts/colorworks_filmlg_to_p3.3dl	                        (rev 0)
+++ branches/soc-2011-tomato/release/datafiles/colormanagement/luts/colorworks_filmlg_to_p3.3dl	2012-09-11 09:07:46 UTC (rev 50521)
@@ -0,0 +1,4916 @@
+# Autodesk 3D Export from Truelight v3.0
+    0   64  128  192  256  320  384  448  512  576  640  704  768  832  896  960 1023
+    0    0    0
+    0    0    0
+    0    0    0
+    0    0    0
+    0    0  100
+    0    0  274
+    0    0  608
+    0    0  785
+    0    0 1010
+    0    0 1183
+    0    0 1349
+    0    0 1471
+    0    0 1638
+    0    0 1854
+    0   65 1989
+    0  451 2073
+    0  722 2132
+    0    0    0
+    0    0    0
+    0    0    0
+    0    0    0
+    0    0  303
+    0    0  419
+    0    0  656
+    0    0  846
+    0    0 1071
+    0    0 1250
+    0    0 1419
+    0    0 1549
+    0    0 1714
+    0    0 1920
+    0  146 2048
+    0  543 2129
+    0  820 2186
+    0    0    0
+    0    0    0
+    0    0    0
+    0    0  187
+    0   15  337
+    0   64  462
+    0  110  709
+    0  137  910
+    0   54 1141
+    0  140 1323
+    0    0 1500
+    0   21 1637
+    0  200 1797
+    0  470 1986
+    0  658 2106
+    0  813 2183
+    0  922 2238
+    0   13    0
+    0   82    0
+    0  134    0
+    0  132  235
+    0  199  382
+    0  224  503
+    0  275  764
+    0  306  981
+    0  304 1215
+    0  336 1407
+    0  293 1596
+    0  297 1733
+    0  478 1887
+    0  698 2060
+    0  847 2172
+    0  953 2246
+    0 1026 2297
+    0  209    0
+    0  250    0
+    0  277  194
+    0  283  274
+    0  314  420
+    0  353  552
+    0  396  822
+    0  438 1050
+    0  458 1290
+    0  491 1488
+    0  493 1691
+    0  519 1824
+    0  631 1965
+    0  837 2125
+    0  974 2234
+    0 1060 2301
+    0 1120 2349
+    0  283    0
+    0  349  133
+    0  381  230
+    0  374  307
+    0  423  467
+    0  444  600
+    0  513  884
+    0  560 1135
+    0  597 1382
+    0  635 1589
+    0  663 1806
+    0  695 1940
+    0  794 2067
+    0  985 2214
+    0 1105 2307
+    0 1180 2364
+    0 1232 2405
+    0  541    0
+    0  567  211
+    0  599  297
+    0  612  366
+    0  657  537
+    0  692  692
+    0  741  972
+    0  789 1230
+    0  827 1487
+    0  871 1702
+    0  913 1916
+    0  946 2055
+    0 1029 2178
+    0 1178 2303
+    0 1271 2382
+    0 1329 2431
+    0 1370 2465
+    0  688    0
+    0  718  268
+    0  746  339
+    0  764  408
+    0  816  589
+    0  865  753
+    0  935 1052
+    0  995 1324
+    0 1046 1595
+    0 1094 1814
+    0 1142 2037
+    0 1172 2173
+    0 1238 2283
+    0 1354 2387
+    0 1434 2455
+    0 1484 2497
+    0 1519 2527
+    0  934    0
+    0  955  310
+    0  985  400
+    0 1018  469
+    0 1064  643
+    0 1117  831
+    0 1200 1141
+    0 1267 1425
+    0 1334 1721
+    0 1379 1936
+    0 1437 2154
+    0 1454 2293
+    0 1504 2395
+    0 1577 2473
+    0 1631 2527
+    0 1670 2565
+    0 1698 2592
+    0 1117    0
+    0 1142  341
+    0 1173  435
+    0 1210  510
+    0 1256  689
+    0 1311  885
+    0 1393 1206
+    0 1470 1498
+    0 1545 1799
+    0 1594 2023
+    0 1649 2233
+    0 1673 2377
+    0 1710 2480
+    0 1767 2556
+    0 1803 2603
+    0 1825 2632
+    0 1845 2654
+    0 1309  125
+    0 1326  356
+    0 1357  457
+    0 1397  541
+    0 1443  720
+    0 1503  922
+    0 1593 1264
+    0 1677 1570
+    0 1760 1877
+    0 1804 2104
+    0 1850 2318
+    0 1875 2459
+    0 1903 2558
+    0 1938 2626
+    0 1960 2668
+    0 1973 2694
+    0 1987 2714
+    0 1399  171
+    0 1421  375
+    0 1450  478
+    0 1487  570
+    0 1540  771
+    0 1603  976
+    0 1692 1312
+    0 1776 1619
+    0 1849 1918
+    0 1897 2144
+    0 1943 2359
+    0 1969 2493
+    0 1995 2592
+    0 2027 2659
+    0 2048 2701
+    0 2061 2728
+    0 2071 2746
+    0 1496  237
+    0 1525  435
+    0 1558  553
+    0 1595  666
+    0 1657  898
+    0 1715 1099
+    0 1804 1426
+    0 1882 1722
+    0 1949 2011
+    0 1993 2226
+    0 2035 2428
+    0 2062 2551
+    0 2087 2636
+    0 2118 2701
+    0 2138 2744
+    0 2151 2770
+    0 2159 2788
+    0 1593  308
+    0 1628  505
+    0 1670  650
+    0 1711  789
+    0 1778 1055
+    0 1835 1260
+    0 1918 1572
+    0 1989 1851
+    0 2049 2127
+    0 2090 2329
+    0 2124 2509
+    0 2152 2617
+    0 2177 2702
+    0 2205 2749
+    0 2224 2790
+    0 2237 2816
+    0 2246 2835
+    0 1653  352
+    0 1693  549
+    0 1740  711
+    0 1784  866
+    0 1851 1140
+    0 1912 1367
+    0 1991 1667
+    0 2058 1939
+    0 2111 2199
+    0 2150 2394
+    0 2180 2560
+    0 2208 2664
+    0 2234 2743
+    0 2261 2790
+    0 2278 2819
+    0 2291 2846
+    0 2300 2864
+    0 1692  380
+    0 1734  577
+    0 1784  750
+    0 1831  915
+    0 1898 1195
+    0 1961 1435
+    0 2038 1727
+    0 2102 1996
+    0 2153 2249
+    0 2189 2435
+    0 2216 2594
+    0 2244 2697
+    0 2270 2769
+    0 2297 2816
+    0 2315 2846
+    0 2325 2864
+    0 2334 2883
+    0 1720  400
+    0 1763  597
+    0 1816  778
+    0 1864  950
+    0 1932 1234
+    0 1996 1484
+    0 2071 1771
+    0 2134 2037
+    0 2184 2287
+    0 2217 2468
+    0 2244 2623
+    0 2269 2720
+    0 2296 2788
+    0 2323 2835
+    0 2341 2865
+    0 2351 2883
+    0 2359 2896
+    0    0    0
+    0    0    0
+    0    0    0
+    0    0    0
+    0    0  262
+    0    0  380
+    0    0  627
+    0    0  807
+    0    0 1028
+    0    0 1205
+    0    0 1371
+    0    0 1498

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list