Changeset 231699 in webkit

Timestamp:

May 11, 2018 3:50:37 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[EME][GStreamer] Handle the protection event in MediaPlayerPrivate
​https://bugs.webkit.org/show_bug.cgi?id=185535

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

This patch is based on this calvaris's commit
​https://github.com/WebPlatformForEmbedded/WPEWebKit/commit/d966168b0d2b65f9ca9415426e26d3752c78b03e

It adds a handler for the protection event in MediaPalyerPrivateGStreamerBase, it extracts the InitData from the event
and sends the encrypted event to JS via HTMLMediaElement.

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:

(WebCore::MediaPlayerPrivateGStreamerBase::initializationDataEncountered):
(WebCore::MediaPlayerPrivateGStreamerBase::handleProtectionEvent):

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
• platform/graphics/gstreamer/eme/GStreamerEMEUtilities.h: Add a new type InitData.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (modified) (2 diffs)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h (modified) (1 diff)
• platform/graphics/gstreamer/eme/GStreamerEMEUtilities.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-05-11  Yacine Bandou  <yacine.bandou_ext@softathome.com>
+
+        [EME][GStreamer] Handle the protection event in MediaPlayerPrivate
+        https://bugs.webkit.org/show_bug.cgi?id=185535
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        This patch is based on this calvaris's commit
+        https://github.com/WebPlatformForEmbedded/WPEWebKit/commit/d966168b0d2b65f9ca9415426e26d3752c78b03e
+
+        It adds a handler for the protection event in MediaPalyerPrivateGStreamerBase, it extracts the InitData from the event
+        and sends the encrypted event to JS via HTMLMediaElement.
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+        (WebCore::MediaPlayerPrivateGStreamerBase::initializationDataEncountered):
+        (WebCore::MediaPlayerPrivateGStreamerBase::handleProtectionEvent):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
+        * platform/graphics/gstreamer/eme/GStreamerEMEUtilities.h: Add a new type InitData.
+
 2018-05-11  Basuke Suzuki  <Basuke.Suzuki@sony.com>
 

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

@@ -1205 +1205 @@
 
 #if ENABLE(ENCRYPTED_MEDIA)
+void MediaPlayerPrivateGStreamerBase::initializationDataEncountered(GstEvent* event)
+{
+    // FIXME: Inform that we are waiting for a key.
+    const char* eventKeySystemUUID = nullptr;
+    GstBuffer* data = nullptr;
+    gst_event_parse_protection(event, &eventKeySystemUUID, &data, nullptr);
+
+    // Check if the system key of the protection event is the same of the CDM instance.
+    // For example: we can receive a new Widevine protection event but the CDM instance initialized with
+    // Playready, so we ignore this event.
+    if (m_cdmInstance && g_strcmp0(GStreamerEMEUtilities::keySystemToUuid(m_cdmInstance->keySystem()), eventKeySystemUUID)) {
+        GST_DEBUG("The protection event with UUID %s is ignored because it isn't supported by the CDM %s", eventKeySystemUUID, m_cdmInstance->keySystem().utf8().data());
+        return;
+    }
+
+    GstMapInfo mapInfo;
+    if (!gst_buffer_map(data, &mapInfo, GST_MAP_READ)) {
+        GST_WARNING("cannot map %s protection data", eventKeySystemUUID);
+        return;
+    }
+
+    GST_TRACE("init data encountered for %s of size %" G_GSIZE_FORMAT, eventKeySystemUUID, mapInfo.size);
+    GST_MEMDUMP("init data", reinterpret_cast<const uint8_t*>(mapInfo.data), mapInfo.size);
+    InitData initData(reinterpret_cast<const uint8_t*>(mapInfo.data), mapInfo.size);
+    gst_buffer_unmap(data, &mapInfo);
+
+    String eventKeySystemUUIDString = eventKeySystemUUID;
+    RunLoop::main().dispatch([weakThis = m_weakPtrFactory.createWeakPtr(*this), eventKeySystemUUID = eventKeySystemUUIDString, initData] {
+        if (!weakThis)
+            return;
+
+        GST_DEBUG("scheduling initializationDataEncountered event for %s with init data size of %" G_GSIZE_FORMAT, eventKeySystemUUID.utf8().data(), initData.sizeInBytes());
+        GST_MEMDUMP("init datas", reinterpret_cast<const uint8_t*>(initData.characters8()), initData.sizeInBytes());
+        weakThis->m_player->initializationDataEncountered(ASCIILiteral("cenc"), ArrayBuffer::create(reinterpret_cast<const uint8_t*>(initData.characters8()), initData.sizeInBytes()));
+    });
+}
+
 void MediaPlayerPrivateGStreamerBase::cdmInstanceAttached(CDMInstance& instance)
 {
@@ -1257 +1294 @@
     if (m_handledProtectionEvents.contains(GST_EVENT_SEQNUM(event))) {
         GST_DEBUG_OBJECT(pipeline(), "event %u already handled", GST_EVENT_SEQNUM(event));
-        m_handledProtectionEvents.remove(GST_EVENT_SEQNUM(event));
-        if (m_needToResendCredentials) {
-            GST_DEBUG_OBJECT(pipeline(), "resending credentials");
-            attemptToDecryptWithLocalInstance();
-        }
-        return;
-    }
-
-    const gchar* eventKeySystemId = nullptr;
-    gst_event_parse_protection(event, &eventKeySystemId, nullptr, nullptr);
-    GST_WARNING("FIXME: unhandled protection event for %s", eventKeySystemId);
-    ASSERT_NOT_REACHED();
+        return;
+    }
+    initializationDataEncountered(event);
 }
 #endif

trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h

@@ -145 +145 @@
     void attemptToDecryptWithInstance(CDMInstance&) override;
     void dispatchCDMInstance();
+    void initializationDataEncountered(GstEvent*);
 #endif
 

trunk/Source/WebCore/platform/graphics/gstreamer/eme/GStreamerEMEUtilities.h

@@ -32 +32 @@
 namespace WebCore {
 
+using InitData = String;
+
 class GStreamerEMEUtilities {