Title: [235971] trunk/Source/WebCore
- Revision
- 235971
- Author
- [email protected]
- Date
- 2018-09-13 02:14:35 -0700 (Thu, 13 Sep 2018)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (235970 => 235971)
--- trunk/Source/WebCore/ChangeLog 2018-09-13 08:33:05 UTC (rev 235970)
+++ trunk/Source/WebCore/ChangeLog 2018-09-13 09:14:35 UTC (rev 235971)
@@ -1,3 +1,19 @@
+2018-09-13 Xabier Rodriguez Calvar <[email protected]>
+
+ [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 <[email protected]>
imported/w3c/web-platform-tests/shadow-dom/form-control-form-attribute.html hits assertion
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (235970 => 235971)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2018-09-13 08:33:05 UTC (rev 235970)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2018-09-13 09:14:35 UTC (rev 235971)
@@ -1308,9 +1308,9 @@
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")) {
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp (235970 => 235971)
--- trunk/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp 2018-09-13 08:33:05 UTC (rev 235970)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp 2018-09-13 09:14:35 UTC (rev 235971)
@@ -197,8 +197,8 @@
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;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
