Bug 140825 - [Mac][EME] Support ClearKey encryption with AES128-encrypted HLS
Summary: [Mac][EME] Support ClearKey encryption with AES128-encrypted HLS
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Jer Noble
URL:
Keywords: InRadar
Depends on: 140850
Blocks:
  Show dependency treegraph
 
Reported: 2015-01-23 09:05 PST by Jer Noble
Modified: 2015-02-07 00:07 PST (History)
3 users (show)

See Also:


Attachments
Patch (1.03 MB, patch)
2015-01-23 09:57 PST, Jer Noble
eric.carlson: review+
Details | Formatted Diff | Diff
Patch for landing (1.03 MB, patch)
2015-01-23 13:23 PST, Jer Noble
no flags Details | Formatted Diff | Diff
Patch for landing - w/32-bit build fix (1.03 MB, patch)
2015-01-24 10:01 PST, Jer Noble
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Jer Noble 2015-01-23 09:05:28 PST
[Mac][EME] Support ClearKey encryption with AES128-encrypted HLS
Comment 1 Radar WebKit Bug Importer 2015-01-23 09:06:41 PST
<rdar://problem/19578900>
Comment 2 Jer Noble 2015-01-23 09:57:26 PST
Created attachment 245233 [details]
Patch
Comment 3 Eric Carlson 2015-01-23 10:35:26 PST
Comment on attachment 245233 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=245233&action=review

> Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.cpp:128
> +            if (!keysArray.get(i, keyDictionary) || keyDictionary.isUndefinedOrNull())
> +                continue;

It is probably worth adding logging in these failure cases.

> Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.h:48
> +    virtual RefPtr<ArrayBuffer> cachedKeyForKeyID(const String&) override;

Can't this and all of the related methods in other classes be declared "const"?
Comment 4 Jer Noble 2015-01-23 13:23:00 PST
Created attachment 245243 [details]
Patch for landing
Comment 5 WebKit Commit Bot 2015-01-23 18:20:35 PST
Comment on attachment 245243 [details]
Patch for landing

Clearing flags on attachment: 245243

Committed r179051: <http://trac.webkit.org/changeset/179051>
Comment 6 Tim Horton 2015-01-23 18:55:38 PST
This broke the 32-bit Mac build.
Comment 7 Jer Noble 2015-01-24 10:01:56 PST
Created attachment 245286 [details]
Patch for landing - w/32-bit build fix
Comment 8 WebKit Commit Bot 2015-02-04 15:27:23 PST
Comment on attachment 245286 [details]
Patch for landing - w/32-bit build fix

Clearing flags on attachment: 245286

Committed r179641: <http://trac.webkit.org/changeset/179641>