Changeset 269033 in webkit

Timestamp:

Oct 27, 2020, 6:00:41 AM (6 years ago)

Author:

calvaris@igalia.com

Message:

[EME][GStreamer] Decode base64 init data if needed
​https://bugs.webkit.org/show_bug.cgi?id=218175

Reviewed by Philippe Normand.

There are certain strings with certain key systems that deliver
initialization data encoded as base64 so we need to decode it
first.

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

(WebCore::InitData::InitData):
(WebCore::InitData::decodeBase64IfNeeded):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/eme/GStreamerEMEUtilities.h (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-27  Xabier Rodriguez Calvar  <calvaris@igalia.com>
+
+        [EME][GStreamer] Decode base64 init data if needed
+        https://bugs.webkit.org/show_bug.cgi?id=218175
+
+        Reviewed by Philippe Normand.
+
+        There are certain strings with certain key systems that deliver
+        initialization data encoded as base64 so we need to decode it
+        first.
+
+        * platform/graphics/gstreamer/eme/GStreamerEMEUtilities.h:
+        (WebCore::InitData::InitData):
+        (WebCore::InitData::decodeBase64IfNeeded):
+
 2020-10-15  Sergio Villar Senin  <svillar@igalia.com>
 

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

@@ -27 +27 @@
 #include "SharedBuffer.h"
 #include <gst/gst.h>
+#include <wtf/text/Base64.h>
 #include <wtf/text/WTFString.h>
 
@@ -52 +53 @@
         }
         m_payload = mappedInitData->createSharedBuffer();
+        decodeBase64IfNeeded();
     }
 
@@ -58 +60 @@
         , m_payload(WTFMove(payload))
     {
+        decodeBase64IfNeeded();
     }
 
@@ -74 +77 @@
 
         m_payload->append(*initData.payload());
+    }
+
+    void decodeBase64IfNeeded()
+    {
+        GST_CAT_LEVEL_LOG(webkit_media_common_encryption_decrypt_debug_category, GST_LEVEL_TRACE, nullptr, "payload size %zu", m_payload->size());
+        if (!m_payload->size())
+            return;
+
+        Vector<char> out;
+        if (!base64Decode(m_payload->data(), m_payload->size(), out)) {
+            GST_CAT_LEVEL_LOG(webkit_media_common_encryption_decrypt_debug_category, GST_LEVEL_TRACE, nullptr, "payload did not decode base64, considering ok");
+            return;
+        }
+
+        GST_CAT_LEVEL_LOG(webkit_media_common_encryption_decrypt_debug_category, GST_LEVEL_TRACE, nullptr, "payload decoded to base64, new size %zu", out.size());
+        m_payload = SharedBuffer::create(out.data(), out.size());
     }