Changeset 273311 in webkit

Timestamp:

Feb 23, 2021, 9:09:50 AM (6 years ago)

Author:

calvaris@igalia.com

Message:

[GStreamer][EME][Thunder] Initialize decryptor lazily
​https://bugs.webkit.org/show_bug.cgi?id=222314

Reviewed by Philippe Normand.

In some cases, WebKit can be run before Thunder nano services are
up and without PSON, the result can be that you end up with WebKit
thinking there is no DRM system available.

First thing this patch does it removing the once flag so we keep
asking if there are DRM systems available if we are asked about
them from JS.

Second thing is that if we are queried from JS about the
availability of DRM systems and there are some available, we
initialize the decryptor.

• platform/graphics/gstreamer/GStreamerCommon.cpp:

(WebCore::registerWebKitGStreamerElements):

• platform/graphics/gstreamer/eme/CDMThunder.cpp:

(WebCore::CDMFactoryThunder::supportedKeySystems const):

• platform/graphics/gstreamer/eme/WebKitThunderDecryptorGStreamer.cpp:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/GStreamerCommon.cpp (modified) (1 diff)
• platform/graphics/gstreamer/eme/CDMThunder.cpp (modified) (2 diffs)
• platform/graphics/gstreamer/eme/WebKitThunderDecryptorGStreamer.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-02-23  Xabier Rodriguez Calvar  <calvaris@igalia.com>
+
+        [GStreamer][EME][Thunder] Initialize decryptor lazily
+        https://bugs.webkit.org/show_bug.cgi?id=222314
+
+        Reviewed by Philippe Normand.
+
+        In some cases, WebKit can be run before Thunder nano services are
+        up and without PSON, the result can be that you end up with WebKit
+        thinking there is no DRM system available.
+
+        First thing this patch does it removing the once flag so we keep
+        asking if there are DRM systems available if we are asked about
+        them from JS.
+
+        Second thing is that if we are queried from JS about the
+        availability of DRM systems and there are some available, we
+        initialize the decryptor.
+
+        * platform/graphics/gstreamer/GStreamerCommon.cpp:
+        (WebCore::registerWebKitGStreamerElements):
+        * platform/graphics/gstreamer/eme/CDMThunder.cpp:
+        (WebCore::CDMFactoryThunder::supportedKeySystems const):
+        * platform/graphics/gstreamer/eme/WebKitThunderDecryptorGStreamer.cpp:
+
 2021-02-23  Don Olmstead  <don.olmstead@sony.com>
 

trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp

@@ -312 +312 @@
 #if ENABLE(ENCRYPTED_MEDIA)
         gst_element_register(nullptr, "webkitclearkey", GST_RANK_PRIMARY + 200, WEBKIT_TYPE_MEDIA_CK_DECRYPT);
-#if ENABLE(THUNDER)
-        unsigned thunderRank = isThunderRanked() ? 300 : 100;
-        gst_element_register(nullptr, "webkitthunder", GST_RANK_PRIMARY + thunderRank, WEBKIT_TYPE_MEDIA_THUNDER_DECRYPT);
-#endif
 #endif
 

trunk/Source/WebCore/platform/graphics/gstreamer/eme/CDMThunder.cpp

@@ -43 +43 @@
 #include "NotImplemented.h"
 #include "SharedBuffer.h"
+#include "WebKitThunderDecryptorGStreamer.h"
 #include <algorithm>
 #include <iterator>
@@ -115 +116 @@
 const Vector<String>& CDMFactoryThunder::supportedKeySystems() const
 {
-    static std::once_flag onceFlag;
+    ASSERT(isMainThread());
+
     static Vector<String> supportedKeySystems;
-    std::call_once(onceFlag, [] {
+    if (supportedKeySystems.isEmpty()) {
         std::string emptyString;
         if (opencdm_is_type_supported(GStreamerEMEUtilities::s_WidevineKeySystem, emptyString.c_str()) == ERROR_NONE)
             supportedKeySystems.append(GStreamerEMEUtilities::s_WidevineKeySystem);
+        if (!supportedKeySystems.isEmpty()) {
+            unsigned thunderRank = isThunderRanked() ? 300 : 100;
+            gst_element_register(nullptr, "webkitthunder", GST_RANK_PRIMARY + thunderRank, WEBKIT_TYPE_MEDIA_THUNDER_DECRYPT);
+        }
 #ifndef NDEBUG
-        if (supportedKeySystems.isEmpty() && isThunderRanked()) {
-            ASSERT_NOT_REACHED_WITH_MESSAGE("Thunder is up-ranked as preferred decryptor but Thunder is not supporting any encryption system. Is "
+        else if (isThunderRanked())
+            GST_WARNING("Thunder is up-ranked as preferred decryptor but Thunder is not supporting any encryption system. Is "
                 "Thunder running? Are the plugins built?");
-        }
 #endif
-    });
+        GST_DEBUG("%u supported key systems", supportedKeySystems.size());
+    };
     return supportedKeySystems;
 }

trunk/Source/WebCore/platform/graphics/gstreamer/eme/WebKitThunderDecryptorGStreamer.cpp

@@ -71 +71 @@
     GRefPtr<GstCaps> caps = adoptGRef(gst_caps_new_empty());
 
-    if (CDMFactoryThunder::singleton().supportedKeySystems().isEmpty()) {
+    auto& supportedKeySystems = CDMFactoryThunder::singleton().supportedKeySystems();
+
+    if (supportedKeySystems.isEmpty()) {
         GST_WARNING("no supported key systems in Thunder, we won't be able to decrypt anything with the its decryptor");
         return caps;
@@ -80 +82 @@
             cencEncryptionMediaTypes[i], nullptr));
     }
-    for (const auto& keySystem : CDMFactoryThunder::singleton().supportedKeySystems()) {
+    for (const auto& keySystem : supportedKeySystems) {
         for (int i = 0; cencEncryptionMediaTypes[i]; ++i) {
             gst_caps_append_structure(caps.get(), gst_structure_new("application/x-cenc", "original-media-type", G_TYPE_STRING,