Changeset 269097 in webkit

Timestamp:

Oct 28, 2020, 4:40:29 AM (6 years ago)

Author:

calvaris@igalia.com

Message:

Unreviewed, reverting r269033.

269043

Reverted changeset:

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

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-28  Xabier Rodriguez Calvar  <calvaris@igalia.com>
+
+        Unreviewed, reverting r269033.
+
+        269043
+
+        Reverted changeset:
+
+        "[EME][GStreamer] Decode base64 init data if needed"
+        https://bugs.webkit.org/show_bug.cgi?id=218175
+        https://trac.webkit.org/changeset/269033
+
 2020-10-27  Wenson Hsieh  <wenson_hsieh@apple.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>
 
@@ -53 +52 @@
         }
         m_payload = mappedInitData->createSharedBuffer();
-        decodeBase64IfNeeded();
     }
 
@@ -60 +58 @@
         , m_payload(WTFMove(payload))
     {
-        decodeBase64IfNeeded();
     }
 
@@ -77 +74 @@
 
         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());
     }