X-Git-Url: http://users.mur.at/ms/git/gitweb/?a=blobdiff_plain;ds=sidebyside;f=iif%2Fconfig.ocio;h=aad8e142db16a664d5921240a899671a28ce5c2e;hb=refs%2Ftags%2Fv1.0_r1;hp=52bc6bd6d33341aa248446cf024980ea3bd6c450;hpb=12b9eac4211dfe0b5d63ceea281ffacf1ce7142b;p=OpenColorIO-Configs.git

diff --git a/iif/config.ocio b/iif/config.ocio
index 52bc6bd..aad8e14 100644
--- a/iif/config.ocio
+++ b/iif/config.ocio
@@ -4,7 +4,7 @@ search_path: luts
 strictparsing: true
 luma: [0.2126, 0.7152, 0.0722]
 
-description: "RRT version ut11"
+description: RRT version ut33
 
 roles:
   color_picking: raw
@@ -12,14 +12,16 @@ roles:
   compositing_log: adx10
   data: raw
   default: raw
+  matte_paint: raw
   reference: aces
   scene_linear: aces
+  texture_paint: raw
 
 displays:
-  p3d60:
+  p3dci:
     - !<View> {name: Raw, colorspace: raw}
     - !<View> {name: Log, colorspace: adx10}
-    - !<View> {name: RRT, colorspace: rrt_p3d60}
+    - !<View> {name: RRT, colorspace: rrt_p3dci}
   sRGB:
     - !<View> {name: Raw, colorspace: raw}
     - !<View> {name: Log, colorspace: adx10}
@@ -29,7 +31,7 @@ displays:
     - !<View> {name: Log, colorspace: adx10}
     - !<View> {name: RRT, colorspace: rrt_xyz}
 
-active_displays: [sRGB, p3d60, xyz]
+active_displays: [sRGB, p3dci, xyz]
 active_views: [RRT, Log, Raw]
 
 colorspaces:
@@ -43,23 +45,83 @@ colorspaces:
     allocationvars: [-8.5, 5]
 
   - !<ColorSpace>
+    name: raw
+    family: raw
+    equalitygroup: 
+    bitdepth: 32f
+    isdata: true
+    allocation: uniform
+    allocationvars: [0, 1]
+
+  - !<ColorSpace>
     name: adx10
     family: adx
     equalitygroup: 
     bitdepth: 10ui
+    description: |
+      Film Scan, using the 10-bit Academy Density Encoding
+      
+    isdata: false
+    allocation: uniform
+    allocationvars: [0, 1]
+    to_reference: !<GroupTransform>
+      children:
+        - !<FileTransform> {src: adx_adx10_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}
+
+  - !<ColorSpace>
+    name: adx16
+    family: adx
+    equalitygroup: 
+    bitdepth: 16ui
+    description: |
+      Film Scan, using the 16-bit Academy Density Encoding
+      
     isdata: false
     allocation: uniform
     allocationvars: [0, 1]
     to_reference: !<GroupTransform>
       children:
-        - !<FileTransform> {src: channel_dependent_offset.spimtx, interpolation: linear}
-        - !<FileTransform> {src: ten_bit_scale.spimtx, interpolation: linear}
-        - !<FileTransform> {src: channel_dependent_scalar.spimtx, interpolation: linear}
-        - !<FileTransform> {src: cdd_to_cid.spimtx, interpolation: linear}
-        - !<FileTransform> {src: rel_log_exp_scalar.spimtx, interpolation: linear}
-        - !<FileTransform> {src: refpt.spimtx, interpolation: linear}
+        - !<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: exp_to_aces.spimtx, interpolation: linear}
+        - !<FileTransform> {src: adx_exp_to_aces.spimtx}
+
+  - !<ColorSpace>
+    name: slog
+    family: slog
+    equalitygroup: 
+    bitdepth: 10ui
+    description: |
+      Sony 10-bit S-Log/S-Gamut cameras, such as the F35.
+      
+    isdata: false
+    allocation: uniform
+    allocationvars: [0, 1]
+    to_reference: !<GroupTransform>
+      children:
+        - !<FileTransform> {src: slog10.spi1d, interpolation: linear}
+        - !<FileTransform> {src: slog_to_aces.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
@@ -70,7 +132,7 @@ colorspaces:
       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]
@@ -89,10 +151,10 @@ colorspaces:
     from_reference: !<GroupTransform>
       children:
         - !<AllocationTransform> {allocation: lg2, vars: [-8.5, 5]}
-        - !<FileTransform> {src: rrt_ut11_srgb.spi3d, interpolation: linear}
+        - !<FileTransform> {src: spi_32_lattice_rrtut33_sRGB.spi3d, interpolation: linear}
 
   - !<ColorSpace>
-    name: rrt_p3d60
+    name: rrt_rec709
     family: rrt
     equalitygroup: 
     bitdepth: 32f
@@ -102,10 +164,10 @@ colorspaces:
     from_reference: !<GroupTransform>
       children:
         - !<AllocationTransform> {allocation: lg2, vars: [-8.5, 5]}
-        - !<FileTransform> {src: rrt_ut11_p3d60.spi3d, interpolation: linear}
+        - !<FileTransform> {src: spi_32_lattice_rrtut33_rec709.spi3d, interpolation: linear}
 
   - !<ColorSpace>
-    name: rrt_xyz
+    name: rrt_p3dci
     family: rrt
     equalitygroup: 
     bitdepth: 32f
@@ -115,13 +177,30 @@ colorspaces:
     from_reference: !<GroupTransform>
       children:
         - !<AllocationTransform> {allocation: lg2, vars: [-8.5, 5]}
-        - !<FileTransform> {src: rrt_ut11_dcdm.spi3d, interpolation: linear}
+        - !<FileTransform> {src: spi_32_lattice_rrtut33_p3dci.spi3d, interpolation: linear}
 
   - !<ColorSpace>
-    name: raw
-    family: raw
+    name: rrt_p3d60
+    family: rrt
     equalitygroup: 
     bitdepth: 32f
-    isdata: true
+    isdata: false
+    allocation: uniform
+    allocationvars: [0, 1]
+    from_reference: !<GroupTransform>
+      children:
+        - !<AllocationTransform> {allocation: lg2, vars: [-8.5, 5]}
+        - !<FileTransform> {src: spi_32_lattice_rrtut33_p3d60.spi3d, interpolation: linear}
+
+  - !<ColorSpace>
+    name: rrt_xyz
+    family: rrt
+    equalitygroup: 
+    bitdepth: 32f
+    isdata: false
     allocation: uniform
     allocationvars: [0, 1]
+    from_reference: !<GroupTransform>
+      children:
+        - !<AllocationTransform> {allocation: lg2, vars: [-8.5, 5]}
+        - !<FileTransform> {src: spi_32_lattice_rrtut33_smpte_rp.spi3d, interpolation: linear}