diff --git a/release/datafiles/colormanagement/config.ocio b/release/datafiles/colormanagement/config.ocio index a9cd820bd87..e28d7b30b21 100644 --- a/release/datafiles/colormanagement/config.ocio +++ b/release/datafiles/colormanagement/config.ocio @@ -88,20 +88,22 @@ displays: - ! {name: ACES 2.0 - HDR 1000 nits, colorspace: ACES 2.0 Rec.2100-PQ - HDR 1000 nits} - ! {name: ACES 2.0 - HDR 2000 nits, colorspace: ACES 2.0 Rec.2100-PQ - HDR 2000 nits} - ! {name: ACES 2.0 - HDR 4000 nits, colorspace: ACES 2.0 Rec.2100-PQ - HDR 4000 nits} - - ! {name: AgX, colorspace: AgX Rec.2100-PQ - SDR} + - ! {name: ACES 2.0 - SDR, colorspace: ACES 2.0 Rec.2100-PQ - SDR} - ! {name: AgX - HDR 1000 nits, colorspace: AgX Rec.2100-PQ - HDR 1000 nits (P3 D65)} + - ! {name: AgX - SDR, colorspace: AgX Rec.2100-PQ - SDR} - ! {name: False Color, colorspace: AgX False Color Rec.2100-PQ} - ! {name: Raw, colorspace: Non-Color} Rec.2100-HLG: - ! {name: Standard, colorspace: Rec.2100-HLG} - ! {name: ACES 2.0 - HDR 1000 nits, colorspace: ACES 2.0 Rec.2100-HLG - HDR 1000 nits} - - ! {name: AgX, colorspace: AgX Rec.2100-HLG - SDR} + - ! {name: ACES 2.0 - SDR, colorspace: ACES 2.0 Rec.2100-HLG - SDR} - ! {name: AgX - HDR 1000 nits, colorspace: AgX Rec.2100-HLG - HDR 1000 nits (P3 D65)} + - ! {name: AgX - SDR, colorspace: AgX Rec.2100-HLG - SDR} - ! {name: False Color, colorspace: AgX False Color Rec.2100-HLG} - ! {name: Raw, colorspace: Non-Color} active_displays: [sRGB, Display P3, Rec.1886, Rec.2020, Rec.2100-PQ, Rec.2100-HLG] -active_views: [Standard, ACES 2.0, ACES 2.0 - HDR 500 nits, ACES 2.0 - HDR 1000 nits, ACES 2.0 - HDR 2000 nits, ACES 2.0 - HDR 4000 nits, Khronos PBR Neutral, AgX, AgX - HDR 1000 nits, Filmic, Filmic Log, False Color, Raw] -inactive_colorspaces: [Luminance Compensation Rec.2020, AgX False Color Rec.709, AgX False Color P3, AgX False Color Rec.2020, AgX False Color Rec.2100-HLG, AgX False Color Rec.2100-PQ, ACES 2.0 Rec.2100-PQ - HDR 500 nits, ACES 2.0 Rec.2100-PQ - HDR 1000 nits, ACES 2.0 Rec.2100-PQ - HDR 2000 nits, ACES 2.0 Rec.2100-PQ - HDR 4000 nits, ACES 2.0 Rec.2020, AgX Rec.2100-HLG - HDR 1000 nits (P3 D65), AgX Rec.2100-PQ - HDR 1000 nits (P3 D65), AgX Rec.2100-HLG - SDR, AgX Rec.2100-PQ - SDR, ACES 2.0 Rec.2100-HLG - HDR 1000 nits] +active_views: [Standard, ACES 2.0, ACES 2.0 - HDR 500 nits, ACES 2.0 - HDR 1000 nits, ACES 2.0 - HDR 2000 nits, ACES 2.0 - HDR 4000 nits, ACES 2.0 - SDR, Khronos PBR Neutral, AgX, AgX - HDR 1000 nits, AgX - SDR, Filmic, Filmic Log, False Color, Raw,] +inactive_colorspaces: [Luminance Compensation Rec.2020, AgX False Color Rec.709, AgX False Color P3, AgX False Color Rec.2020, AgX False Color Rec.2100-HLG, AgX False Color Rec.2100-PQ, ACES 2.0 Rec.2100-PQ - HDR 500 nits, ACES 2.0 Rec.2100-PQ - HDR 1000 nits, ACES 2.0 Rec.2100-PQ - HDR 2000 nits, ACES 2.0 Rec.2100-PQ - HDR 4000 nits, ACES 2.0 Rec.2100-PQ - SDR, ACES 2.0 Rec.2020, AgX Rec.2100-HLG - HDR 1000 nits (P3 D65), AgX Rec.2100-PQ - HDR 1000 nits (P3 D65), AgX Rec.2100-HLG - SDR, AgX Rec.2100-PQ - SDR, ACES 2.0 Rec.2100-HLG - HDR 1000 nits, ACES 2.0 Rec.2100-HLG - SDR, AgX Base Rec.2020, AgX Base Display P3, AgX Base Rec.1886, ACES 2.0 sRGB, ACES 2.0 Display P3, ACES 2.0 Rec.1886, ACES 2.0 Rec.2020] colorspaces: - ! @@ -634,6 +636,21 @@ colorspaces: - ! {style: ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - HDR-4000nit-REC2020_2.0} - ! {style: DISPLAY - CIE-XYZ-D65_to_REC.2100-PQ} + - ! + name: ACES 2.0 Rec.2100-PQ - SDR + family: ACES + equalitygroup: + bitdepth: 32f + description: | + ACES 2 Output Transform for 100 nit SDR Rec709 + encoding: hdr-video + isdata: false + from_scene_reference: ! + children: + - ! {src: Linear CIE-XYZ E, dst: ACES2065-1} + - ! {style: ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-100nit-REC709_2.0} + - ! {style: DISPLAY - CIE-XYZ-D65_to_REC.2100-PQ} + - ! name: ACES 2.0 Rec.2100-HLG - HDR 1000 nits family: ACES @@ -649,6 +666,21 @@ colorspaces: - ! {style: ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - HDR-1000nit-REC2020_2.0} - ! {style: DISPLAY - CIE-XYZ-D65_to_REC.2100-HLG-1000nit} + - ! + name: ACES 2.0 Rec.2100-HLG - SDR + family: ACES + equalitygroup: + bitdepth: 32f + description: | + ACES 2 Output Transform for 100 nit SDR Rec709 + encoding: hdr-video + isdata: false + from_scene_reference: ! + children: + - ! {src: Linear CIE-XYZ E, dst: ACES2065-1} + - ! {style: ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-100nit-REC709_2.0} + - ! {style: DISPLAY - CIE-XYZ-D65_to_REC.2100-HLG-1000nit} + - ! name: Rec.2100-PQ aliases: [pq_rec2020_display, rec2100_pq_display, Rec.2100-PQ - Display] @@ -998,3 +1030,9 @@ looks: contrast: {rgb: [0.7, 0.7, 0.7], master: 1} saturation: 1.15 pivot: {contrast: -0.2} + + - ! + name: ACES 2.0 - Reference Gamut Compression + process_space: ACES2065-1 + description: Compress scene-referred values from common cameras into the ACEScg gamut + transform: ! {style: ACES-LMT - ACES 1.3 Reference Gamut Compression} diff --git a/tests/files/sequence_editing/video_output/video_output_hlg_12bit_agx_mov.blend b/tests/files/sequence_editing/video_output/video_output_hlg_12bit_agx_mov.blend index 8bc413f96c6..a642fd0d9be 100644 --- a/tests/files/sequence_editing/video_output/video_output_hlg_12bit_agx_mov.blend +++ b/tests/files/sequence_editing/video_output/video_output_hlg_12bit_agx_mov.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc07c905708f1281965a6fa9635db16119e42bea7b266158411da53617d18062 -size 89656 +oid sha256:28b7eb272650c4d2ca48c4bcb2b83a4758001e6be63c8db0b200bba30159d5ab +size 88357 diff --git a/tests/files/sequence_editing/video_output/video_output_pq_12bit_agx_mov.blend b/tests/files/sequence_editing/video_output/video_output_pq_12bit_agx_mov.blend index b5039e16e58..8e24a6953ab 100644 --- a/tests/files/sequence_editing/video_output/video_output_pq_12bit_agx_mov.blend +++ b/tests/files/sequence_editing/video_output/video_output_pq_12bit_agx_mov.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a7b90a0ef5bc97e2eb1980306df888fd3cb689745b3a11a23fdf4a9943e9f28 -size 89556 +oid sha256:12da8cab13c7912efdb38de99945ca36e396f176e1d3f3f25040a26c8be9a8e3 +size 88483