Attachment 349545 Details for Bug 189547 – Patch

[patch] Patch

bug-189547-20180912165647.patch (text/plain), 3.65 KB, created by Xabier Rodríguez Calvar on 2018-09-12 07:56:48 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Xabier Rodríguez Calvar

Created: 2018-09-12 07:56:48 PDT

Size: 3.65 KB

patch

obsolete

>Subversion Revision: 235836
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 8375217f8686e250bb3a23429f0200fb573ffe7e..a6b25151b07aa6cd2205873fa357b4c6e0c23450 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-09-12  Xabier Rodriguez Calvar  <calvaris@igalia.com>
>+
>+        [GStreamer][EME] decrypt-key-needed message renamed to drm-cdm-instance-needed
>+        https://bugs.webkit.org/show_bug.cgi?id=189547
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        decrypt-key-needed message renamed to drm-cdm-instance-needed.
>+
>+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
>+        (WebCore::MediaPlayerPrivateGStreamer::handleMessage): Apart from
>+        renaming the message, removed the class prefix for
>+        dispatchCDMInstance.
>+        * platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp:
>+        (webkitMediaCommonEncryptionDecryptTransformInPlace):
>+
> 2018-09-08  Andy Estes  <aestes@apple.com>
> 
>         [Apple Pay] Dispatch a paymentmethodchange event when the payment method changes
>diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
>index a36d1a4956743892fe6651e4f080cdea2c8dcc73..e6c3f744bb2530172c90468f997b79ff406e13b4 100644
>--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
>+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
>@@ -1306,9 +1306,9 @@ void MediaPlayerPrivateGStreamer::handleMessage(GstMessage* message)
>             GRefPtr<GstEvent> event;
>             gst_structure_get(structure, "event", GST_TYPE_EVENT, &event.outPtr(), nullptr);
>             handleProtectionEvent(event.get());
>-        } else if (gst_structure_has_name(structure, "decrypt-key-needed")) {
>-            GST_DEBUG("decrypt-key-needed message from %s", GST_MESSAGE_SRC_NAME(message));
>-            MediaPlayerPrivateGStreamerBase::dispatchCDMInstance();
>+        } else if (gst_structure_has_name(structure, "drm-cdm-instance-needed")) {
>+            GST_DEBUG("drm-cdm-instance-needed message from %s", GST_MESSAGE_SRC_NAME(message));
>+            dispatchCDMInstance();
>         }
> #endif
>         else if (gst_structure_has_name(structure, "http-headers")) {
>diff --git a/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp
>index 8d1b84e6e1b9861e4e9d385ced1d90beaa3f15a5..ca32872bfcd4685846f6d45caea046b95b899cd7 100644
>--- a/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp
>+++ b/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp
>@@ -197,8 +197,8 @@ static GstFlowReturn webkitMediaCommonEncryptionDecryptTransformInPlace(GstBaseT
>             GST_ERROR_OBJECT(self, "can't process key requests in less than PAUSED state");
>             return GST_FLOW_NOT_SUPPORTED;
>         }
>-        // Send "decrypt-key-needed" message to the application in order to resend the key if it is available in the application.
>-        gst_element_post_message(GST_ELEMENT(self), gst_message_new_element(GST_OBJECT(self), gst_structure_new_empty("decrypt-key-needed")));
>+        // Send "drm-cdm-instance-needed" message to the player to resend the CDMInstance if available.
>+        gst_element_post_message(GST_ELEMENT(self), gst_message_new_element(GST_OBJECT(self), gst_structure_new_empty("drm-cdm-instance-needed")));
> 
>         priv->condition.waitFor(priv->mutex, Seconds(5), [priv] {
>             return priv->keyReceived;

Actions: View | Formatted Diff | Diff

Attachments on bug 189547: 349545