Merge "SPOID"

libwvdrmengine/cdm/core/include/cdm_engine.h

@@ -13,6 +13,7 @@
 #include "lock.h"
 #include "oemcrypto_adapter.h"
 #include "scoped_ptr.h"
+#include "wv_cdm_constants.h"
 #include "wv_cdm_types.h"
 
 namespace wvcdm {
@@ -31,7 +32,7 @@ typedef std::map<
 
 class CdmEngine {
  public:
-  CdmEngine(FileSystem* file_system);
+  CdmEngine(FileSystem* file_system, const std::string& spoid = EMPTY_SPOID);
   virtual ~CdmEngine();
 
   // Session related methods
@@ -236,6 +237,7 @@ class CdmEngine {
   SecurityLevel cert_provisioning_requested_security_level_;
   FileSystem* file_system_;
   Clock clock_;
+  std::string spoid_;
 
   static bool seeded_;
 

libwvdrmengine/cdm/core/include/certificate_provisioning.h

@@ -27,6 +27,7 @@ class CertificateProvisioning {
                                          CdmCertificateType cert_type,
                                          const std::string& cert_authority,
                                          const std::string& origin,
+                                         const std::string& spoid,
                                          CdmProvisioningRequest* request,
                                          std::string* default_url);
   CdmResponseType HandleProvisioningResponse(
@@ -39,6 +40,9 @@ class CertificateProvisioning {
   bool GetProvisioningTokenType(
       video_widevine::ClientIdentification::TokenType* token_type);
 
+  bool FillStableIdField(const std::string& origin, const std::string& spoid,
+                         video_widevine::ProvisioningRequest* request);
+
   video_widevine::SignedProvisioningMessage::ProtocolVersion
       GetProtocolVersion();
 

libwvdrmengine/cdm/core/include/file_store.h

@@ -58,9 +58,14 @@ class FileSystem {
   const std::string& origin() const { return origin_; }
   void SetOrigin(const std::string& origin);
 
+  const std::string& identifier() const { return identifier_; }
+  void SetIdentifier(const std::string& identifier);
+  bool IsGlobal() const { return identifier_.empty(); }
+
  private:
   Impl* impl_;
   std::string origin_;
+  std::string identifier_;
 
   CORE_DISALLOW_COPY_AND_ASSIGN(FileSystem);
 };

libwvdrmengine/cdm/core/include/properties.h

@@ -55,6 +55,7 @@ class Properties {
   static bool GetFactoryKeyboxPath(std::string* keybox);
   static bool GetOEMCryptoPath(std::string* library_name);
   static bool AlwaysUseKeySetIds();
+  static bool UseProviderIdInProvisioningRequest();
 
   static bool GetSecurityLevelDirectories(std::vector<std::string>* dirs);
   static bool GetApplicationId(const CdmSessionId& session_id,

libwvdrmengine/cdm/core/include/wv_cdm_constants.h

@@ -98,6 +98,7 @@ static const std::string HLS_IV_ATTRIBUTE = "IV";
 static const std::string HLS_URI_ATTRIBUTE = "URI";
 
 static const char EMPTY_ORIGIN[] = "";
+static const char EMPTY_SPOID[] = "";
 }  // namespace wvcdm
 
 #endif  // WVCDM_CORE_WV_CDM_CONSTANTS_H_