Source release 17.1.0

core/include/license.h

@@ -1,6 +1,6 @@
 // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
-// source code may only be used and distributed under the Widevine Master
-// License Agreement.
+// source code may only be used and distributed under the Widevine License
+// Agreement.
 
 #ifndef WVCDM_CORE_LICENSE_H_
 #define WVCDM_CORE_LICENSE_H_
@@ -20,9 +20,11 @@ class LicenseRequest;
 class VersionInfo;
 }  // namespace video_widevine
 
-namespace wvcdm {
-
+namespace wvutil {
 class Clock;
+}
+
+namespace wvcdm {
 class CryptoSession;
 class PolicyEngine;
 class CdmSession;
@@ -38,9 +40,7 @@ class CdmLicense {
   CdmLicense(const CdmSessionId& session_id);
   virtual ~CdmLicense();
 
-  virtual bool Init(const std::string& client_token,
-                    CdmClientTokenType client_token_type,
-                    const std::string& device_id, bool use_privacy_mode,
+  virtual bool Init(bool use_privacy_mode,
                     const std::string& signed_service_certificate,
                     CryptoSession* session, PolicyEngine* policy_engine);
 
@@ -50,9 +50,9 @@ class CdmLicense {
       const std::string& signed_service_certificate);
 
   virtual CdmResponseType PrepareKeyRequest(
-      const InitializationData& init_data, CdmLicenseType license_type,
-      const CdmAppParameterMap& app_parameters, CdmKeyMessage* signed_request,
-      std::string* server_url);
+      const InitializationData& init_data, const std::string& client_token,
+      CdmLicenseType license_type, const CdmAppParameterMap& app_parameters,
+      CdmKeyMessage* signed_request, std::string* server_url);
   virtual CdmResponseType PrepareKeyUpdateRequest(
       bool is_renewal, const CdmAppParameterMap& app_parameters,
       CdmSession* cdm_session, CdmKeyMessage* signed_request,
@@ -65,13 +65,13 @@ class CdmLicense {
       const InitializationData& init_data);
 
   virtual CdmResponseType RestoreOfflineLicense(
-      const CdmKeyMessage& license_request,
+      const std::string& client_token, const CdmKeyMessage& license_request,
       const CdmKeyResponse& license_response,
       const CdmKeyResponse& license_renewal_response,
       int64_t playback_start_time, int64_t last_playback_time,
       int64_t grace_period_end_time, CdmSession* cdm_session);
   virtual CdmResponseType RestoreLicenseForRelease(
-      const CdmKeyMessage& license_request,
+      const std::string& client_token, const CdmKeyMessage& license_request,
       const CdmKeyResponse& license_response);
   virtual bool HasInitData() { return static_cast<bool>(stored_init_data_); }
   virtual bool IsKeyLoaded(const KeyId& key_id);
@@ -139,8 +139,6 @@ class CdmLicense {
   PolicyEngine* policy_engine_;
   std::string server_url_;
   std::string client_token_;
-  CdmClientTokenType client_token_type_;
-  std::string device_id_;
   const CdmSessionId session_id_;
   std::unique_ptr<InitializationData> stored_init_data_;
   bool initialized_;
@@ -161,16 +159,16 @@ class CdmLicense {
   // Used for certificate based licensing
   CdmKeyMessage key_request_;
 
-  std::unique_ptr<Clock> clock_;
+  std::unique_ptr<wvutil::Clock> clock_;
 
   // For testing
   // CdmLicense takes ownership of the clock.
-  CdmLicense(const CdmSessionId& session_id, Clock* clock);
+  CdmLicense(const CdmSessionId& session_id, wvutil::Clock* clock);
 
   // For entitlement key licensing. This holds the keys from the init_data.
-  // These keys are extracted from the pssh when we generate a license request.
+  // These keys are extracted from the PSSH when we generate a license request.
   // It is used to load content keys after we have received a license and
-  // entitelement keys. It is also used in updating the key status info.
+  // entitlement keys. It is also used in updating the key status info.
   std::vector<WidevinePsshData_EntitledKey> wrapped_keys_;
 
   CdmLicenseKeyType license_key_type_;
@@ -190,7 +188,6 @@ class CdmLicense {
 
   CORE_DISALLOW_COPY_AND_ASSIGN(CdmLicense);
 };
-
 }  // namespace wvcdm
 
 #endif  // WVCDM_CORE_LICENSE_H_