Changeset 227409 in webkit

Timestamp:

Jan 23, 2018 4:07:42 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[EME] Add support of multi keys from different sessions in CDMinstanceClearKey
​https://bugs.webkit.org/show_bug.cgi?id=180083

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

Add support of multi keys from different MediaKeySession in CDMInstanceClearKey.

Currently the CDMInstanceClearKey manages two "m_keys", one is a WTF::Vector
where it stores the list of last added keys, an other which is defined in the
ClearKeyState::singleton it is a WTF::HashMap, in this last one, it stores the
keys lists of each created session.

The method "keys()" of CDMInstanceClearKey returns the first "m_keys" which
contains just the list of last keys.

The goal of this commit is to return all keys lists of all sessions, thus
we remove the "m_keys" which is WTF::Vector and we modify the method
"keys()" to return all keys lists, which is stored in "m_keys" WTF::HashMap,
in one Vector instead of return just the list of last keys.

• platform/encryptedmedia/clearkey/CDMClearKey.cpp:

(WebCore::CDMInstanceClearKey::keys const):
(WebCore::CDMInstanceClearKey::updateLicense):

• platform/encryptedmedia/clearkey/CDMClearKey.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-01-23  Yacine Bandou  <yacine.bandou_ext@softathome.com>
+
+        [EME] Add support of multi keys from different sessions in CDMinstanceClearKey
+        https://bugs.webkit.org/show_bug.cgi?id=180083
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        Add support of multi keys from different MediaKeySession in CDMInstanceClearKey.
+
+        Currently the CDMInstanceClearKey manages two "m_keys", one is a WTF::Vector
+        where it stores the list of last added keys, an other which is defined in the
+        ClearKeyState::singleton it is a WTF::HashMap, in this last one, it stores the
+        keys lists of each created session.
+
+        The method "keys()" of CDMInstanceClearKey returns the first "m_keys" which
+        contains just the list of last keys.
+
+        The goal of this commit is to return all keys lists of all sessions, thus
+        we remove the "m_keys" which is WTF::Vector and we modify the method
+        "keys()" to return all keys lists, which is stored in "m_keys" WTF::HashMap,
+        in one Vector instead of return just the list of last keys.
+
+        * platform/encryptedmedia/clearkey/CDMClearKey.cpp:
+        (WebCore::CDMInstanceClearKey::keys const):
+        (WebCore::CDMInstanceClearKey::updateLicense):
+        * platform/encryptedmedia/clearkey/CDMClearKey.h:
+
 2018-01-22  Simon Fraser  <simon.fraser@apple.com>
 

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

@@ -481 +481 @@
 }
 
+const Vector<CDMInstanceClearKey::Key> CDMInstanceClearKey::keys() const
+{
+    // Return the keys of all sessions.
+    Vector<CDMInstanceClearKey::Key> allKeys { };
+    for (auto& key : ClearKeyState::singleton().keys().values())
+        allKeys.appendVector(key);
+
+    return allKeys;
+}
+
 void CDMInstanceClearKey::updateLicense(const String& sessionId, LicenseType, const SharedBuffer& response, LicenseUpdateCallback callback)
 {
@@ -566 +576 @@
         }
 
-        // Cache the key information Vector on CDMInstance for easier access from the pipeline.
-        m_keys = keyVector;
-
         dispatchCallback(false, WTFMove(changedKeys), SuccessValue::Succeeded);
         return;
@@ -577 +584 @@
         // FIXME: Retrieve the key ID information and use it to validate the keys for this sessionId.
         ClearKeyState::singleton().keys().remove(sessionId);
-        m_keys.clear();
         dispatchCallback(true, std::nullopt, SuccessValue::Succeeded);
         return;

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

@@ -103 +103 @@
     };
 
-    const Vector<Key>& keys() const { return m_keys; }
+    const Vector<Key> keys() const;
 
 private:
     WeakPtrFactory<CDMInstanceClearKey> m_weakPtrFactory;
-    Vector<Key> m_keys;
 };