Skip to content
Permalink
Browse files
[WPE] Two clearkey tests failing since r226621
https://bugs.webkit.org/show_bug.cgi?id=181532

Patch by Yacine Bandou <yacine.bandou_ext@softathome.com> on 2018-01-16
Reviewed by Xabier Rodriguez-Calvar.

Source/WebCore:

Whith a fake initData, we can have a pssh size nul, thus we should check it.
We saw this issue in the subtest "initData longer than 64Kb characters" in
the clearkey-generate-request-disallowed-input layout test.

* platform/encryptedmedia/clearkey/CDMClearKey.cpp:
(WebCore::extractKeyidsLocationFromCencInitData):

LayoutTests:

* platform/wpe/imported/w3c/web-platform-tests/encrypted-media/clearkey-generate-request-disallowed-input-expected.txt:
* platform/wpe/imported/w3c/web-platform-tests/encrypted-media/clearkey-mp4-unique-origin-expected.txt:
    Since r226621 initDataType "cenc" is supported in clearKey, so we should update the expected result of these tests.

Canonical link: https://commits.webkit.org/197517@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@226965 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Yacine Bandou authored and webkit-commit-queue committed Jan 16, 2018
1 parent b1c98e7 commit 0206d794fd3eff235beff69214ea44464de3f88b
@@ -1,3 +1,14 @@
2018-01-16 Yacine Bandou <yacine.bandou_ext@softathome.com>

[WPE] Two clearkey tests failing since r226621
https://bugs.webkit.org/show_bug.cgi?id=181532

Reviewed by Xabier Rodriguez-Calvar.

* platform/wpe/imported/w3c/web-platform-tests/encrypted-media/clearkey-generate-request-disallowed-input-expected.txt:
* platform/wpe/imported/w3c/web-platform-tests/encrypted-media/clearkey-mp4-unique-origin-expected.txt:
Since r226621 initDataType "cenc" is supported in clearKey, so we should update the expected result of these tests.

2018-01-16 Yacine Bandou <yacine.bandou_ext@softathome.com>

[EME] some fixes in clearKey-encrypted-cenc-event LayoutTest
@@ -1,5 +1,8 @@

FAIL org.w3.clearkey, temporary, cenc, initData longer than 64Kb characters assert_equals: expected "TypeError" but got "NotSupportedError"
PASS org.w3.clearkey, temporary, keyids, initData longer than 64Kb characters
FAIL org.w3.clearkey, temporary, cenc, invalid initdata (invalid pssh) assert_equals: expected "TypeError" but got "NotSupportedError"
FAIL org.w3.clearkey, temporary, cenc, invalid initdata (not pssh) assert_equals: expected "TypeError" but got "NotSupportedError"
FAIL org.w3.clearkey, temporary, keyids, invalid initdata (too short key ID) assert_unreached: generateRequest() succeeded unexpectedly Reached unreachable code
FAIL org.w3.clearkey, temporary, keyids, invalid initdata (too long key ID) assert_unreached: generateRequest() succeeded unexpectedly Reached unreachable code

@@ -1,3 +1,4 @@

FAIL Unique origin is unable to create MediaKeys promise_test: Unhandled rejection with value: object "NotSupportedError: The operation is not supported."
FAIL Unique origin is unable to create MediaKeys assert_equals: expected "failed" but got "allowed"


@@ -1,3 +1,17 @@
2018-01-16 Yacine Bandou <yacine.bandou_ext@softathome.com>

[WPE] Two clearkey tests failing since r226621
https://bugs.webkit.org/show_bug.cgi?id=181532

Reviewed by Xabier Rodriguez-Calvar.

Whith a fake initData, we can have a pssh size nul, thus we should check it.
We saw this issue in the subtest "initData longer than 64Kb characters" in
the clearkey-generate-request-disallowed-input layout test.

* platform/encryptedmedia/clearkey/CDMClearKey.cpp:
(WebCore::extractKeyidsLocationFromCencInitData):

2018-01-15 Yoav Weiss <yoav@yoav.ws>

Support for preconnect Link headers
@@ -187,6 +187,10 @@ static std::pair<unsigned, unsigned> extractKeyidsLocationFromCencInitData(const

psshSize = data[index + 2] * 256 + data[index + 3];

// Check the pssh size
if (!psshSize)
return keyIdsMap;

// 12 = BMFF box header + Full box header.
if (!memcmp(&data[index + 12], clearKeyCencSystemId, clearKeyCencSystemIdSize)) {
foundPssh = true;

0 comments on commit 0206d79

Please sign in to comment.