[macOS Monterey and Big Sur] Enable AVIF image decoding using libavif and dav1d #5690

litherum · 2022-10-24T00:08:06Z

`5300e66`

[macOS Monterey and Big Sur] Enable AVIF image decoding using libavif and dav1d
https://bugs.webkit.org/show_bug.cgi?id=246925
rdar://101481679

Reviewed by Said Abou-Hallawa.

We checked in libavif and dav1d sources in 494a012c9820b947bdad5b6b5ea95df04e5bb1fe.

This patch hooks up image decoding to use them, on macOS Monterey and Big Sur. It does
so by using the same glue code that non-Apple platforms use: ScalableImageDecoder and
AVIFImageDecoder. This patch includes those files in Sources.txt for all ports, and
refactors ScalableImageDecoder on Cocoa platforms to only support AVIF, as per
https://webkit.slack.com/archives/CU64U6FDW/p1666556573569359?thread_ts=1666555605.109619&;cid=CU64U6FDW.

This patch re-uses the same USE(AVIF) flag that the non-Apple ports have been using.
There are currently 2 AVIF flags:
- USE(AVIF) indicates that libavif will be used to decode AVIF images, using the
ScalableImageDecoder infrastructure. This is enabled on the non-Apple ports,
and on macOS Monterey and Big Sur.
- HAVE(AVIF) indicates that the platform can decode AVIF images directly. This is enabled
on macOS Ventura and later (and other Cocoa ports).
These flags are mutually exclusive; no port has both enabled at the same time. The Apple
Windows port has neither of these flags enabled.

* Source/WTF/wtf/PlatformUse.h:
* Source/WebCore/Configurations/WebCore.xcconfig:
* Source/WebCore/PAL/libavif/Configurations/libavif.xcconfig:
* Source/WebCore/Sources.txt:
* Source/WebCore/SourcesCocoa.txt:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebCore/platform/graphics/ImageDecoder.cpp:
(WebCore::ImageDecoder::create):
* Source/WebCore/platform/graphics/cg/ImageBackingStoreCG.cpp: Copied from Source/WebCore/platform/image-decoders/avif/AVIFImageDecoder.h.
(WebCore::ImageBackingStore::image const):
* Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp:
(WebCore::ImageDecoderCG::decodeUTI const):
(WebCore::ImageDecoderCG::decodeUTI):
* Source/WebCore/platform/graphics/cg/ImageDecoderCG.h:
* Source/WebCore/platform/image-decoders/ScalableImageDecoder.cpp:
(WebCore::ScalableImageDecoder::create):
* Source/WebCore/platform/image-decoders/avif/AVIFImageDecoder.h:
* Source/WebCore/platform/image-decoders/avif/AVIFImageReader.cpp:
(WebCore::AVIFImageReader::decodeFrame):

Canonical link: https://commits.webkit.org/255984@main

eb1134f

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	🛠 ios	~~🛠 mac~~	~~🛠 wpe~~	~~🛠 🧪 win~~
✅ 🧪 bindings	✅ 🛠 ios-sim	~~🛠 mac-debug~~	✅ 🛠 gtk	~~🛠 wincairo~~
✅ 🧪 webkitperl	~~🧪 ios-wk2~~	✅ 🛠 mac-AS-debug	~~🧪 gtk-wk2~~
	~~🧪 api-ios~~	~~🧪 api-mac~~	~~🧪 api-gtk~~
✅ 🛠 🧪 jsc	✅ 🛠 tv	~~🧪 mac-wk1~~	✅ 🛠 jsc-armv7
	✅ 🛠 tv-sim	~~🧪 mac-wk2~~	✅ 🧪 jsc-armv7-tests
✅ 🛠 🧪 merge	✅ 🛠 watch	~~🧪 mac-AS-debug-wk2~~	✅ 🛠 jsc-mips
	✅ 🛠 watch-sim	~~🧪 mac-wk2-stress~~	✅ 🧪 jsc-mips-tests

webkit-early-warning-system · 2022-10-24T00:10:42Z

EWS run on previous version of this PR (hash d412bd1)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	❌ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	~~🛠 🧪 win~~
✅ 🧪 bindings	❌ 🛠 ios-sim	✅ 🛠 mac-debug	✅ 🛠 gtk	✅ 🛠 wincairo
✅ 🧪 webkitperl	❌ 🧪 ios-wk2	✅ 🛠 mac-AS-debug	~~🧪 gtk-wk2~~
	❌ 🧪 api-ios	~~🧪 api-mac~~	~~🧪 api-gtk~~
✅ 🛠 🧪 jsc	❌ 🛠 tv	✅ 🧪 mac-wk1	✅ 🛠 jsc-armv7
	❌ 🛠 tv-sim	✅ 🧪 mac-wk2	✅ 🧪 jsc-armv7-tests
	❌ 🛠 watch	~~🧪 mac-AS-debug-wk2~~	✅ 🛠 jsc-mips
	❌ 🛠 watch-sim	✅ 🧪 mac-wk2-stress	✅ 🧪 jsc-mips-tests

webkit-early-warning-system · 2022-10-24T01:06:12Z

EWS run on previous version of this PR (hash 2b1efa8)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	❌ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	❌ 🛠 🧪 win
✅ 🧪 bindings	❌ 🛠 ios-sim	✅ 🛠 mac-debug	✅ 🛠 gtk	✅ 🛠 wincairo
✅ 🧪 webkitperl	❌ 🧪 ios-wk2	✅ 🛠 mac-AS-debug	✅ 🧪 gtk-wk2
	❌ 🧪 api-ios	~~🧪 api-mac~~	✅ 🧪 api-gtk
✅ 🛠 🧪 jsc	❌ 🛠 tv	✅ 🧪 mac-wk1	✅ 🛠 jsc-armv7
	❌ 🛠 tv-sim	✅ 🧪 mac-wk2	✅ 🧪 jsc-armv7-tests
	❌ 🛠 watch	~~🧪 mac-AS-debug-wk2~~	✅ 🛠 jsc-mips
	❌ 🛠 watch-sim	✅ 🧪 mac-wk2-stress	✅ 🧪 jsc-mips-tests

webkit-early-warning-system · 2022-10-24T03:08:12Z

EWS run on previous version of this PR (hash 9934097)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	❌ 🛠 🧪 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-debug	✅ 🛠 gtk	✅ 🛠 wincairo
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🛠 mac-AS-debug	✅ 🧪 gtk-wk2
	✅ 🧪 api-ios	✅ 🧪 api-mac	✅ 🧪 api-gtk
✅ 🛠 🧪 jsc	✅ 🛠 tv	✅ 🧪 mac-wk1	✅ 🛠 jsc-armv7
	✅ 🛠 tv-sim	✅ 🧪 mac-wk2	✅ 🧪 jsc-armv7-tests
	✅ 🛠 watch	✅ 🧪 mac-AS-debug-wk2	✅ 🛠 jsc-mips
	✅ 🛠 watch-sim	✅ 🧪 mac-wk2-stress	✅ 🧪 jsc-mips-tests

shallawa

Should not all/some of the skipped AVIF tests be un-skipped with this change?

fast/images/avif-image-decoding.html [ Skip ]
fast/images/avif-as-image.html [ Skip ]
fast/images/avif-heif-container-as-image.html [ Skip ]
fast/images/animated-avif.html [ Skip ]
http/tests/images/avif-partial-load-crash.html [ Skip ]

Source/WebCore/platform/graphics/ImageDecoder.cpp

Source/WebCore/platform/image-decoders/ScalableImageDecoder.cpp

webkit-early-warning-system · 2022-10-24T18:55:31Z

EWS run on previous version of this PR (hash 7e2ec93)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	❌ 🛠 🧪 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-debug	✅ 🛠 gtk	✅ 🛠 wincairo
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🛠 mac-AS-debug	✅ 🧪 gtk-wk2
	✅ 🧪 api-ios	~~🧪 api-mac~~	✅ 🧪 api-gtk
✅ 🛠 🧪 jsc	✅ 🛠 tv	✅ 🧪 mac-wk1	✅ 🛠 jsc-armv7
	✅ 🛠 tv-sim	✅ 🧪 mac-wk2	✅ 🧪 jsc-armv7-tests
	✅ 🛠 watch	✅ 🧪 mac-AS-debug-wk2	✅ 🛠 jsc-mips
	✅ 🛠 watch-sim	✅ 🧪 mac-wk2-stress	✅ 🧪 jsc-mips-tests

webkit-early-warning-system · 2022-10-25T07:50:01Z

EWS run on previous version of this PR (hash 3c88d48)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 🧪 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-debug	✅ 🛠 gtk	✅ 🛠 wincairo
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🛠 mac-AS-debug	✅ 🧪 gtk-wk2
	✅ 🧪 api-ios	~~🧪 api-mac~~	✅ 🧪 api-gtk
✅ 🛠 🧪 jsc	✅ 🛠 tv	❌ 🧪 mac-wk1	✅ 🛠 jsc-armv7
	✅ 🛠 tv-sim	❌ 🧪 mac-wk2	✅ 🧪 jsc-armv7-tests
❌ 🛠 🧪 merge	✅ 🛠 watch	~~🧪 mac-AS-debug-wk2~~	✅ 🛠 jsc-mips
	✅ 🛠 watch-sim	✅ 🧪 mac-wk2-stress	✅ 🧪 jsc-mips-tests

webkit-early-warning-system · 2022-10-25T18:40:33Z

EWS run on current version of this PR (hash eb1134f)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	🛠 ios	~~🛠 mac~~	~~🛠 wpe~~	~~🛠 🧪 win~~
✅ 🧪 bindings	✅ 🛠 ios-sim	~~🛠 mac-debug~~	✅ 🛠 gtk	~~🛠 wincairo~~
✅ 🧪 webkitperl	~~🧪 ios-wk2~~	✅ 🛠 mac-AS-debug	~~🧪 gtk-wk2~~
	~~🧪 api-ios~~	~~🧪 api-mac~~	~~🧪 api-gtk~~
✅ 🛠 🧪 jsc	✅ 🛠 tv	~~🧪 mac-wk1~~	✅ 🛠 jsc-armv7
	✅ 🛠 tv-sim	~~🧪 mac-wk2~~	✅ 🧪 jsc-armv7-tests
✅ 🛠 🧪 merge	✅ 🛠 watch	~~🧪 mac-AS-debug-wk2~~	✅ 🛠 jsc-mips
	✅ 🛠 watch-sim	~~🧪 mac-wk2-stress~~	✅ 🧪 jsc-mips-tests

… and dav1d https://bugs.webkit.org/show_bug.cgi?id=246925 rdar://101481679 Reviewed by Said Abou-Hallawa. We checked in libavif and dav1d sources in 494a012. This patch hooks up image decoding to use them, on macOS Monterey and Big Sur. It does so by using the same glue code that non-Apple platforms use: ScalableImageDecoder and AVIFImageDecoder. This patch includes those files in Sources.txt for all ports, and refactors ScalableImageDecoder on Cocoa platforms to only support AVIF, as per https://webkit.slack.com/archives/CU64U6FDW/p1666556573569359?thread_ts=1666555605.109619&cid=CU64U6FDW. This patch re-uses the same USE(AVIF) flag that the non-Apple ports have been using. There are currently 2 AVIF flags: - USE(AVIF) indicates that libavif will be used to decode AVIF images, using the ScalableImageDecoder infrastructure. This is enabled on the non-Apple ports, and on macOS Monterey and Big Sur. - HAVE(AVIF) indicates that the platform can decode AVIF images directly. This is enabled on macOS Ventura and later (and other Cocoa ports). These flags are mutually exclusive; no port has both enabled at the same time. The Apple Windows port has neither of these flags enabled. * Source/WTF/wtf/PlatformUse.h: * Source/WebCore/Configurations/WebCore.xcconfig: * Source/WebCore/PAL/libavif/Configurations/libavif.xcconfig: * Source/WebCore/Sources.txt: * Source/WebCore/SourcesCocoa.txt: * Source/WebCore/WebCore.xcodeproj/project.pbxproj: * Source/WebCore/platform/graphics/ImageDecoder.cpp: (WebCore::ImageDecoder::create): * Source/WebCore/platform/graphics/cg/ImageBackingStoreCG.cpp: Copied from Source/WebCore/platform/image-decoders/avif/AVIFImageDecoder.h. (WebCore::ImageBackingStore::image const): * Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp: (WebCore::ImageDecoderCG::decodeUTI const): (WebCore::ImageDecoderCG::decodeUTI): * Source/WebCore/platform/graphics/cg/ImageDecoderCG.h: * Source/WebCore/platform/image-decoders/ScalableImageDecoder.cpp: (WebCore::ScalableImageDecoder::create): * Source/WebCore/platform/image-decoders/avif/AVIFImageDecoder.h: * Source/WebCore/platform/image-decoders/avif/AVIFImageReader.cpp: (WebCore::AVIFImageReader::decodeFrame): Canonical link: https://commits.webkit.org/255984@main

webkit-commit-queue · 2022-10-25T21:37:22Z

Committed 255984@main (5300e66): https://commits.webkit.org/255984@main

Reviewed commits have been landed. Closing PR #5690 and removing active labels.

litherum self-assigned this Oct 24, 2022

litherum added Images For bugs in image handling. WebKit Nightly Build labels Oct 24, 2022

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Oct 24, 2022

litherum removed the merging-blocked Applied to prevent a change from being merged label Oct 24, 2022

litherum force-pushed the eng/macOS-Monterey-and-Big-Sur-Enable-AVIF-image-decoding-using-libavif-and-dav1d branch from d412bd1 to 2b1efa8 Compare October 24, 2022 01:05

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Oct 24, 2022

litherum removed the merging-blocked Applied to prevent a change from being merged label Oct 24, 2022

litherum force-pushed the eng/macOS-Monterey-and-Big-Sur-Enable-AVIF-image-decoding-using-libavif-and-dav1d branch from 2b1efa8 to 9934097 Compare October 24, 2022 03:07

litherum requested a review from shallawa October 24, 2022 04:04

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Oct 24, 2022

shallawa approved these changes Oct 24, 2022

View reviewed changes

litherum removed the merging-blocked Applied to prevent a change from being merged label Oct 24, 2022

litherum force-pushed the eng/macOS-Monterey-and-Big-Sur-Enable-AVIF-image-decoding-using-libavif-and-dav1d branch from 9934097 to 7e2ec93 Compare October 24, 2022 18:45

litherum marked this pull request as draft October 24, 2022 19:47

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Oct 24, 2022

litherum removed the merging-blocked Applied to prevent a change from being merged label Oct 25, 2022

litherum force-pushed the eng/macOS-Monterey-and-Big-Sur-Enable-AVIF-image-decoding-using-libavif-and-dav1d branch from 7e2ec93 to 3c88d48 Compare October 25, 2022 07:47

litherum marked this pull request as ready for review October 25, 2022 07:48

litherum added the merge-queue Applied to send a pull request to merge-queue label Oct 25, 2022

webkit-commit-queue added merging-blocked Applied to prevent a change from being merged and removed merge-queue Applied to send a pull request to merge-queue labels Oct 25, 2022

litherum removed the merging-blocked Applied to prevent a change from being merged label Oct 25, 2022

litherum force-pushed the eng/macOS-Monterey-and-Big-Sur-Enable-AVIF-image-decoding-using-libavif-and-dav1d branch from 3c88d48 to eb1134f Compare October 25, 2022 18:05

litherum added the merge-queue Applied to send a pull request to merge-queue label Oct 25, 2022

webkit-early-warning-system force-pushed the eng/macOS-Monterey-and-Big-Sur-Enable-AVIF-image-decoding-using-libavif-and-dav1d branch from eb1134f to 5300e66 Compare October 25, 2022 21:37

webkit-early-warning-system merged commit 5300e66 into WebKit:main Oct 25, 2022

webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Oct 25, 2022

litherum deleted the eng/macOS-Monterey-and-Big-Sur-Enable-AVIF-image-decoding-using-libavif-and-dav1d branch October 26, 2022 00:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[macOS Monterey and Big Sur] Enable AVIF image decoding using libavif and dav1d #5690

[macOS Monterey and Big Sur] Enable AVIF image decoding using libavif and dav1d #5690

litherum commented Oct 24, 2022 •

edited by webkit-early-warning-system

webkit-early-warning-system commented Oct 24, 2022 •

edited

webkit-early-warning-system commented Oct 24, 2022 •

edited

webkit-early-warning-system commented Oct 24, 2022 •

edited

shallawa left a comment •

edited

webkit-early-warning-system commented Oct 24, 2022 •

edited

webkit-early-warning-system commented Oct 25, 2022 •

edited

webkit-early-warning-system commented Oct 25, 2022 •

edited

webkit-commit-queue commented Oct 25, 2022

[macOS Monterey and Big Sur] Enable AVIF image decoding using libavif and dav1d #5690

[macOS Monterey and Big Sur] Enable AVIF image decoding using libavif and dav1d #5690

Conversation

litherum commented Oct 24, 2022 • edited by webkit-early-warning-system

5300e66

webkit-early-warning-system commented Oct 24, 2022 • edited

webkit-early-warning-system commented Oct 24, 2022 • edited

webkit-early-warning-system commented Oct 24, 2022 • edited

shallawa left a comment • edited

Choose a reason for hiding this comment

webkit-early-warning-system commented Oct 24, 2022 • edited

webkit-early-warning-system commented Oct 25, 2022 • edited

webkit-early-warning-system commented Oct 25, 2022 • edited

webkit-commit-queue commented Oct 25, 2022

litherum commented Oct 24, 2022 •

edited by webkit-early-warning-system

`5300e66`

webkit-early-warning-system commented Oct 24, 2022 •

edited

webkit-early-warning-system commented Oct 24, 2022 •

edited

webkit-early-warning-system commented Oct 24, 2022 •

edited

shallawa left a comment •

edited

webkit-early-warning-system commented Oct 24, 2022 •

edited

webkit-early-warning-system commented Oct 25, 2022 •

edited

webkit-early-warning-system commented Oct 25, 2022 •

edited