Modified: trunk/Source/WebCore/ChangeLog (269096 => 269097)
--- trunk/Source/WebCore/ChangeLog 2020-10-28 09:31:17 UTC (rev 269096)
+++ trunk/Source/WebCore/ChangeLog 2020-10-28 11:40:29 UTC (rev 269097)
@@ -1,3 +1,15 @@
+2020-10-28 Xabier Rodriguez Calvar <[email protected]>
+
+ 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 <[email protected]>
[Concurrent display lists] Add alternate versions of existing display list items that only contain inline data
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/eme/GStreamerEMEUtilities.h (269096 => 269097)
--- trunk/Source/WebCore/platform/graphics/gstreamer/eme/GStreamerEMEUtilities.h 2020-10-28 09:31:17 UTC (rev 269096)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/eme/GStreamerEMEUtilities.h 2020-10-28 11:40:29 UTC (rev 269097)
@@ -26,7 +26,6 @@
#include "GStreamerCommon.h"
#include "SharedBuffer.h"
#include <gst/gst.h>
-#include <wtf/text/Base64.h>
#include <wtf/text/WTFString.h>
#define WEBCORE_GSTREAMER_EME_UTILITIES_CLEARKEY_UUID "1077efec-c0b2-4d02-ace3-3c1e52e2fb4b"
@@ -52,7 +51,6 @@
ASSERT_NOT_REACHED();
}
m_payload = mappedInitData->createSharedBuffer();
- decodeBase64IfNeeded();
}
InitData(const String& systemId, RefPtr<SharedBuffer>&& payload)
@@ -59,7 +57,6 @@
: m_systemId(systemId)
, m_payload(WTFMove(payload))
{
- decodeBase64IfNeeded();
}
void append(InitData&& initData)
@@ -78,22 +75,6 @@
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());
- }
-
const RefPtr<SharedBuffer>& payload() const { return m_payload; }
const String& systemId() const { return m_systemId; }
String payloadContainerType() const
