X-Git-Url: http://users.mur.at/ms/git/gitweb/?p=OpenColorIO-Configs.git;a=blobdiff_plain;f=aces_1.0.1%2Fconfig.ocio;h=a3042308aca03f6a985470fc6f40aa32b20b5761;hp=0fc1aac5200378e5576b807a7c47ae3368410936;hb=a56b1cb7d12e05c7819d6c047a3d23c642c62f43;hpb=6c7c2bf1dcec809d8c6472b1d34329157e498f97

diff --git a/aces_1.0.1/config.ocio b/aces_1.0.1/config.ocio
index 0fc1aac..a304230 100644
--- a/aces_1.0.1/config.ocio
+++ b/aces_1.0.1/config.ocio
@@ -25,19 +25,19 @@ displays:
     - !<View> {name: DCDM, colorspace: Output - DCDM}
     - !<View> {name: DCDM P3 gamut clip, colorspace: Output - DCDM (P3 gamut clip)}
     - !<View> {name: P3-D60, colorspace: Output - P3-D60}
-    - !<View> {name: P3-D60 ST2048 1000 nits, colorspace: Output - P3-D60 ST2048 (1000 nits)}
-    - !<View> {name: P3-D60 ST2048 2000 nits, colorspace: Output - P3-D60 ST2048 (2000 nits)}
-    - !<View> {name: P3-D60 ST2048 4000 nits, colorspace: Output - P3-D60 ST2048 (4000 nits)}
+    - !<View> {name: P3-D60 ST2084 1000 nits, colorspace: Output - P3-D60 ST2084 (1000 nits)}
+    - !<View> {name: P3-D60 ST2084 2000 nits, colorspace: Output - P3-D60 ST2084 (2000 nits)}
+    - !<View> {name: P3-D60 ST2084 4000 nits, colorspace: Output - P3-D60 ST2084 (4000 nits)}
     - !<View> {name: P3-DCI, colorspace: Output - P3-DCI}
     - !<View> {name: Rec.2020, colorspace: Output - Rec.2020}
-    - !<View> {name: Rec.2020 ST2048 1000 nits, colorspace: Output - Rec.2020 ST2048 (1000 nits)}
+    - !<View> {name: Rec.2020 ST2084 1000 nits, colorspace: Output - Rec.2020 ST2084 (1000 nits)}
     - !<View> {name: Rec.709, colorspace: Output - Rec.709}
     - !<View> {name: Rec.709 D60 sim., colorspace: Output - Rec.709 (D60 sim.)}
     - !<View> {name: Raw, colorspace: Utility - Raw}
     - !<View> {name: Log, colorspace: ACES - ACEScc}
 
 active_displays: [ACES]
-active_views: [sRGB D60 sim., DCDM, DCDM P3 gamut clip, P3-D60, P3-D60 ST2048 1000 nits, P3-D60 ST2048 2000 nits, P3-D60 ST2048 4000 nits, P3-DCI, Rec.2020, Rec.2020 ST2048 1000 nits, Rec.709, Rec.709 D60 sim., Raw, Log]
+active_views: [sRGB D60 sim., DCDM, DCDM P3 gamut clip, P3-D60, P3-D60 ST2084 1000 nits, P3-D60 ST2084 2000 nits, P3-D60 ST2084 4000 nits, P3-DCI, Rec.2020, Rec.2020 ST2084 1000 nits, Rec.709, Rec.709 D60 sim., Raw, Log]
 
 colorspaces:
   - !<ColorSpace>
@@ -1115,88 +1115,88 @@ colorspaces:
         - !<FileTransform> {src: Log2_48_nits_Shaper.RRT.a1.0.1.DCDM.spi3d, interpolation: tetrahedral}
 
   - !<ColorSpace>
-    name: Output - P3-D60 ST2048 (1000 nits)
+    name: Output - P3-D60 ST2084 (1000 nits)
     family: Output
     equalitygroup: ""
     bitdepth: 32f
     description: |
-      ACES 1.0 Output - P3-D60 ST2048 (1000 nits) Output Transform
+      ACES 1.0 Output - P3-D60 ST2084 (1000 nits) Output Transform
       
-      ACES Transform ID : ODT.Academy.P3D60_ST2048_1000nits.a1.0.1
+      ACES Transform ID : ODT.Academy.P3D60_ST2084_1000nits.a1.0.1
     isdata: false
     allocation: uniform
     allocationvars: [0, 1]
     to_reference: !<GroupTransform>
       children:
-        - !<FileTransform> {src: InvRRT.a1.0.1.P3-D60_ST2048__1000_nits_.Log2_1000_nits_Shaper.spi3d, interpolation: tetrahedral}
-        - !<FileTransform> {src: Log2_1000_nits_Shaper_to_linear.spi1d, interpolation: linear}
+        - !<FileTransform> {src: InvRRT.a1.0.1.P3-D60_ST2084__1000_nits_.Log2_48_nits_Shaper.spi3d, interpolation: tetrahedral}
+        - !<FileTransform> {src: Log2_48_nits_Shaper_to_linear.spi1d, interpolation: linear}
     from_reference: !<GroupTransform>
       children:
-        - !<FileTransform> {src: Log2_1000_nits_Shaper_to_linear.spi1d, interpolation: linear, direction: inverse}
-        - !<FileTransform> {src: Log2_1000_nits_Shaper.RRT.a1.0.1.P3-D60_ST2048__1000_nits_.spi3d, interpolation: tetrahedral}
+        - !<FileTransform> {src: Log2_48_nits_Shaper_to_linear.spi1d, interpolation: linear, direction: inverse}
+        - !<FileTransform> {src: Log2_48_nits_Shaper.RRT.a1.0.1.P3-D60_ST2084__1000_nits_.spi3d, interpolation: tetrahedral}
 
   - !<ColorSpace>
-    name: Output - P3-D60 ST2048 (2000 nits)
+    name: Output - P3-D60 ST2084 (2000 nits)
     family: Output
     equalitygroup: ""
     bitdepth: 32f
     description: |
-      ACES 1.0 Output - P3-D60 ST2048 (2000 nits) Output Transform
+      ACES 1.0 Output - P3-D60 ST2084 (2000 nits) Output Transform
       
-      ACES Transform ID : ODT.Academy.P3D60_ST2048_2000nits.a1.0.1
+      ACES Transform ID : ODT.Academy.P3D60_ST2084_2000nits.a1.0.1
     isdata: false
     allocation: uniform
     allocationvars: [0, 1]
     to_reference: !<GroupTransform>
       children:
-        - !<FileTransform> {src: InvRRT.a1.0.1.P3-D60_ST2048__2000_nits_.Log2_2000_nits_Shaper.spi3d, interpolation: tetrahedral}
-        - !<FileTransform> {src: Log2_2000_nits_Shaper_to_linear.spi1d, interpolation: linear}
+        - !<FileTransform> {src: InvRRT.a1.0.1.P3-D60_ST2084__2000_nits_.Log2_48_nits_Shaper.spi3d, interpolation: tetrahedral}
+        - !<FileTransform> {src: Log2_48_nits_Shaper_to_linear.spi1d, interpolation: linear}
     from_reference: !<GroupTransform>
       children:
-        - !<FileTransform> {src: Log2_2000_nits_Shaper_to_linear.spi1d, interpolation: linear, direction: inverse}
-        - !<FileTransform> {src: Log2_2000_nits_Shaper.RRT.a1.0.1.P3-D60_ST2048__2000_nits_.spi3d, interpolation: tetrahedral}
+        - !<FileTransform> {src: Log2_48_nits_Shaper_to_linear.spi1d, interpolation: linear, direction: inverse}
+        - !<FileTransform> {src: Log2_48_nits_Shaper.RRT.a1.0.1.P3-D60_ST2084__2000_nits_.spi3d, interpolation: tetrahedral}
 
   - !<ColorSpace>
-    name: Output - P3-D60 ST2048 (4000 nits)
+    name: Output - P3-D60 ST2084 (4000 nits)
     family: Output
     equalitygroup: ""
     bitdepth: 32f
     description: |
-      ACES 1.0 Output - P3-D60 ST2048 (4000 nits) Output Transform
+      ACES 1.0 Output - P3-D60 ST2084 (4000 nits) Output Transform
       
-      ACES Transform ID : ODT.Academy.P3D60_ST2048_4000nits.a1.0.1
+      ACES Transform ID : ODT.Academy.P3D60_ST2084_4000nits.a1.0.1
     isdata: false
     allocation: uniform
     allocationvars: [0, 1]
     to_reference: !<GroupTransform>
       children:
-        - !<FileTransform> {src: InvRRT.a1.0.1.P3-D60_ST2048__4000_nits_.Log2_4000_nits_Shaper.spi3d, interpolation: tetrahedral}
-        - !<FileTransform> {src: Log2_4000_nits_Shaper_to_linear.spi1d, interpolation: linear}
+        - !<FileTransform> {src: InvRRT.a1.0.1.P3-D60_ST2084__4000_nits_.Log2_48_nits_Shaper.spi3d, interpolation: tetrahedral}
+        - !<FileTransform> {src: Log2_48_nits_Shaper_to_linear.spi1d, interpolation: linear}
     from_reference: !<GroupTransform>
       children:
-        - !<FileTransform> {src: Log2_4000_nits_Shaper_to_linear.spi1d, interpolation: linear, direction: inverse}
-        - !<FileTransform> {src: Log2_4000_nits_Shaper.RRT.a1.0.1.P3-D60_ST2048__4000_nits_.spi3d, interpolation: tetrahedral}
+        - !<FileTransform> {src: Log2_48_nits_Shaper_to_linear.spi1d, interpolation: linear, direction: inverse}
+        - !<FileTransform> {src: Log2_48_nits_Shaper.RRT.a1.0.1.P3-D60_ST2084__4000_nits_.spi3d, interpolation: tetrahedral}
 
   - !<ColorSpace>
-    name: Output - Rec.2020 ST2048 (1000 nits)
+    name: Output - Rec.2020 ST2084 (1000 nits)
     family: Output
     equalitygroup: ""
     bitdepth: 32f
     description: |
-      ACES 1.0 Output - Rec.2020 ST2048 (1000 nits) Output Transform
+      ACES 1.0 Output - Rec.2020 ST2084 (1000 nits) Output Transform
       
-      ACES Transform ID : ODT.Academy.Rec2020_ST2048_1000nits.a1.0.1
+      ACES Transform ID : ODT.Academy.Rec2020_ST2084_1000nits.a1.0.1
     isdata: false
     allocation: uniform
     allocationvars: [0, 1]
     to_reference: !<GroupTransform>
       children:
-        - !<FileTransform> {src: InvRRT.a1.0.1.Rec.2020_ST2048__1000_nits_.Log2_1000_nits_Shaper.spi3d, interpolation: tetrahedral}
-        - !<FileTransform> {src: Log2_1000_nits_Shaper_to_linear.spi1d, interpolation: linear}
+        - !<FileTransform> {src: InvRRT.a1.0.1.Rec.2020_ST2084__1000_nits_.Log2_48_nits_Shaper.spi3d, interpolation: tetrahedral}
+        - !<FileTransform> {src: Log2_48_nits_Shaper_to_linear.spi1d, interpolation: linear}
     from_reference: !<GroupTransform>
       children:
-        - !<FileTransform> {src: Log2_1000_nits_Shaper_to_linear.spi1d, interpolation: linear, direction: inverse}
-        - !<FileTransform> {src: Log2_1000_nits_Shaper.RRT.a1.0.1.Rec.2020_ST2048__1000_nits_.spi3d, interpolation: tetrahedral}
+        - !<FileTransform> {src: Log2_48_nits_Shaper_to_linear.spi1d, interpolation: linear, direction: inverse}
+        - !<FileTransform> {src: Log2_48_nits_Shaper.RRT.a1.0.1.Rec.2020_ST2084__1000_nits_.spi3d, interpolation: tetrahedral}
 
   - !<ColorSpace>
     name: Output - P3-D60
@@ -2960,64 +2960,64 @@ colorspaces:
     from_reference: !<ColorSpaceTransform> {src: ACES - ACES2065-1, dst: Output - DCDM}
 
   - !<ColorSpace>
-    name: out_p3d60st20481000nits
+    name: out_p3d60st20841000nits
     family: Aliases
     equalitygroup: ""
     bitdepth: 32f
     description: |
-      ACES 1.0 Output - P3-D60 ST2048 (1000 nits) Output Transform
+      ACES 1.0 Output - P3-D60 ST2084 (1000 nits) Output Transform
       
-      ACES Transform ID : ODT.Academy.P3D60_ST2048_1000nits.a1.0.1
+      ACES Transform ID : ODT.Academy.P3D60_ST2084_1000nits.a1.0.1
     isdata: false
     allocation: uniform
     allocationvars: [0, 1]
-    to_reference: !<ColorSpaceTransform> {src: Output - P3-D60 ST2048 (1000 nits), dst: ACES - ACES2065-1}
-    from_reference: !<ColorSpaceTransform> {src: ACES - ACES2065-1, dst: Output - P3-D60 ST2048 (1000 nits)}
+    to_reference: !<ColorSpaceTransform> {src: Output - P3-D60 ST2084 (1000 nits), dst: ACES - ACES2065-1}
+    from_reference: !<ColorSpaceTransform> {src: ACES - ACES2065-1, dst: Output - P3-D60 ST2084 (1000 nits)}
 
   - !<ColorSpace>
-    name: out_p3d60st20482000nits
+    name: out_p3d60st20842000nits
     family: Aliases
     equalitygroup: ""
     bitdepth: 32f
     description: |
-      ACES 1.0 Output - P3-D60 ST2048 (2000 nits) Output Transform
+      ACES 1.0 Output - P3-D60 ST2084 (2000 nits) Output Transform
       
-      ACES Transform ID : ODT.Academy.P3D60_ST2048_2000nits.a1.0.1
+      ACES Transform ID : ODT.Academy.P3D60_ST2084_2000nits.a1.0.1
     isdata: false
     allocation: uniform
     allocationvars: [0, 1]
-    to_reference: !<ColorSpaceTransform> {src: Output - P3-D60 ST2048 (2000 nits), dst: ACES - ACES2065-1}
-    from_reference: !<ColorSpaceTransform> {src: ACES - ACES2065-1, dst: Output - P3-D60 ST2048 (2000 nits)}
+    to_reference: !<ColorSpaceTransform> {src: Output - P3-D60 ST2084 (2000 nits), dst: ACES - ACES2065-1}
+    from_reference: !<ColorSpaceTransform> {src: ACES - ACES2065-1, dst: Output - P3-D60 ST2084 (2000 nits)}
 
   - !<ColorSpace>
-    name: out_p3d60st20484000nits
+    name: out_p3d60st20844000nits
     family: Aliases
     equalitygroup: ""
     bitdepth: 32f
     description: |
-      ACES 1.0 Output - P3-D60 ST2048 (4000 nits) Output Transform
+      ACES 1.0 Output - P3-D60 ST2084 (4000 nits) Output Transform
       
-      ACES Transform ID : ODT.Academy.P3D60_ST2048_4000nits.a1.0.1
+      ACES Transform ID : ODT.Academy.P3D60_ST2084_4000nits.a1.0.1
     isdata: false
     allocation: uniform
     allocationvars: [0, 1]
-    to_reference: !<ColorSpaceTransform> {src: Output - P3-D60 ST2048 (4000 nits), dst: ACES - ACES2065-1}
-    from_reference: !<ColorSpaceTransform> {src: ACES - ACES2065-1, dst: Output - P3-D60 ST2048 (4000 nits)}
+    to_reference: !<ColorSpaceTransform> {src: Output - P3-D60 ST2084 (4000 nits), dst: ACES - ACES2065-1}
+    from_reference: !<ColorSpaceTransform> {src: ACES - ACES2065-1, dst: Output - P3-D60 ST2084 (4000 nits)}
 
   - !<ColorSpace>
-    name: out_rec2020st20481000nits
+    name: out_rec2020st20841000nits
     family: Aliases
     equalitygroup: ""
     bitdepth: 32f
     description: |
-      ACES 1.0 Output - Rec.2020 ST2048 (1000 nits) Output Transform
+      ACES 1.0 Output - Rec.2020 ST2084 (1000 nits) Output Transform
       
-      ACES Transform ID : ODT.Academy.Rec2020_ST2048_1000nits.a1.0.1
+      ACES Transform ID : ODT.Academy.Rec2020_ST2084_1000nits.a1.0.1
     isdata: false
     allocation: uniform
     allocationvars: [0, 1]
-    to_reference: !<ColorSpaceTransform> {src: Output - Rec.2020 ST2048 (1000 nits), dst: ACES - ACES2065-1}
-    from_reference: !<ColorSpaceTransform> {src: ACES - ACES2065-1, dst: Output - Rec.2020 ST2048 (1000 nits)}
+    to_reference: !<ColorSpaceTransform> {src: Output - Rec.2020 ST2084 (1000 nits), dst: ACES - ACES2065-1}
+    from_reference: !<ColorSpaceTransform> {src: ACES - ACES2065-1, dst: Output - Rec.2020 ST2084 (1000 nits)}
 
   - !<ColorSpace>
     name: out_p3d60