Changeset 235971 in webkit

Timestamp:

Sep 13, 2018, 2:14:35 AM (8 years ago)

Author:

calvaris@igalia.com

Message:

[GStreamer][EME] decrypt-key-needed message renamed to drm-cdm-instance-needed
​https://bugs.webkit.org/show_bug.cgi?id=189547

Reviewed by Philippe Normand.

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (modified) (1 diff)
• platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-09-13  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 Philippe Normand.
+
+        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-11  Ryosuke Niwa  <rniwa@webkit.org>
 

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

@@ -1309 +1309 @@
             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

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

@@ -198 +198 @@
             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] {