Changeset 235610 in webkit

Timestamp:

Sep 4, 2018 3:27:27 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[EME] Add the WebM initData support in ClearKey CDM
​https://bugs.webkit.org/show_bug.cgi?id=189240

Patch by Yacine Bandou <​yacine.bandou_ext@softathome.com> on 2018-09-04
Reviewed by Xabier Rodriguez-Calvar.

Add the "webm" initDataType support in ClearKey CDM.
Read the WebM initData by following the W3C spec ​https://www.w3.org/TR/eme-initdata-webm/#common-system,
and put it in JSON object format like is specified in ​https://www.w3.org/TR/encrypted-media/#clear-key-request-format.

Tests: media/encrypted-media/clearKey/clearKey-encrypted-webm-event-mse.html

media/encrypted-media/clearKey/clearKey-webm-video-playback-mse.html

• platform/encryptedmedia/clearkey/CDMClearKey.cpp:

(WebCore::extractKeyIdFromWebMInitData):
(WebCore::CDMPrivateClearKey::supportsInitDataType const):
(WebCore::CDMPrivateClearKey::supportsInitData const):
(WebCore::CDMInstanceClearKey::requestLicense):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/encryptedmedia/clearkey/CDMClearKey.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-09-04  Yacine Bandou  <yacine.bandou_ext@softathome.com>
+
+        [EME] Add the WebM initData support in ClearKey CDM
+        https://bugs.webkit.org/show_bug.cgi?id=189240
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        Add the "webm" initDataType support in ClearKey CDM.
+        Read the WebM initData by following the W3C spec https://www.w3.org/TR/eme-initdata-webm/#common-system,
+        and put it in JSON object format like is specified in https://www.w3.org/TR/encrypted-media/#clear-key-request-format.
+
+        Tests: media/encrypted-media/clearKey/clearKey-encrypted-webm-event-mse.html
+               media/encrypted-media/clearKey/clearKey-webm-video-playback-mse.html
+
+        * platform/encryptedmedia/clearkey/CDMClearKey.cpp:
+        (WebCore::extractKeyIdFromWebMInitData):
+        (WebCore::CDMPrivateClearKey::supportsInitDataType const):
+        (WebCore::CDMPrivateClearKey::supportsInitData const):
+        (WebCore::CDMInstanceClearKey::requestLicense):
+
 2018-09-03  Andy Estes  <aestes@apple.com>
 

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

@@ -264 +264 @@
 }
 
+static Ref<SharedBuffer> extractKeyIdFromWebMInitData(const SharedBuffer& initData)
+{
+    Ref<SharedBuffer> keyIds = SharedBuffer::create();
+
+    // Check if initData is a valid WebM initData.
+    if (initData.isEmpty() || initData.size() > std::numeric_limits<unsigned>::max())
+        return keyIds;
+
+    auto object = JSON::Object::create();
+    auto keyIdsArray = JSON::Array::create();
+
+    // Read the KeyId
+    // 9.1.3 License Request Format
+    // This section describes the format of the license request provided to the application via the message attribute of the message event.
+    // The format is a JSON object containing the following members:
+    // "kids"
+    // An array of key IDs. Each element of the array is the base64url encoding of the octet sequence containing the key ID value.
+    String keyId = WTF::base64URLEncode(initData.data(), initData.size());
+    keyIdsArray->pushString(keyId);
+
+    object->setArray("kids", WTFMove(keyIdsArray));
+    CString jsonData = object->toJSONString().utf8();
+    keyIds->append(jsonData.data(), jsonData.length());
+    return keyIds;
+}
+
 CDMFactoryClearKey& CDMFactoryClearKey::singleton()
 {
@@ -295 +321 @@
 {
     // `keyids` and 'cenc' are the only supported init data type.
-    return (equalLettersIgnoringASCIICase(initDataType, "keyids") || equalLettersIgnoringASCIICase(initDataType, "cenc"));
+    return (equalLettersIgnoringASCIICase(initDataType, "keyids") || equalLettersIgnoringASCIICase(initDataType, "cenc") || equalLettersIgnoringASCIICase(initDataType, "webm"));
 }
 
@@ -404 +430 @@
     // Validate the initData buffer as CENC initData.
     if (equalLettersIgnoringASCIICase(initDataType, "cenc") && isCencInitData(initData))
+        return true;
+
+    // Validate the initData buffer as WebM initData.
+    if (equalLettersIgnoringASCIICase(initDataType, "webm") && !initData.isEmpty())
         return true;
 
@@ -471 +501 @@
     if (equalLettersIgnoringASCIICase(initDataType, "cenc"))
         initData = extractKeyidsFromCencInitData(initData.get());
+
+    if (equalLettersIgnoringASCIICase(initDataType, "webm"))
+        initData = extractKeyIdFromWebMInitData(initData.get());
 
     callOnMainThread(