Changeset 243287 in webkit

Timestamp:

Mar 21, 2019, 5:14:04 AM (7 years ago)

Author:

cturner@igalia.com

Message:

[GStreamer][EME][Clearkey] Take a lock in keys() method
​https://bugs.webkit.org/show_bug.cgi?id=195900

Reviewed by Xabier Rodriguez-Calvar.

This isn't ideal, since we're taking a lock for every frame to
decode. But there's no good way around it when keys can be
made unavailable at any time via an update() call, so we can't
cache key IDs in the decryptor.

Covered by test imported/w3c/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-multikey.https.html

• platform/encryptedmedia/clearkey/CDMClearKey.cpp:

(WebCore::CDMInstanceClearKey::keys const): This method is called
from GStreamer's decode() method, which runs off the main thread,
therefore we need to take a lock.

• platform/encryptedmedia/clearkey/CDMClearKey.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-21  Charlie Turner  <cturner@igalia.com>
+
+        [GStreamer][EME][Clearkey] Take a lock in keys() method
+        https://bugs.webkit.org/show_bug.cgi?id=195900
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        This isn't ideal, since we're taking a lock for every frame to
+        decode. But there's no good way around it when keys can be
+        made unavailable at any time via an update() call, so we can't
+        cache key IDs in the decryptor.
+
+        Covered by test imported/w3c/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-multikey.https.html
+
+        * platform/encryptedmedia/clearkey/CDMClearKey.cpp:
+        (WebCore::CDMInstanceClearKey::keys const): This method is called
+        from GStreamer's decode() method, which runs off the main thread,
+        therefore we need to take a lock.
+        * platform/encryptedmedia/clearkey/CDMClearKey.h:
+
 2019-03-21  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -508 +508 @@
     // Return the keys of all sessions.
     Vector<CDMInstanceClearKey::Key> allKeys { };
+    auto locker = holdLock(m_keysMutex);
     size_t initialCapacity = 0;
     for (auto& key : ClearKeyState::singleton().keys().values())

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

@@ -98 +98 @@
 
     const Vector<Key> keys() const;
+
+private:
+    mutable Lock m_keysMutex;
 };