forked from WebKit/WebKit
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Cocoa] AV1 codec strings specifying 4:2:0 Colocated subsampling inco…
…rrectly fail https://bugs.webkit.org/show_bug.cgi?id=278676 rdar://134375956 Reviewed by Eric Carlson. Correct a mismatch between CoreMedia's definition of the ChromaSubsampling parameter and the definition used by the AV1 ISO-BMFF bindings specification. CoreMedia uses a definition whose low-order digit specifies monochrome support, and AV1 uses chroma sample position in that same digit. Construct a query paratemer which matches CoreMedia's definition from the codecs string provided. Also, do more validation of combinations of monochrome and subsampling coordinates. * LayoutTests/media/av1-codec-validate-configuration-record-expected.txt: Added. * LayoutTests/media/av1-codec-validate-configuration-record.html: Added. * Source/WebCore/platform/graphics/AV1Utilities.cpp: (WebCore::validateAV1ConfigurationRecord): * Source/WebCore/platform/graphics/AV1Utilities.h: * Source/WebCore/platform/graphics/cocoa/AV1UtilitiesCocoa.mm: (WebCore::validateAV1Parameters): * Source/WebCore/testing/Internals.cpp: (WebCore::Internals::validateAV1ConfigurationRecord): Canonical link: https://commits.webkit.org/282806@main
- Loading branch information
Showing
8 changed files
with
195 additions
and
1 deletion.
There are no files selected for viewing
52 changes: 52 additions & 0 deletions
52
LayoutTests/media/av1-codec-validate-configuration-record-expected.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
* Main Profile | ||
Only 8 or 10 bit color is supported: | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.0.00M.08") == 'true') OK | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.0.00M.10") == 'true') OK | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.0.00M.12") == 'false') OK | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.0.00M.09") == 'false') OK | ||
Only 4:2:0 subsampling is supported: | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.0.00M.08.0.000.1.1.1.0") == 'false') OK | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.0.00M.08.0.100.1.1.1.0") == 'false') OK | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.0.00M.08.0.110.1.1.1.0") == 'true') OK | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.0.00M.08.0.111.1.1.1.0") == 'true') OK | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.0.00M.08.0.112.1.1.1.0") == 'true') OK | ||
|
||
* High Profile | ||
Only 8 or 10 bit color is supported: | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.1.00M.08.0.000.1.1.1.0") == 'true') OK | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.1.00M.10.0.000.1.1.1.0") == 'true') OK | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.1.00M.12.0.000.1.1.1.0") == 'false') OK | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.1.00M.09.0.000.1.1.1.0") == 'false') OK | ||
Only 4:4:4 subsampling is supported: | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.1.00M.08.0.000.1.1.1.0") == 'true') OK | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.1.00M.08.0.100.1.1.1.0") == 'false') OK | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.1.00M.08.0.110.1.1.1.0") == 'false') OK | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.1.00M.08.0.111.1.1.1.0") == 'false') OK | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.1.00M.08.0.112.1.1.1.0") == 'false') OK | ||
Monochrome is not supported: | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.1.00M.08.0.000.1.1.1.0") == 'true') OK | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.1.00M.08.1.000.1.1.1.0") == 'false') OK | ||
|
||
* Professional Profile | ||
Only 8, 10, or 12 bit color is supported: | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.2.00M.08.0.000.1.1.1.0") == 'true') OK | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.2.00M.10.0.000.1.1.1.0") == 'true') OK | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.2.00M.12.0.000.1.1.1.0") == 'true') OK | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.2.00M.09.0.000.1.1.1.0") == 'false') OK | ||
For 8 and 10 bit color, only 4:4:4 subsampling is supported: | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.2.00M.08.0.000.1.1.1.0") == 'true') OK | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.2.00M.08.0.100.1.1.1.0") == 'false') OK | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.2.00M.08.0.110.1.1.1.0") == 'false') OK | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.2.00M.08.0.111.1.1.1.0") == 'false') OK | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.2.00M.08.0.112.1.1.1.0") == 'false') OK | ||
For 12 bit color, only all subsampling values are supported: | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.2.00M.12.0.000.1.1.1.0") == 'true') OK | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.2.00M.12.0.100.1.1.1.0") == 'true') OK | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.2.00M.12.0.110.1.1.1.0") == 'true') OK | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.2.00M.12.0.111.1.1.1.0") == 'true') OK | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.2.00M.12.0.112.1.1.1.0") == 'true') OK | ||
Monochrome is supported for 12 bit color: | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.2.00M.12.0.000.1.1.1.0") == 'true') OK | ||
EXPECTED (internals.validateAV1ConfigurationRecord("av01.2.00M.12.1.110.1.1.1.0") == 'true') OK | ||
END OF TEST | ||
|
65 changes: 65 additions & 0 deletions
65
LayoutTests/media/av1-codec-validate-configuration-record.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
<!DOCTYPE html> | ||
<html> | ||
<head> | ||
<script src="video-test.js"></script> | ||
<script> | ||
window.addEventListener('load', event => { | ||
consoleWrite('* Main Profile'); | ||
consoleWrite('Only 8 or 10 bit color is supported:') | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.0.00M.08")`, true); | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.0.00M.10")`, true); | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.0.00M.12")`, false); | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.0.00M.09")`, false); | ||
consoleWrite('Only 4:2:0 subsampling is supported:') | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.0.00M.08.0.000.1.1.1.0")`, false); | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.0.00M.08.0.100.1.1.1.0")`, false); | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.0.00M.08.0.110.1.1.1.0")`, true); | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.0.00M.08.0.111.1.1.1.0")`, true); | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.0.00M.08.0.112.1.1.1.0")`, true); | ||
|
||
consoleWrite(''); | ||
consoleWrite('* High Profile'); | ||
consoleWrite('Only 8 or 10 bit color is supported:') | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.1.00M.08.0.000.1.1.1.0")`, true); | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.1.00M.10.0.000.1.1.1.0")`, true); | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.1.00M.12.0.000.1.1.1.0")`, false); | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.1.00M.09.0.000.1.1.1.0")`, false); | ||
consoleWrite('Only 4:4:4 subsampling is supported:') | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.1.00M.08.0.000.1.1.1.0")`, true); | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.1.00M.08.0.100.1.1.1.0")`, false); | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.1.00M.08.0.110.1.1.1.0")`, false); | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.1.00M.08.0.111.1.1.1.0")`, false); | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.1.00M.08.0.112.1.1.1.0")`, false); | ||
consoleWrite('Monochrome is not supported:'); | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.1.00M.08.0.000.1.1.1.0")`, true); | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.1.00M.08.1.000.1.1.1.0")`, false); | ||
|
||
consoleWrite(''); | ||
consoleWrite('* Professional Profile'); | ||
consoleWrite('Only 8, 10, or 12 bit color is supported:') | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.2.00M.08.0.000.1.1.1.0")`, true); | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.2.00M.10.0.000.1.1.1.0")`, true); | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.2.00M.12.0.000.1.1.1.0")`, true); | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.2.00M.09.0.000.1.1.1.0")`, false); | ||
consoleWrite('For 8 and 10 bit color, only 4:4:4 subsampling is supported:') | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.2.00M.08.0.000.1.1.1.0")`, true); | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.2.00M.08.0.100.1.1.1.0")`, false); | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.2.00M.08.0.110.1.1.1.0")`, false); | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.2.00M.08.0.111.1.1.1.0")`, false); | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.2.00M.08.0.112.1.1.1.0")`, false); | ||
consoleWrite('For 12 bit color, only all subsampling values are supported:') | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.2.00M.12.0.000.1.1.1.0")`, true); | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.2.00M.12.0.100.1.1.1.0")`, true); | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.2.00M.12.0.110.1.1.1.0")`, true); | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.2.00M.12.0.111.1.1.1.0")`, true); | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.2.00M.12.0.112.1.1.1.0")`, true); | ||
consoleWrite('Monochrome is supported for 12 bit color:'); | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.2.00M.12.0.000.1.1.1.0")`, true); | ||
testExpected(`internals.validateAV1ConfigurationRecord("av01.2.00M.12.1.110.1.1.1.0")`, true); | ||
endTest(); | ||
}, { once: true }); | ||
</script> | ||
</head> | ||
<body> | ||
</body> | ||
</html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters