Changeset 219978 in webkit

Timestamp:

Jul 27, 2017, 1:55:09 AM (9 years ago)

Author:

zandobersek@gmail.com

Message:

[EME][GStreamer] Add barebones CDM interface implementations for ClearKey
​https://bugs.webkit.org/show_bug.cgi?id=174887

Reviewed by Xabier Rodriguez-Calvar.

Add empty ClearKey derivations of CDMFactory, CDMPrivate and CDMInstance
classes. These will be enhanced as the implementation progresses.

ClearKey is added to CDMInstance::ImplementationType, and the
CDMInstanceClearKey::implementationType() override returns that value.
Type traits specialization for the CDMInstanceClearKey class is also
added, utilizing the CDMInstance::ImplementationType::ClearKey value.

The implementation file is added to the WPE build, along with the
necessary inclusion directory.

• PlatformWPE.cmake:
• platform/encryptedmedia/CDMInstance.h:
• platform/encryptedmedia/clearkey/CDMClearKey.cpp: Added.

(WebCore::CDMFactoryClearKey::createCDM):
(WebCore::CDMFactoryClearKey::supportsKeySystem):
(WebCore::CDMPrivateClearKey::supportsInitDataType):
(WebCore::CDMPrivateClearKey::supportsConfiguration):
(WebCore::CDMPrivateClearKey::supportsConfigurationWithRestrictions):
(WebCore::CDMPrivateClearKey::supportsSessionTypeWithConfiguration):
(WebCore::CDMPrivateClearKey::supportsRobustness):
(WebCore::CDMPrivateClearKey::distinctiveIdentifiersRequirement):
(WebCore::CDMPrivateClearKey::persistentStateRequirement):
(WebCore::CDMPrivateClearKey::distinctiveIdentifiersAreUniquePerOriginAndClearable):
(WebCore::CDMPrivateClearKey::createInstance):
(WebCore::CDMPrivateClearKey::loadAndInitialize):
(WebCore::CDMPrivateClearKey::supportsServerCertificates):
(WebCore::CDMPrivateClearKey::supportsSessions):
(WebCore::CDMPrivateClearKey::supportsInitData):
(WebCore::CDMPrivateClearKey::sanitizeResponse):
(WebCore::CDMPrivateClearKey::sanitizeSessionId):
(WebCore::CDMInstanceClearKey::initializeWithConfiguration):
(WebCore::CDMInstanceClearKey::setDistinctiveIdentifiersAllowed):
(WebCore::CDMInstanceClearKey::setPersistentStateAllowed):
(WebCore::CDMInstanceClearKey::setServerCertificate):
(WebCore::CDMInstanceClearKey::requestLicense):
(WebCore::CDMInstanceClearKey::updateLicense):
(WebCore::CDMInstanceClearKey::loadSession):
(WebCore::CDMInstanceClearKey::closeSession):
(WebCore::CDMInstanceClearKey::removeSessionData):
(WebCore::CDMInstanceClearKey::storeRecordOfKeyUsage):

• platform/encryptedmedia/clearkey/CDMClearKey.h: Added.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• PlatformWPE.cmake (modified) (1 diff)
• platform/encryptedmedia/CDMInstance.h (modified) (1 diff)
• platform/encryptedmedia/clearkey (added)
• platform/encryptedmedia/clearkey/CDMClearKey.cpp (added)
• platform/encryptedmedia/clearkey/CDMClearKey.h (added)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-07-27  Zan Dobersek  <zdobersek@igalia.com>
+
+        [EME][GStreamer] Add barebones CDM interface implementations for ClearKey
+        https://bugs.webkit.org/show_bug.cgi?id=174887
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        Add empty ClearKey derivations of CDMFactory, CDMPrivate and CDMInstance
+        classes. These will be enhanced as the implementation progresses.
+
+        ClearKey is added to CDMInstance::ImplementationType, and the
+        CDMInstanceClearKey::implementationType() override returns that value.
+        Type traits specialization for the CDMInstanceClearKey class is also
+        added, utilizing the CDMInstance::ImplementationType::ClearKey value.
+
+        The implementation file is added to the WPE build, along with the
+        necessary inclusion directory.
+
+        * PlatformWPE.cmake:
+        * platform/encryptedmedia/CDMInstance.h:
+        * platform/encryptedmedia/clearkey/CDMClearKey.cpp: Added.
+        (WebCore::CDMFactoryClearKey::createCDM):
+        (WebCore::CDMFactoryClearKey::supportsKeySystem):
+        (WebCore::CDMPrivateClearKey::supportsInitDataType):
+        (WebCore::CDMPrivateClearKey::supportsConfiguration):
+        (WebCore::CDMPrivateClearKey::supportsConfigurationWithRestrictions):
+        (WebCore::CDMPrivateClearKey::supportsSessionTypeWithConfiguration):
+        (WebCore::CDMPrivateClearKey::supportsRobustness):
+        (WebCore::CDMPrivateClearKey::distinctiveIdentifiersRequirement):
+        (WebCore::CDMPrivateClearKey::persistentStateRequirement):
+        (WebCore::CDMPrivateClearKey::distinctiveIdentifiersAreUniquePerOriginAndClearable):
+        (WebCore::CDMPrivateClearKey::createInstance):
+        (WebCore::CDMPrivateClearKey::loadAndInitialize):
+        (WebCore::CDMPrivateClearKey::supportsServerCertificates):
+        (WebCore::CDMPrivateClearKey::supportsSessions):
+        (WebCore::CDMPrivateClearKey::supportsInitData):
+        (WebCore::CDMPrivateClearKey::sanitizeResponse):
+        (WebCore::CDMPrivateClearKey::sanitizeSessionId):
+        (WebCore::CDMInstanceClearKey::initializeWithConfiguration):
+        (WebCore::CDMInstanceClearKey::setDistinctiveIdentifiersAllowed):
+        (WebCore::CDMInstanceClearKey::setPersistentStateAllowed):
+        (WebCore::CDMInstanceClearKey::setServerCertificate):
+        (WebCore::CDMInstanceClearKey::requestLicense):
+        (WebCore::CDMInstanceClearKey::updateLicense):
+        (WebCore::CDMInstanceClearKey::loadSession):
+        (WebCore::CDMInstanceClearKey::closeSession):
+        (WebCore::CDMInstanceClearKey::removeSessionData):
+        (WebCore::CDMInstanceClearKey::storeRecordOfKeyUsage):
+        * platform/encryptedmedia/clearkey/CDMClearKey.h: Added.
+
 2017-07-27  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebCore/PlatformWPE.cmake

@@ -151 +151 @@
 )
 
+if (ENABLE_ENCRYPTED_MEDIA)
+    list(APPEND WebCore_INCLUDE_DIRECTORIES
+        "${WEBCORE_DIR}/platform/encryptedmedia/clearkey"
+    )
+    list(APPEND WebCore_SOURCES
+        platform/encryptedmedia/clearkey/CDMClearKey.cpp
+    )
+endif ()
+
 list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
     ${WEBCORE_DIR}/Modules/mediacontrols/mediaControlsBase.css

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

@@ -50 +50 @@
     enum class ImplementationType {
         Mock,
+        ClearKey,
     };