Changeset 281183 in webkit

Timestamp:

Aug 18, 2021, 1:26:33 AM (5 years ago)

Author:

calvaris@igalia.com

Message:

[GStreamer][EME] Try to parse XML init datas that could possibly come from MPD manifests
​https://bugs.webkit.org/show_bug.cgi?id=229145

Reviewed by Alicia Boya Garcia.

Source/WebCore:

Added GStreamerEMEUtilities to include implementation of
InitData::extractCencIfNeeded. This tries to parse the possible
XML inside an init data that could come from MPD manifests. If it
succeeds, it keeps the parsed init data, if not, it returns the
original one.

Based on a patch by Philippe Normand.

• platform/GStreamer.cmake:
• platform/graphics/gstreamer/eme/GStreamerEMEUtilities.cpp: Added.

(WebCore::markupStartElement):
(WebCore::markupEndElement):
(WebCore::markupText):
(WebCore::markupPassthrough):
(WebCore::markupError):
(WebCore::InitData::extractCencIfNeeded):

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

(WebCore::InitData::InitData):

Source/WTF:

• wtf/glib/GUniquePtr.h: Added deleter for GMarkupParseContext.

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/glib/GUniquePtr.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/GStreamer.cmake (modified) (1 diff)
• WebCore/platform/graphics/gstreamer/eme/GStreamerEMEUtilities.cpp (added)
• WebCore/platform/graphics/gstreamer/eme/GStreamerEMEUtilities.h (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2021-08-18  Xabier Rodriguez Calvar  <calvaris@igalia.com>
+
+        [GStreamer][EME] Try to parse XML init datas that could possibly come from MPD manifests
+        https://bugs.webkit.org/show_bug.cgi?id=229145
+
+        Reviewed by Alicia Boya Garcia.
+
+        * wtf/glib/GUniquePtr.h: Added deleter for GMarkupParseContext.
+
 2021-08-16  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WTF/wtf/glib/GUniquePtr.h

@@ -48 +48 @@
     macro(char*, g_strfreev) \
     macro(GVariantIter, g_variant_iter_free) \
-    macro(GVariantType, g_variant_type_free)
+    macro(GVariantType, g_variant_type_free) \
+    macro(GMarkupParseContext, g_markup_parse_context_free)
 
 #define WTF_DEFINE_GPTR_DELETER(typeName, deleterFunc) \

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-08-18  Xabier Rodriguez Calvar  <calvaris@igalia.com>
+
+        [GStreamer][EME] Try to parse XML init datas that could possibly come from MPD manifests
+        https://bugs.webkit.org/show_bug.cgi?id=229145
+
+        Reviewed by Alicia Boya Garcia.
+
+        Added GStreamerEMEUtilities to include implementation of
+        InitData::extractCencIfNeeded. This tries to parse the possible
+        XML inside an init data that could come from MPD manifests. If it
+        succeeds, it keeps the parsed init data, if not, it returns the
+        original one.
+
+        Based on a patch by Philippe Normand.
+
+        * platform/GStreamer.cmake:
+        * platform/graphics/gstreamer/eme/GStreamerEMEUtilities.cpp: Added.
+        (WebCore::markupStartElement):
+        (WebCore::markupEndElement):
+        (WebCore::markupText):
+        (WebCore::markupPassthrough):
+        (WebCore::markupError):
+        (WebCore::InitData::extractCencIfNeeded):
+        * platform/graphics/gstreamer/eme/GStreamerEMEUtilities.h:
+        (WebCore::InitData::InitData):
+
 2021-08-17  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebCore/platform/GStreamer.cmake

@@ -30 +30 @@
         platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
 
+        platform/graphics/gstreamer/eme/GStreamerEMEUtilities.cpp
         platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp
         platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp

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

@@ -51 +51 @@
             ASSERT_NOT_REACHED();
         }
-        m_payload = mappedInitData->createSharedBuffer();
+        m_payload = extractCencIfNeeded(mappedInitData->createSharedBuffer());
     }
 
     InitData(const String& systemId, RefPtr<SharedBuffer>&& payload)
         : m_systemId(systemId)
-        , m_payload(WTFMove(payload))
+        , m_payload(extractCencIfNeeded(WTFMove(payload)))
     {
     }
@@ -86 +86 @@
         return "cenc"_s;
     }
+
+    static RefPtr<SharedBuffer> extractCencIfNeeded(RefPtr<SharedBuffer>&&);
 
 private: