Changeset 272129 in webkit

Timestamp:

Jan 31, 2021, 11:17:41 PM (6 years ago)

Author:

calvaris@igalia.com

Message:

[GStreamer][EME] Add basic cbcs support
​https://bugs.webkit.org/show_bug.cgi?id=221133

Reviewed by Philippe Normand.

Add cbcs as supported encryption scheme.

• platform/graphics/gstreamer/GStreamerCommon.cpp:

(WebCore::capsMediaType):

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

(WebCore::CDMPrivateThunder::supportedInitDataTypes const):

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

(transformInPlace):

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

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-01-31  Xabier Rodriguez Calvar  <calvaris@igalia.com>
+
+        [GStreamer][EME] Add basic cbcs support
+        https://bugs.webkit.org/show_bug.cgi?id=221133
+
+        Reviewed by Philippe Normand.
+
+        Add cbcs as supported encryption scheme.
+
+        * platform/graphics/gstreamer/GStreamerCommon.cpp:
+        (WebCore::capsMediaType):
+        * platform/graphics/gstreamer/eme/CDMThunder.cpp:
+        (WebCore::CDMPrivateThunder::supportedInitDataTypes const):
+        * platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp:
+        (transformInPlace):
+        * platform/graphics/gstreamer/eme/WebKitThunderDecryptorGStreamer.cpp:
+
 2021-01-31  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -184 +184 @@
     }
 #if ENABLE(ENCRYPTED_MEDIA)
-    if (gst_structure_has_name(structure, "application/x-cenc") || gst_structure_has_name(structure, "application/x-webm-enc"))
+    if (gst_structure_has_name(structure, "application/x-cenc") || gst_structure_has_name(structure, "application/x-cbcs") || gst_structure_has_name(structure, "application/x-webm-enc"))
         return gst_structure_get_string(structure, "original-media-type");
 #endif

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

@@ -139 +139 @@
     static Vector<AtomString> supportedInitDataTypes;
     std::call_once(onceFlag, [] {
-        supportedInitDataTypes.reserveInitialCapacity(3);
+        supportedInitDataTypes.reserveInitialCapacity(4);
         supportedInitDataTypes.uncheckedAppend(AtomString("keyids"));
         supportedInitDataTypes.uncheckedAppend(AtomString("cenc"));
         supportedInitDataTypes.uncheckedAppend(AtomString("webm"));
+        supportedInitDataTypes.uncheckedAppend(AtomString("cbcs"));
     });
     return supportedInitDataTypes;

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

@@ -239 +239 @@
     }
 
+    if (gst_structure_has_field(protectionMeta->info, "crypt_byte_block") || gst_structure_has_field(protectionMeta->info, "skip_byte_block"))
+        GST_FIXME_OBJECT(self, "cbcs crypt/skip pattern is still unsupported");
+
     GstBuffer* ivBuffer = gst_value_get_buffer(value);
     WebKitMediaCommonEncryptionDecryptClass* klass = WEBKIT_MEDIA_CENC_DECRYPT_GET_CLASS(self);

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

@@ -48 +48 @@
 
 static const char* cencEncryptionMediaTypes[] = { "video/mp4", "audio/mp4", "video/x-h264", "audio/mpeg", nullptr };
+static const char** cbcsEncryptionMediaTypes = cencEncryptionMediaTypes;
 static const char* webmEncryptionMediaTypes[] = { "video/webm", "audio/webm", "video/x-vp9", "audio/x-opus", nullptr };
 
@@ -84 +85 @@
                 cencEncryptionMediaTypes[i], "protection-system", G_TYPE_STRING, GStreamerEMEUtilities::keySystemToUuid(keySystem), nullptr));
         }
+    }
+
+    for (int i = 0; cbcsEncryptionMediaTypes[i]; ++i) {
+        gst_caps_append_structure(caps.get(), gst_structure_new("application/x-cbcs", "original-media-type", G_TYPE_STRING,
+            cbcsEncryptionMediaTypes[i], nullptr));
     }