Changeset 226965 in webkit


Ignore:
Timestamp:
Jan 16, 2018 12:13:04 AM (6 years ago)
Author:
commit-queue@webkit.org
Message:

[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.

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r226964 r226965  
     12018-01-16  Yacine Bandou  <yacine.bandou_ext@softathome.com>
     2
     3        [WPE] Two clearkey tests failing since r226621
     4        https://bugs.webkit.org/show_bug.cgi?id=181532
     5
     6        Reviewed by Xabier Rodriguez-Calvar.
     7
     8        * platform/wpe/imported/w3c/web-platform-tests/encrypted-media/clearkey-generate-request-disallowed-input-expected.txt:
     9        * platform/wpe/imported/w3c/web-platform-tests/encrypted-media/clearkey-mp4-unique-origin-expected.txt:
     10            Since r226621 initDataType "cenc" is supported in clearKey, so we should update the expected result of these tests.
     11
    1122018-01-16  Yacine Bandou  <yacine.bandou_ext@softathome.com>
    213

  • trunk/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/encrypted-media/clearkey-generate-request-disallowed-input-expected.txt

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

  • trunk/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/encrypted-media/clearkey-mp4-unique-origin-expected.txt

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

  • trunk/Source/WebCore/ChangeLog

    r226962 r226965  
     12018-01-16  Yacine Bandou  <yacine.bandou_ext@softathome.com>
     2
     3        [WPE] Two clearkey tests failing since r226621
     4        https://bugs.webkit.org/show_bug.cgi?id=181532
     5
     6        Reviewed by Xabier Rodriguez-Calvar.
     7
     8        Whith a fake initData, we can have a pssh size nul, thus we should check it.
     9        We saw this issue in the subtest "initData longer than 64Kb characters" in
     10        the clearkey-generate-request-disallowed-input layout test.
     11
     12        * platform/encryptedmedia/clearkey/CDMClearKey.cpp:
     13        (WebCore::extractKeyidsLocationFromCencInitData):
     14
    1152018-01-15  Yoav Weiss  <yoav@yoav.ws>
    216

  • trunk/Source/WebCore/platform/encryptedmedia/clearkey/CDMClearKey.cpp

    r226621 r226965  
    188188        psshSize = data[index + 2] * 256 + data[index + 3];
    189189
     190        // Check the pssh size
     191        if (!psshSize)
     192            return keyIdsMap;
     193
    190194        // 12 = BMFF box header + Full box header.
    191195        if (!memcmp(&data[index + 12], clearKeyCencSystemId, clearKeyCencSystemIdSize)) {
Note: See TracChangeset for help on using the changeset viewer.