Changeset 269103 in webkit

Timestamp:

Oct 28, 2020, 8:24:44 AM (6 years ago)

Author:

calvaris@igalia.com

Message:

[GStreamer][EME][Thunder] Do not sanitize CENC init data
​https://bugs.webkit.org/show_bug.cgi?id=218182

Reviewed by Philippe Normand.

In certain cases, like smoothstreaming with PlayReady, the init
datas we are getting are correct but are not in PSSH box format
they would be "sanitized away". In this patch you can enable
sanitization customization depending on the CDM you're using.

• Modules/encryptedmedia/CDM.cpp:

(WebCore::CDM::sanitizeInitData):

• platform/encryptedmedia/CDMPrivate.cpp:

(WebCore::CDMPrivate::sanitizeInitData const):

• platform/encryptedmedia/CDMPrivate.h:
• platform/graphics/gstreamer/eme/CDMThunder.cpp:

(WebCore::CDMPrivateThunder::sanitizeInitData const):

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

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/encryptedmedia/CDM.cpp (modified) (1 diff)
• platform/encryptedmedia/CDMPrivate.cpp (modified) (2 diffs)
• platform/encryptedmedia/CDMPrivate.h (modified) (1 diff)
• platform/graphics/gstreamer/eme/CDMThunder.cpp (modified) (1 diff)
• platform/graphics/gstreamer/eme/CDMThunder.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-28  Xabier Rodriguez Calvar  <calvaris@igalia.com>
+
+        [GStreamer][EME][Thunder] Do not sanitize CENC init data
+        https://bugs.webkit.org/show_bug.cgi?id=218182
+
+        Reviewed by Philippe Normand.
+
+        In certain cases, like smoothstreaming with PlayReady, the init
+        datas we are getting are correct but are not in PSSH box format
+        they would be "sanitized away". In this patch you can enable
+        sanitization customization depending on the CDM you're using.
+
+        * Modules/encryptedmedia/CDM.cpp:
+        (WebCore::CDM::sanitizeInitData):
+        * platform/encryptedmedia/CDMPrivate.cpp:
+        (WebCore::CDMPrivate::sanitizeInitData const):
+        * platform/encryptedmedia/CDMPrivate.h:
+        * platform/graphics/gstreamer/eme/CDMThunder.cpp:
+        (WebCore::CDMPrivateThunder::sanitizeInitData const):
+        * platform/graphics/gstreamer/eme/CDMThunder.h:
+
 2020-10-28  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/Modules/encryptedmedia/CDM.cpp

@@ -138 +138 @@
 RefPtr<SharedBuffer> CDM::sanitizeInitData(const AtomString& initDataType, const SharedBuffer& initData)
 {
-    return InitDataRegistry::shared().sanitizeInitData(initDataType, initData);
+    if (!m_private)
+        return nullptr;
+    return m_private->sanitizeInitData(initDataType, initData);
 }
 

trunk/Source/WebCore/platform/encryptedmedia/CDMPrivate.cpp

@@ -33 +33 @@
 #include "CDMRequirement.h"
 #include "CDMRestrictions.h"
+#include "InitDataRegistry.h"
 #include "MediaPlayer.h"
 #include "NotImplemented.h"
@@ -515 +516 @@
 }
 
+RefPtr<SharedBuffer> CDMPrivate::sanitizeInitData(const AtomString& initDataType, const SharedBuffer& initData) const
+{
+    return InitDataRegistry::shared().sanitizeInitData(initDataType, initData);
+}
+
 
 }

trunk/Source/WebCore/platform/encryptedmedia/CDMPrivate.h

@@ -75 +75 @@
     virtual bool supportsSessions() const = 0;
     virtual bool supportsInitData(const AtomString&, const SharedBuffer&) const = 0;
+    WEBCORE_EXPORT virtual RefPtr<SharedBuffer> sanitizeInitData(const AtomString& initDataType, const SharedBuffer& initData) const;
     virtual RefPtr<SharedBuffer> sanitizeResponse(const SharedBuffer&) const = 0;
     virtual Optional<String> sanitizeSessionId(const String&) const = 0;

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

@@ -217 +217 @@
 
     return false;
+}
+
+RefPtr<SharedBuffer> CDMPrivateThunder::sanitizeInitData(const AtomString& initDataType, const SharedBuffer& initData) const
+{
+    // Validate the initData buffer as CENC initData. FIXME: Validate it is actually CENC.
+    if (equalLettersIgnoringASCIICase(initDataType, "cenc") && !initData.isEmpty())
+        return initData.copy();
+
+    return CDMPrivate::sanitizeInitData(initDataType, initData);
 }
 

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

@@ -96 +96 @@
     bool supportsSessions() const final;
     bool supportsInitData(const AtomString&, const SharedBuffer&) const final;
+    RefPtr<SharedBuffer> sanitizeInitData(const AtomString& initDataType, const SharedBuffer& initData) const final;
     RefPtr<SharedBuffer> sanitizeResponse(const SharedBuffer&) const final;
     Optional<String> sanitizeSessionId(const String&) const final;