blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 777 Projects 19 Wiki Activity

AgX-Step4: Add and Rename Colorspaces #110941

Merged
Sergey Sharybin merged 19 commits from :AgX-Step4 into main 2023-08-09 18:00:52 +02:00
Conversation 22 Commits 19 Files Changed 1 +116 -27
1 changed files with 116 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

143
release/datafiles/colormanagement/config.ocio
View File

@ -21,14 +21,14 @@ roles:
reference: Linear CIE-XYZ E
# Internal scene linear space
scene_linear: Linear
rendering: Linear
scene_linear: Linear Rec.709
rendering: Linear Rec.709
# Default color space for byte image
default_byte: sRGB
# Default color space for float images
default_float: Linear
default_float: Linear Rec.709
# Default color space sequencer is working in
default_sequencer: sRGB
@ -40,15 +40,15 @@ roles:
data: Non-Color
# For interop between configs, and to determine XYZ for rendering
aces_interchange: Linear ACES
aces_interchange: ACES2065-1
cie_xyz_d65_interchange: Linear CIE-XYZ D65
# Specified by OCIO, not used in Blender
color_timing: Filmic Log
compositing_log: Filmic Log
default: Linear
matte_paint: Linear
texture_paint: Linear
default: Linear Rec.709
matte_paint: Linear Rec.709
texture_paint: Linear Rec.709
displays:
sRGB:
@ -60,6 +60,7 @@ displays:
active_displays: [sRGB]
active_views: [Standard, Filmic, Filmic Log, False Color, Raw]
inactive_colorspaces: [False Color]
colorspaces:
- !<ColorSpace>
@ -74,7 +75,7 @@ colorspaces:
- !<ColorSpace>
name: Linear CIE-XYZ D65
aliases: [cie_xyz_d65, CIE-XYZ-D65, XYZ, Linear CIE-XYZ D65]
aliases: [cie_xyz_d65, CIE-XYZ-D65, XYZ, Linear CIE-XYZ I-D65]
family: Chromaticity
equalitygroup:
bitdepth: 32f
@ -84,12 +85,13 @@ colorspaces:
from_scene_reference: !<FileTransform> {src: xyz_E_to_D65.spimtx, interpolation: linear}
- !<ColorSpace>
name: Linear
family: linear
name: Linear Rec.709
aliases: [Linear, Linear BT.709, Linear BT.709 I-D65, Linear Tristimulus, linrec709, Utility - Linear - sRGB, Utility - Linear - Rec.709, lin_srgb, Linear Rec.709 (sRGB), lin_rec709_srgb, lin_rec709, lin_srgb, "CGI: Linear - Rec.709"]
family: Linear
Eary marked this conversation as resolved Outdated
Brecht Van Lommel commented 2023-08-09 12:08:32 +02:00
Outdated
Review
Copy Link

Other families are getting renamed to use capitalization. If we do that we should changes family linear to Linear everywhere as well.

Other families are getting renamed to use capitalization. If we do that we should changes family linear to Linear everywhere as well.
equalitygroup:
bitdepth: 32f
description: |
Rec. 709 (Full Range), Blender native linear space
Linear BT.709 with illuminant D65 white point
Eary marked this conversation as resolved Outdated
Brecht Van Lommel commented 2023-08-09 11:53:27 +02:00
Outdated
Review
Copy Link

I don't think using the term "Tristimulus" here or other descriptions is helpful, so would leave it out everywhere. OpenColorIO only deals with tristimulus values, it's not making a useful distinction.

Open domain I don't think is a standard term, it might be a term invented by Troy. I don't think we need to mention this at all, in fact the color space itself does not define if it is unbounded or not, also sRGB in Blender permits unbounded values.

I don't think using the term "Tristimulus" here or other descriptions is helpful, so would leave it out everywhere. OpenColorIO only deals with tristimulus values, it's not making a useful distinction. Open domain I don't think is a standard term, it might be a term invented by Troy. I don't think we need to mention this at all, in fact the color space itself does not define if it is unbounded or not, also sRGB in Blender permits unbounded values.
isdata: false
from_scene_reference: !<GroupTransform>
children:
@ -97,12 +99,41 @@ colorspaces:
- !<MatrixTransform> {matrix: [ 3.2410032329763587, -1.5373989694887855, -0.4986158819963629, 0, -0.9692242522025164, 1.8759299836951759, 0.0415542263400847, 0, 0.0556394198519755, -0.2040112061239099, 1.0571489771875333, 0, 0, 0, 0, 1]}
- !<ColorSpace>
name: Linear ACES
family: linear
name: Linear DCI-P3 D65
aliases: [Linear DCI-P3 I-D65, Linear P3-D65, lin_p3d65, Utility - Linear - P3-D65, Apple DCI-P3 D65]
family: Linear
equalitygroup:
bitdepth: 32f
description: |
ACES2065-1 linear space
Linear DCI-P3 with illuminant D65 white point
isdata: false
from_scene_reference: !<GroupTransform>
children:
- !<ColorSpaceTransform> {src: Linear CIE-XYZ E, dst: Linear CIE-XYZ D65}
- !<MatrixTransform> {matrix: [2.4935091239346101, -0.9313881794047790, -0.4027127567416516, 0, -0.8294732139295544, 1.7626305796003032, 0.0236242371055886, 0, 0.0358512644339181, -0.0761839369220759, 0.9570295866943110, 0, 0, 0, 0, 1]}
- !<ColorSpace>
name: Linear Rec.2020
aliases: [Linear BT.2020 I-D65, Linear BT.2020, lin_rec2020, Utility - Linear - Rec.2020]
family: Linear
equalitygroup:
bitdepth: 32f
description: |
Linear BT.2020 with illuminant D65 white point
isdata: false
from_scene_reference: !<GroupTransform>
children:
- !<ColorSpaceTransform> {src: Linear CIE-XYZ E, dst: Linear CIE-XYZ D65}
- !<MatrixTransform> {matrix: [ 1.7166634277958805, -0.3556733197301399, -0.2533680878902478, 0, -0.6666738361988869, 1.6164557398246981, 0.0157682970961337, 0, 0.0176424817849772, -0.0427769763827532, 0.9422432810184308, 0, 0, 0, 0, 1]}
- !<ColorSpace>
name: ACES2065-1
aliases: [Linear ACES, aces2065_1, ACES - ACES2065-1, lin_ap0, "ACES: Linear - AP0"]
family: Linear
equalitygroup:
bitdepth: 32f
description: |
Linear AP0 with ACES white point
isdata: false
from_reference: !<GroupTransform>
children:
@ -110,12 +141,13 @@ colorspaces:
- !<BuiltinTransform> {style: "UTILITY - ACES-AP0_to_CIE-XYZ-D65_BFD", direction: inverse}
- !<ColorSpace>
name: Linear ACEScg
family: linear
name: ACEScg
aliases: [Linear ACEScg, lin_ap1, ACES - ACEScg, "ACEScg: Linear - AP1"]
family: Linear
equalitygroup:
bitdepth: 32f
description: |
ACEScg linear space
Linear AP1 with ACES white point
isdata: false
from_reference: !<GroupTransform>
children:
@ -123,22 +155,79 @@ colorspaces:
- !<BuiltinTransform> {style: "UTILITY - ACES-AP1_to_CIE-XYZ-D65_BFD", direction: inverse}
- !<ColorSpace>
name: sRGB
family:
name: Linear FilmLight E-Gamut
aliases: [Linear E-Gamut I-D65, "FilmLight: Linear - E-Gamut"]
Eary marked this conversation as resolved
Nathan Vegdahl commented 2023-08-09 12:59:12 +02:00
Review
Copy Link

Is E-Gamut actually used much outside of FilmLight's own tools and configurations? I could very well just be out of the loop on this, but my initial reaction was that it feels kind of specific and maybe not appropriate in a general configuration.

Is E-Gamut actually used much outside of FilmLight's own tools and configurations? I could very well just be out of the loop on this, but my initial reaction was that it feels kind of specific and maybe not appropriate in a general configuration.
Zijun Zhou commented 2023-08-09 13:01:38 +02:00
Review
Copy Link

It's needed for AgX's LUT input encoding. Also there are people using E-Gamut for interop, this repository for example:
https://github.com/gralk/images

It's needed for AgX's LUT input encoding. Also there are people using E-Gamut for interop, this repository for example: https://github.com/gralk/images
Brecht Van Lommel commented 2023-08-09 13:25:39 +02:00
Review
Copy Link

We could hide it from the UI and only use it internally. But I guess it can be useful to exchange files with BaseLight and it's not really in the way.

Maybe in the description change "Linear E-Gamut" to "Linear FilmLight E-Gamut" to hint what this is for.

We could hide it from the UI and only use it internally. But I guess it can be useful to exchange files with BaseLight and it's not really in the way. Maybe in the description change "Linear E-Gamut" to "Linear FilmLight E-Gamut" to hint what this is for.
👍 1
family: Linear
equalitygroup:
bitdepth: 32f
description: |
sRGB display space
Linear E-Gamut with illuminant D65 white point
isdata: false
from_scene_reference: !<GroupTransform>
children:
- !<ColorSpaceTransform> {src: Linear CIE-XYZ E, dst: Linear}
- !<ColorSpaceTransform> {src: Linear CIE-XYZ I-E, dst: Linear CIE-XYZ I-D65}
- !<MatrixTransform> {matrix: [ 0.7053968501, 0.1640413283, 0.08101774865, 0, 0.2801307241, 0.8202066415, -0.1003373656, 0, -0.1037815116, -0.07290725703, 1.265746519, 0, 0, 0, 0, 1], direction: inverse}
- !<ColorSpace>
name: sRGB
aliases: [sRGB 2.2, sRGB I-D65, srgb_display, sRGB - Display, g22_rec709, Utility - Gamma 2.2 - Rec.709 - Texture, Utility - sRGB - Texture, sRGB - Texture, srgb_tx, srgb_texture, Input - Generic - sRGB - Texture, "sRGB Display: 2.2 Gamma - Rec.709"]
family: Display
equalitygroup:
bitdepth: 32f
description: |
sRGB IEC 61966-2-1 compound (piece-wise) encoding
isdata: false
from_scene_reference: !<GroupTransform>
children:
- !<ColorSpaceTransform> {src: Linear CIE-XYZ E, dst: Linear Rec.709}
- !<ExponentWithLinearTransform> {gamma: 2.4, offset: 0.055, direction: inverse}
- !<ColorSpace>
name: Display P3
aliases: [Display P3 2.2, Display P3 I-D65, P3-D65 - Display, p3_d65_display, p3d65_display, AppleP3 sRGB OETF]
family: Display
equalitygroup:
bitdepth: 32f
description: |
Apple's Display P3 with sRGB compound (piece-wise) encoding transfer function, common on Mac devices
isdata: false
from_scene_reference: !<GroupTransform>
children:
- !<ColorSpaceTransform> {src: Linear CIE-XYZ E, dst: Linear DCI-P3 D65}
- !<ExponentWithLinearTransform> {gamma: 2.4, offset: 0.055, direction: inverse}
- !<ColorSpace>
name: Rec.1886
aliases: [BT.1886, BT.1886 2.4, BT.1886 EOTF, BT.1886 I-D65, Rec.1886 / Rec.709 Video - Display, rec1886_rec709_video_display, Rec.1886 Rec.709 - Display, rec1886_rec709_display, "Rec1886: 2.4 Gamma - Rec.709"]
family: Display
equalitygroup:
Eary marked this conversation as resolved
Brecht Van Lommel commented 2023-08-09 12:00:48 +02:00
Review
Copy Link

"E Gamut" -> "E-Gamut" also in the description, I have not seen it spelled without the dash elsewhere.

"E Gamut" -> "E-Gamut" also in the description, I have not seen it spelled without the dash elsewhere.
bitdepth: 32f
description: |
BT.1886 2.4 Exponent EOTF Display, commonly used for TVs
isdata: false
from_scene_reference: !<GroupTransform>
children:
- !<ColorSpaceTransform> {src: Linear CIE-XYZ E, dst: Linear Rec.709}
- !<ExponentWithLinearTransform> {gamma: 2.4, offset: 0, direction: inverse}
- !<ColorSpace>
Eary marked this conversation as resolved
Brecht Van Lommel commented 2023-08-09 12:04:11 +02:00
Review
Copy Link

Can we keep the family name for all these display to just "Display"?

With upcoming EDR support on macOS this one actually works for HDR too. And as long as we don't have HDR displays there is not much point in making a distinction.

Can we keep the family name for all these display to just "Display"? With upcoming EDR support on macOS this one actually works for HDR too. And as long as we don't have HDR displays there is not much point in making a distinction.
name: Rec.2020
aliases: [BT.2020, BT.2020 2.4, BT.2020 I-D65, Rec.1886 / Rec.2020 Video - Display, rec1886_rec2020_video_display, Rec.1886 Rec.2020 - Display, rec1886_rec2020_display, "Rec1886: 2.4 Gamma - Rec.2020"]
family: Display
equalitygroup:
bitdepth: 32f
description: |
BT.2020 2.4 Exponent EOTF Display
isdata: false
from_scene_reference: !<GroupTransform>
children:
- !<ColorSpaceTransform> {src: Linear CIE-XYZ E, dst: Linear Rec.2020}
- !<ExponentWithLinearTransform> {gamma: 2.4, offset: 0, direction: inverse}
- !<ColorSpace>
name: Non-Color
aliases: [Generic Data, Non-Colour Data, Raw, Utility - Raw]
family: raw
family: Data
description: |
Eary marked this conversation as resolved Outdated
Brecht Van Lommel commented 2023-08-09 12:02:32 +02:00
Outdated
Review
Copy Link

Is this DCI-P3? If so it would good to put that there in the description, and also mention that it is commonly used for digital cinema.

Is this DCI-P3? If so it would good to put that there in the description, and also mention that it is commonly used for digital cinema.
Zijun Zhou commented 2023-08-09 12:18:19 +02:00
Outdated
Review
Copy Link

This is actually Apple's Display P3, which is common on Mac devices.

This is actually Apple's Display P3, which is common on Mac devices.
Generic data that is not color, will not apply any color transform (e.g. normal maps)
equalitygroup:
@ -147,7 +236,7 @@ colorspaces:
- !<ColorSpace>
name: Filmic Log
family: log
family: Log Encodings
equalitygroup:
bitdepth: 32f
description: |
@ -155,18 +244,18 @@ colorspaces:
isdata: false
from_reference: !<GroupTransform>
Eary marked this conversation as resolved Outdated
Brecht Van Lommel commented 2023-08-09 12:01:43 +02:00
Outdated
Review
Copy Link

It would be good to mention this is commonly used for TVs.

It would be good to mention this is commonly used for TVs.
children:
- !<ColorSpaceTransform> {src: Linear CIE-XYZ E, dst: Linear}
- !<ColorSpaceTransform> {src: Linear CIE-XYZ E, dst: Linear Rec.709}
- !<AllocationTransform> {allocation: lg2, vars: [-12.473931188, 12.526068812]}
- !<FileTransform> {src: filmic_desat65cube.spi3d, interpolation: best}
- !<AllocationTransform> {allocation: uniform, vars: [0, 0.66]}
to_scene_reference: !<GroupTransform>
children:
- !<AllocationTransform> {allocation: lg2, vars: [-12.473931188, 4.026068812], direction: inverse}
- !<ColorSpaceTransform> {src: Linear CIE-XYZ E, dst: Linear, direction: inverse}
- !<ColorSpaceTransform> {src: Linear CIE-XYZ E, dst: Linear Rec.709, direction: inverse}
- !<ColorSpace>
name: Filmic sRGB
family:
family: Filmic
equalitygroup:
bitdepth: 32f
description: |
@ -179,7 +268,7 @@ colorspaces:
- !<ColorSpace>
Eary marked this conversation as resolved Outdated
Brecht Van Lommel commented 2023-08-09 12:06:02 +02:00
Outdated
Review
Copy Link

Data/Generic Data is not a very elegant name. Would go with just Data.

Data/Generic Data is not a very elegant name. Would go with just Data.
name: False Color
family: display
family: Filmic
equalitygroup:
bitdepth: 32f
description: |