2034984 - change how jxl decoder does color management

Status: RESOLVED FIXED

(Core :: Graphics: ImageLib, enhancement)

Comment 1

[Timothy Nikkel (:tnikkel)]

Attachment: Bug 2034984. Change how jxl decoder does color management. r?#gfx-reviewers,saschanaz

We move away from getting jxl-rs passing us f32 buffers to do color management as part of it's decoding process before it hands us the final buffer, which is a pattern that none of our other image decoders follows.

We move towards a model where jxl-rs passes us a final buffer in a color space that it informs us of, and we can then perform further color management on it to the desired final space. There is one new wrinkle: we ask jxl-rs to gives us f16 data for hdr images, and then we convert it to u8 before passing it to the usual surface pipe. (This part is actually very similar to how we do cmyk and grayscale color management in the decoder before the surface pipe in the jpeg, png, and avif decoders.) I'm told this is also similar to how chromium's jxl decoder works.

Comment 2

[Timothy Nikkel (:tnikkel)]

Attachment: Bug 2034984. Remove internal CMS adapter from jxl-rs; simplify jxl_decoder_new API. r?#gfx-reviewers,saschanaz

Comment 3

[Timothy Nikkel (:tnikkel)]

Attachment: Bug 2034984. Add per-pixel-format detection and infrastructure to jxl decoder. r?#gfx-reviewers,saschanaz

Comment 4

[Timothy Nikkel (:tnikkel)]

Attachment: Bug 2034984. Add per-format pixel conversion and CMS wiring in C++ jxl decoder. r?#gfx-reviewers,saschanaz

Comment 5

[Timothy Nikkel (:tnikkel)]

Attachment: Bug 2034984. In the jxl decoder make sure to apply color management before premultiplying alpha. r?#gfx-reviewers,saschanaz

Comment 6

[Pulsebot]

Pushed by [e-mail]:
https://github.com/mozilla-firefox/firefox/commit/e8773825367c
https://hg.mozilla.org/integration/autoland/rev/8c68ea593849
Remove internal CMS adapter from jxl-rs; simplify jxl_decoder_new API. r=saschanaz
https://github.com/mozilla-firefox/firefox/commit/0604f3cc3697
https://hg.mozilla.org/integration/autoland/rev/9b9ba62b6d5d
Add per-pixel-format detection and infrastructure to jxl decoder. r=saschanaz
https://github.com/mozilla-firefox/firefox/commit/bae1c8f3a450
https://hg.mozilla.org/integration/autoland/rev/698d777a7344
Add per-format pixel conversion and CMS wiring in C++ jxl decoder. r=saschanaz
https://github.com/mozilla-firefox/firefox/commit/0e9724f81f5e
https://hg.mozilla.org/integration/autoland/rev/0c77f2770f45
In the jxl decoder make sure to apply color management before premultiplying alpha. r=saschanaz

Comment 7

[Pulsebot]

Pushed by [e-mail]:
https://github.com/mozilla-firefox/firefox/commit/eb1ea027c50b
https://hg.mozilla.org/integration/autoland/rev/d6592d369b3b
Revert "Bug 2034984, Bug 2034983. In the jxl decoder make sure to apply color management before premultiplying alpha. r=saschanaz" for causing gtest failures @BlendJXLWithFilter.

Comment 8

[Goloman Adrian[:agoloman]]

Backed out for causing gtest failures @BlendJXLWithFilter.

• Backout link
• Push with failures
• Failure Log

Comment 9

[Timothy Nikkel (:tnikkel)]

BlendJXLWithFilter just needs fuzz of 1, but there is actually a bigger issue in the linux tsan gtests -> bug 2036329 for that.

Comment 10

[Web Platform Test Sync Bot [:wpt-sync] (Matrix: #interop:mozilla.org)]

Created web-platform-tests PR https://github.com/web-platform-tests/wpt/pull/59609 for changes under testing/web-platform/tests

Comment 11

[Web Platform Test Sync Bot [:wpt-sync] (Matrix: #interop:mozilla.org)]

Upstream PR merged by moz-wptsync-bot

Comment 12

[Pulsebot]

Pushed by [e-mail]:
https://github.com/mozilla-firefox/firefox/commit/b5a600b11957
https://hg.mozilla.org/integration/autoland/rev/4af4144d7aae
Remove internal CMS adapter from jxl-rs; simplify jxl_decoder_new API. r=saschanaz
https://github.com/mozilla-firefox/firefox/commit/68bae1f3853c
https://hg.mozilla.org/integration/autoland/rev/294e82aa14b6
Add per-pixel-format detection and infrastructure to jxl decoder. r=saschanaz
https://github.com/mozilla-firefox/firefox/commit/c47523165998
https://hg.mozilla.org/integration/autoland/rev/5b9f2d7b3d60
Add per-format pixel conversion and CMS wiring in C++ jxl decoder. r=saschanaz
https://github.com/mozilla-firefox/firefox/commit/e4cd22188a2e
https://hg.mozilla.org/integration/autoland/rev/320f545118d7
In the jxl decoder make sure to apply color management before premultiplying alpha. r=saschanaz

Comment 13

[Goloman Adrian[:agoloman]]

Backed out for causing rust failures.

• Backout link
• Push with failures
• Failure Log

Comment 14

[Pulsebot]

Pushed by [e-mail]:
https://github.com/mozilla-firefox/firefox/commit/c872dea6f82c
https://hg.mozilla.org/integration/autoland/rev/c0719c236dc8
Remove internal CMS adapter from jxl-rs; simplify jxl_decoder_new API. r=saschanaz
https://github.com/mozilla-firefox/firefox/commit/c28167ab5e92
https://hg.mozilla.org/integration/autoland/rev/547f7fc58daa
Add per-pixel-format detection and infrastructure to jxl decoder. r=saschanaz
https://github.com/mozilla-firefox/firefox/commit/c781cd065b9e
https://hg.mozilla.org/integration/autoland/rev/5af1605158ff
Add per-format pixel conversion and CMS wiring in C++ jxl decoder. r=saschanaz
https://github.com/mozilla-firefox/firefox/commit/167c84616258
https://hg.mozilla.org/integration/autoland/rev/2ff1e151db6e
In the jxl decoder make sure to apply color management before premultiplying alpha. r=saschanaz

Comment 15

[amarc]

https://hg.mozilla.org/mozilla-central/rev/c0719c236dc8
https://hg.mozilla.org/mozilla-central/rev/547f7fc58daa
https://hg.mozilla.org/mozilla-central/rev/5af1605158ff
https://hg.mozilla.org/mozilla-central/rev/2ff1e151db6e

Comment 16

[Web Platform Test Sync Bot [:wpt-sync] (Matrix: #interop:mozilla.org)]

Created web-platform-tests PR https://github.com/web-platform-tests/wpt/pull/60007 for changes under testing/web-platform/tests

Comment 17

[Web Platform Test Sync Bot [:wpt-sync] (Matrix: #interop:mozilla.org)]

Upstream PR merged by moz-wptsync-bot