Changeset 276500 in webkit

Timestamp:

Apr 23, 2021, 9:31:30 AM (5 years ago)

Author:

calvaris@igalia.com

Message:

[GStreamer][EME] cbcs fixes
​https://bugs.webkit.org/show_bug.cgi?id=224976

Reviewed by Philippe Normand.

In cbcs you can get from qtdemux buffers without an iv_size
because it had constant_iv_size. We need to check that.

When decryption bails out because of the buffer being unencrypted,
we should TRACE so.

cbcs buffers could not include the subsample_count, we consider 0
as default.

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

(transformInPlace):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-23  Xabier Rodriguez Calvar  <calvaris@igalia.com>
+
+        [GStreamer][EME] cbcs fixes
+        https://bugs.webkit.org/show_bug.cgi?id=224976
+
+        Reviewed by Philippe Normand.
+
+        In cbcs you can get from qtdemux buffers without an iv_size
+        because it had constant_iv_size. We need to check that.
+
+        When decryption bails out because of the buffer being unencrypted,
+        we should TRACE so.
+
+        cbcs buffers could not include the subsample_count, we consider 0
+        as default.
+
+        * platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp:
+        (transformInPlace):
+
 2021-04-23  Michael Catanzaro  <mcatanzaro@gnome.org>
 

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

@@ -226 +226 @@
         return GST_FLOW_NOT_SUPPORTED;
     }
+    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");
+        return GST_FLOW_NOT_SUPPORTED;
+    }
 
     gboolean encrypted;
@@ -233 +237 @@
     }
 
-    if (!ivSize || !encrypted)
+    if (!ivSize || !encrypted) {
+        GST_TRACE_OBJECT(self, "iv size %u, encrypted %s, bailing out OK as unencrypted", ivSize, boolForPrinting(encrypted));
         return GST_FLOW_OK;
+    }
 
     GST_DEBUG_OBJECT(base, "protection meta: %" GST_PTR_FORMAT, protectionMeta->info);
 
-    unsigned subSampleCount;
-    if (!gst_structure_get_uint(protectionMeta->info, "subsample_count", &subSampleCount)) {
+    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")) {
         GST_ERROR_OBJECT(self, "Failed to get subsample_count");
         return GST_FLOW_NOT_SUPPORTED;