X-Git-Url: http://users.mur.at/ms/git/gitweb/?p=OpenColorIO-Configs.git;a=blobdiff_plain;f=aces_1.0.0%2Fconfig.ocio;h=59637dd9db232bc457c66fb663efaa72330fa70a;hp=cad616829bfccfad785280d7ef19fcc40dad77fa;hb=f35f56a24d1a4ef67aeebd51c6211425976370ab;hpb=17ca8bd58c0fb24dd81fe70169268d39525bdeb7

diff --git a/aces_1.0.0/config.ocio b/aces_1.0.0/config.ocio
index cad6168..59637dd 100644
--- a/aces_1.0.0/config.ocio
+++ b/aces_1.0.0/config.ocio
@@ -7,15 +7,15 @@ luma: [0.2126, 0.7152, 0.0722]
 description: An ACES config generated from python
 
 roles:
-  color_picking: ACES2065-1
-  color_timing: ACES2065-1
-  compositing_log: ACES2065-1
-  data: ACES2065-1
+  color_picking: ACEScg
+  color_timing: ACEScc
+  compositing_log: ACEScc
+  data: Raw
   default: ACES2065-1
-  matte_paint: ACES2065-1
-  reference: ACES2065-1
-  scene_linear: ACES2065-1
-  texture_paint: ACES2065-1
+  matte_paint: ACEScc
+  reference: Raw
+  scene_linear: ACEScg
+  texture_paint: Raw
 
 displays:
   DCDM:
@@ -359,12 +359,36 @@ colorspaces:
     to_reference: !<ColorSpaceTransform> {src: ACES 1.0 to 0.7 emulation, dst: ACES2065-1}
 
   - !<ColorSpace>
-    name: Output Shaper - AP1
+    name: Log2 Shaper
     family: Utility
-    equalitygroup: Output Shaper
+    equalitygroup: Log2 Shaper
     bitdepth: 32f
     description: |
-      The Output Shaper color space
+      The Log2 Shaper color space
+    isdata: false
+    allocation: uniform
+    allocationvars: [0, 1]
+    to_reference: !<FileTransform> {src: Output_Shaper_to_linear.spi1d, interpolation: linear}
+
+  - !<ColorSpace>
+    name: log2shaper
+    family: Aliases
+    equalitygroup: Log2 Shaper
+    bitdepth: 32f
+    description: |
+      The Log2 Shaper color space
+    isdata: false
+    allocation: uniform
+    allocationvars: [0, 1]
+    from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: Log2 Shaper}
+
+  - !<ColorSpace>
+    name: Log2 Shaper - AP1
+    family: Utility
+    equalitygroup: Log2 Shaper - AP1
+    bitdepth: 32f
+    description: |
+      The Log2 Shaper - AP1 color space
     isdata: false
     allocation: uniform
     allocationvars: [0, 1]
@@ -374,16 +398,64 @@ colorspaces:
         - !<MatrixTransform> {matrix: [0.695452, 0.140679, 0.163869, 0, 0.0447946, 0.859671, 0.0955343, 0, -0.00552588, 0.00402521, 1.0015, 0, 0, 0, 0, 1]}
 
   - !<ColorSpace>
-    name: outputshaper_ap1
+    name: log2shaper_ap1
     family: Aliases
-    equalitygroup: Output Shaper
+    equalitygroup: Log2 Shaper - AP1
     bitdepth: 32f
     description: |
-      The Output Shaper color space
+      The Log2 Shaper - AP1 color space
+    isdata: false
+    allocation: uniform
+    allocationvars: [0, 1]
+    from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: Log2 Shaper - AP1}
+
+  - !<ColorSpace>
+    name: Dolby PQ 10000
+    family: Utility
+    equalitygroup: Dolby PQ 10000
+    bitdepth: 32f
+    description: |
+      The Dolby PQ 10000 color space
+    isdata: false
+    allocation: uniform
+    allocationvars: [0, 1]
+    to_reference: !<FileTransform> {src: Dolby_PQ_10000_to_linear.spi1d, interpolation: linear}
+
+  - !<ColorSpace>
+    name: crv_dolbypq_10000
+    family: Aliases
+    equalitygroup: Dolby PQ 10000
+    bitdepth: 32f
+    description: |
+      The Dolby PQ 10000 color space
+    isdata: false
+    allocation: uniform
+    allocationvars: [0, 1]
+    from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: Dolby PQ 10000}
+
+  - !<ColorSpace>
+    name: Dolby PQ Scaled
+    family: Utility
+    equalitygroup: Dolby PQ Scaled
+    bitdepth: 32f
+    description: |
+      The Dolby PQ Scaled color space
+    isdata: false
+    allocation: uniform
+    allocationvars: [0, 1]
+    to_reference: !<FileTransform> {src: Dolby_PQ_Scaled_to_linear.spi1d, interpolation: linear}
+
+  - !<ColorSpace>
+    name: crv_dolbypq_scaled
+    family: Aliases
+    equalitygroup: Dolby PQ Scaled
+    bitdepth: 32f
+    description: |
+      The Dolby PQ Scaled color space
     isdata: false
     allocation: uniform
     allocationvars: [0, 1]
-    from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: Output Shaper - AP1}
+    from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: Dolby PQ Scaled}
 
   - !<ColorSpace>
     name: Linear - Wide Gamut
@@ -467,31 +539,31 @@ colorspaces:
     allocationvars: [0, 1]
 
   - !<ColorSpace>
-    name: Rec.709 - Legal
+    name: Rec.2020 - Full
     family: Output
     equalitygroup: ""
     bitdepth: 32f
     description: |
-      ACES 1.0 Output - Rec.709 - Legal Output Transform
+      ACES 1.0 Output - Rec.2020 - Full Output Transform
     isdata: false
     allocation: uniform
     allocationvars: [0, 1]
     to_reference: !<GroupTransform>
       children:
-        - !<FileTransform> {src: InvRRT.a1.0.0.Rec.709_-_Legal.Output_Shaper.spi3d, interpolation: tetrahedral}
+        - !<FileTransform> {src: InvRRT.a1.0.0.Rec.2020_-_Full.Output_Shaper.spi3d, interpolation: tetrahedral}
         - !<FileTransform> {src: Output_Shaper_to_linear.spi1d, interpolation: linear}
     from_reference: !<GroupTransform>
       children:
         - !<FileTransform> {src: Output_Shaper_to_linear.spi1d, interpolation: linear, direction: inverse}
-        - !<FileTransform> {src: Output_Shaper.RRT.a1.0.0.Rec.709_-_Legal.spi3d, interpolation: tetrahedral}
+        - !<FileTransform> {src: Output_Shaper.RRT.a1.0.0.Rec.2020_-_Full.spi3d, interpolation: tetrahedral}
 
   - !<ColorSpace>
-    name: out_rec709legal
+    name: out_rec2020full
     family: Aliases
     equalitygroup: ""
     bitdepth: 32f
     description: |
-      ACES 1.0 Output - Rec.709 - Legal Output Transform
+      ACES 1.0 Output - Rec.2020 - Full Output Transform
     isdata: false
     allocation: uniform
     allocationvars: [0, 1]
@@ -677,31 +749,31 @@ colorspaces:
     allocationvars: [0, 1]
 
   - !<ColorSpace>
-    name: Rec.2020 - Full
+    name: Rec.709 - Legal
     family: Output
     equalitygroup: ""
     bitdepth: 32f
     description: |
-      ACES 1.0 Output - Rec.2020 - Full Output Transform
+      ACES 1.0 Output - Rec.709 - Legal Output Transform
     isdata: false
     allocation: uniform
     allocationvars: [0, 1]
     to_reference: !<GroupTransform>
       children:
-        - !<FileTransform> {src: InvRRT.a1.0.0.Rec.2020_-_Full.Output_Shaper.spi3d, interpolation: tetrahedral}
+        - !<FileTransform> {src: InvRRT.a1.0.0.Rec.709_-_Legal.Output_Shaper.spi3d, interpolation: tetrahedral}
         - !<FileTransform> {src: Output_Shaper_to_linear.spi1d, interpolation: linear}
     from_reference: !<GroupTransform>
       children:
         - !<FileTransform> {src: Output_Shaper_to_linear.spi1d, interpolation: linear, direction: inverse}
-        - !<FileTransform> {src: Output_Shaper.RRT.a1.0.0.Rec.2020_-_Full.spi3d, interpolation: tetrahedral}
+        - !<FileTransform> {src: Output_Shaper.RRT.a1.0.0.Rec.709_-_Legal.spi3d, interpolation: tetrahedral}
 
   - !<ColorSpace>
-    name: out_rec2020full
+    name: out_rec709legal
     family: Aliases
     equalitygroup: ""
     bitdepth: 32f
     description: |
-      ACES 1.0 Output - Rec.2020 - Full Output Transform
+      ACES 1.0 Output - Rec.709 - Legal Output Transform
     isdata: false
     allocation: uniform
     allocationvars: [0, 1]
@@ -2494,3 +2566,14 @@ colorspaces:
     allocation: lg2
     allocationvars: [-8, 5, 0.00390625]
     to_reference: !<ColorSpaceTransform> {src: Linear - Adobe Wide Gamut RGB, dst: ACES2065-1}
+
+  - !<ColorSpace>
+    name: Raw
+    family: Utility
+    equalitygroup: Raw
+    bitdepth: 32f
+    description: |
+      The Raw color space
+    isdata: true
+    allocation: uniform
+    allocationvars: [0, 1]