Changeset 282439 in webkit

Timestamp:

Sep 14, 2021, 11:01:56 PM (5 years ago)

Author:

calvaris@igalia.com

Message:

[GStreamer][EME] Accomodate cbcs as cipher-mode instead of mime
​https://bugs.webkit.org/show_bug.cgi?id=230265

Reviewed by Philippe Normand.

In ​https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/1013
it was decided that there should not be x-cbcs as mime type but
rather x-cenc with cbcs as cipher-mode.

Fly-by change, we will return GST_FLOW_NOT_SUPPORTED when we get
skip and crypt cbcs encryption scheme.

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

(transformInPlace):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-09-14  Xabier Rodriguez Calvar  <calvaris@igalia.com>
+
+        [GStreamer][EME] Accomodate cbcs as cipher-mode instead of mime
+        https://bugs.webkit.org/show_bug.cgi?id=230265
+
+        Reviewed by Philippe Normand.
+
+        In https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/1013
+        it was decided that there should not be x-cbcs as mime type but
+        rather x-cenc with cbcs as cipher-mode.
+
+        Fly-by change, we will return GST_FLOW_NOT_SUPPORTED when we get
+        skip and crypt cbcs encryption scheme.
+
+        * platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp:
+        (transformInPlace):
+
 2021-09-14  Rob Buis  <rbuis@igalia.com>
 

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

@@ -221 +221 @@
     });
 
+    bool isCbcs = !g_strcmp0(gst_structure_get_string(protectionMeta->info, "cipher-mode"), "cbcs");
+
     unsigned ivSize;
     if (!gst_structure_get_uint(protectionMeta->info, "iv_size", &ivSize)) {
@@ -228 +230 @@
     if (!ivSize && !gst_structure_get_uint(protectionMeta->info, "constant_iv_size", &ivSize)) {
         GST_ERROR_OBJECT(self, "No iv_size and failed to get constant_iv_size");
+        ASSERT(isCbcs);
         return GST_FLOW_NOT_SUPPORTED;
     }
@@ -246 +249 @@
     unsigned subSampleCount = 0;
     // cbcs could not include the subsample_count.
-    if (!gst_structure_get_uint(protectionMeta->info, "subsample_count", &subSampleCount)
-        && !gst_structure_has_name(protectionMeta->info, "application/x-cbcs")) {
+    if (!gst_structure_get_uint(protectionMeta->info, "subsample_count", &subSampleCount) && !isCbcs) {
         GST_ERROR_OBJECT(self, "Failed to get subsample_count");
         return GST_FLOW_NOT_SUPPORTED;
@@ -281 +283 @@
     }
 
-    if (gst_structure_has_field(protectionMeta->info, "crypt_byte_block") || gst_structure_has_field(protectionMeta->info, "skip_byte_block"))
+    if (isCbcs && (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");
+        return GST_FLOW_NOT_SUPPORTED;
+    }
 
     GstBuffer* ivBuffer = gst_value_get_buffer(value);