Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR: ACES 1.1 and ACES 1.2 Support #21

Open
wants to merge 33 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
4e15449
Add ".gitignore" file.
KelSolaar Mar 26, 2019
b0ad3c1
Copy "aces_1.0.3" directory to "aces_1.1".
KelSolaar Mar 26, 2019
cf54426
Update version number from "1.0.3" to "1.1".
KelSolaar Mar 26, 2019
713beac
Fix typo in "README.md" file.
KelSolaar Mar 28, 2019
8efd3bc
Reduce size of "spi1d" LUTs.
KelSolaar Mar 28, 2019
3e78424
Refactor "aces_ocio.colorspaces.aces.get_ODTs_info" and "aces_ocio.co…
KelSolaar Mar 29, 2019
27a5781
Implement support for "SSTS" based output transforms.
KelSolaar Mar 31, 2019
81ba2e3
Improve naming convention consistency, "Python 3" compatibility and f…
KelSolaar Jun 28, 2019
ddcfcfa
Ensure that "Blue Light Artifact Fix" LMT uses a matrix representation.
KelSolaar Apr 6, 2019
e18ac40
Remove NaNs with post-processing.
KelSolaar Jun 2, 2019
f0f015c
Increase "spi1d" and "csp" LUTs precision.
KelSolaar Jun 3, 2019
c2e3fb3
Implement support for better round-trip precision as per @kevinjw sug…
KelSolaar Jun 3, 2019
73f2624
Reduce artefacts induced by over-exposure of highly saturated colours.
KelSolaar Jun 28, 2019
aedc19a
Ensure default generates a 65 samples per edge 3D LUT.
KelSolaar Aug 21, 2019
5c38100
Update "README.md" file.
KelSolaar Aug 21, 2019
07ed7c9
Build "ACES 1.1" config.
KelSolaar Apr 1, 2019
ef4bbe5
Copy "aces_1.1" directory to "aces_1.2".
KelSolaar Jan 26, 2020
c281984
Update version number from "1.1" to "1.2".
KelSolaar Jan 26, 2020
c3de77c
Implement support for "Python" 3 and "OpenImageIO" 2.
KelSolaar Jan 26, 2020
c10a20d
Add new "CTL" "Academy" namespace wherever required.
KelSolaar Jan 26, 2020
87484c2
Set "color_picking" role to "Output - sRGB" for consistency.
KelSolaar Jan 26, 2020
a3cd287
Implement support for "Sony Venice" "S.Gamut3" and "S.Gamut3.Cine" IDTs.
KelSolaar Jan 26, 2020
5b9b5fc
Update various docstrings and comments.
KelSolaar Feb 5, 2020
5bf2f9a
Add new "Utility - Gamma 2.2 - Rec.709 - Texture" and "Utility - Gamm…
KelSolaar Feb 5, 2020
5533cfa
Update "README.md" file.
KelSolaar Apr 5, 2020
0857366
Build "ACES 1.2" config.
KelSolaar Feb 5, 2020
ec5abfd
Add "A.M.P.A.S." license to Academy mandated work and contributions.
KelSolaar Aug 18, 2021
94ecd67
Merge pull request #9 from colour-science/feature/aces-1.1-config
KelSolaar Aug 18, 2021
e94310b
Merge pull request #10 from colour-science/feature/aces-1.2-config
KelSolaar Aug 18, 2021
050b4ae
Merge pull request #11 from colour-science/feature/license
KelSolaar Aug 23, 2021
86911af
Use updated license text from https://spdx.org/licenses/AMPAS.html as…
KelSolaar Aug 24, 2021
b0a3ae2
Merge pull request #12 from colour-science/feature/license
KelSolaar Apr 14, 2022
3af87f1
Update *README* file.
KelSolaar Sep 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Set "color_picking" role to "Output - sRGB" for consistency.
KelSolaar committed Jan 26, 2020
commit 87484c2baf1fb5409296ab19159935216ae1f211
18 changes: 9 additions & 9 deletions aces_1.2/config.ocio
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ description: An ACES config generated from python


roles:
color_picking: Output - Rec.709
color_picking: Output - sRGB
color_timing: ACES - ACEScc
compositing_linear: ACES - ACEScg
compositing_log: Input - ADX - ADX10
@@ -2373,14 +2373,14 @@ colorspaces:
equalitygroup: ""
bitdepth: 32f
description: |
ACES 1.0 Output - Rec.709 Output Transform
ACES 1.0 Output - sRGB Output Transform

ACES Transform ID : ODT.Academy.Rec709_100nits_dim.a1.0.3
ACES Transform ID : ODT.Academy.RGBmonitor_100nits_dim.a1.0.3
isdata: false
allocation: uniform
allocationvars: [0, 1]
to_reference: !<ColorSpaceTransform> {src: Output - Rec.709, dst: ACES - ACES2065-1}
from_reference: !<ColorSpaceTransform> {src: ACES - ACES2065-1, dst: Output - Rec.709}
to_reference: !<ColorSpaceTransform> {src: Output - sRGB, dst: ACES - ACES2065-1}
from_reference: !<ColorSpaceTransform> {src: ACES - ACES2065-1, dst: Output - sRGB}

- !<ColorSpace>
name: Role - color_timing
@@ -4550,14 +4550,14 @@ colorspaces:
equalitygroup: ""
bitdepth: 32f
description: |
ACES 1.0 Output - Rec.709 Output Transform
ACES 1.0 Output - sRGB Output Transform

ACES Transform ID : ODT.Academy.Rec709_100nits_dim.a1.0.3
ACES Transform ID : ODT.Academy.RGBmonitor_100nits_dim.a1.0.3
isdata: false
allocation: uniform
allocationvars: [0, 1]
to_reference: !<ColorSpaceTransform> {src: Output - Rec.709, dst: ACES - ACES2065-1}
from_reference: !<ColorSpaceTransform> {src: ACES - ACES2065-1, dst: Output - Rec.709}
to_reference: !<ColorSpaceTransform> {src: Output - sRGB, dst: ACES - ACES2065-1}
from_reference: !<ColorSpaceTransform> {src: ACES - ACES2065-1, dst: Output - sRGB}

- !<ColorSpace>
name: role_color_timing
2 changes: 1 addition & 1 deletion aces_1.2/python/aces_ocio/colorspaces/aces.py
Original file line number Diff line number Diff line change
@@ -1986,7 +1986,7 @@ def create_colorspaces(aces_ctl_directory, lut_directory, lut_resolution_1D,

# TODO: Investigate if there is a way to retrieve these values from *CTL*.
default_display = 'sRGB'
color_picking = 'Rec.709'
color_picking = 'sRGB'

roles = {
'color_picking': color_picking,