Changeset 266992 in webkit

Timestamp:

Sep 13, 2020 5:07:50 AM (4 years ago)

Author:

Philippe Normand

Message:

Unreviewed, GTK/WPE EME build fixes after r266721

The Thunder decryptor changes were not tested before landing, this code path is not enabled
on any bot currently, hence requires manual testing.

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

(protectionSystemId):
(cdmProxyAttached):
(decrypt):

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

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-13  Philippe Normand  <pnormand@igalia.com>
+
+        Unreviewed, GTK/WPE EME build fixes after r266721
+
+        The Thunder decryptor changes were not tested before landing, this code path is not enabled
+        on any bot currently, hence requires manual testing.
+
+        * platform/graphics/gstreamer/eme/WebKitThunderDecryptorGStreamer.cpp:
+        (protectionSystemId):
+        (cdmProxyAttached):
+        (decrypt):
+        * platform/graphics/gstreamer/eme/WebKitThunderDecryptorGStreamer.h:
+
 2020-09-13  Rob Buis  <rbuis@igalia.com>
 

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

@@ -35 +35 @@
 using namespace WebCore;
 
-struct _WebKitMediaThunderDecryptPrivate {
+struct WebKitMediaThunderDecryptPrivate {
     RefPtr<CDMProxyThunder> cdmProxy;
 };
@@ -106 +106 @@
 }
 
-static const char* protectionSystemId(WebKitMediaCommonEncryptionDecrypt* self)
+static const char* protectionSystemId(WebKitMediaCommonEncryptionDecrypt* decryptor)
 {
-    WebKitMediaThunderDecryptPrivate* priv = WEBKIT_MEDIA_THUNDER_DECRYPT_GET_PRIVATE(WEBKIT_MEDIA_THUNDER_DECRYPT(self));
-    ASSERT(priv->cdmProxy);
-    return GStreamerEMEUtilities::keySystemToUuid(priv->cdmProxy->keySystem());
+    auto* self = WEBKIT_MEDIA_THUNDER_DECRYPT(decryptor);
+    ASSERT(self->priv->cdmProxy);
+    return GStreamerEMEUtilities::keySystemToUuid(self->priv->cdmProxy->keySystem());
 }
 
-static bool cdmProxyAttached(WebKitMediaCommonEncryptionDecrypt* self, const RefPtr<CDMProxy>& cdmProxy)
+static bool cdmProxyAttached(WebKitMediaCommonEncryptionDecrypt* decryptor, const RefPtr<CDMProxy>& cdmProxy)
 {
-    WebKitMediaThunderDecryptPrivate* priv = WEBKIT_MEDIA_THUNDER_DECRYPT_GET_PRIVATE(WEBKIT_MEDIA_THUNDER_DECRYPT(self));
-    priv->cdmProxy = reinterpret_cast<CDMProxyThunder*>(cdmProxy.get());
-    return priv->cdmProxy;
+    auto* self = WEBKIT_MEDIA_THUNDER_DECRYPT(decryptor);
+    self->priv->cdmProxy = reinterpret_cast<CDMProxyThunder*>(cdmProxy.get());
+    return self->priv->cdmProxy;
 }
 
-static bool decrypt(WebKitMediaCommonEncryptionDecrypt* self, GstBuffer* ivBuffer, GstBuffer* keyIDBuffer, GstBuffer* buffer, unsigned subsampleCount,
+static bool decrypt(WebKitMediaCommonEncryptionDecrypt* decryptor, GstBuffer* ivBuffer, GstBuffer* keyIDBuffer, GstBuffer* buffer, unsigned subsampleCount,
     GstBuffer* subsamplesBuffer)
 {
-    WebKitMediaThunderDecryptPrivate* priv = WEBKIT_MEDIA_THUNDER_DECRYPT_GET_PRIVATE(WEBKIT_MEDIA_THUNDER_DECRYPT(self));
+    auto* self = WEBKIT_MEDIA_THUNDER_DECRYPT(decryptor);
+    auto* priv = self->priv;
 
     if (!ivBuffer || !keyIDBuffer || !buffer) {

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

@@ -36 +36 @@
 typedef struct _WebKitMediaThunderDecrypt        WebKitMediaThunderDecrypt;
 typedef struct _WebKitMediaThunderDecryptClass   WebKitMediaThunderDecryptClass;
-typedef struct _WebKitMediaThunderDecryptPrivate WebKitMediaThunderDecryptPrivate;
+struct WebKitMediaThunderDecryptPrivate;
 
 GType webkit_media_thunder_decrypt_get_type(void);