Source release v3.0.4

core/include/cdm_engine.h

@@ -146,6 +146,8 @@ class CdmEngine {
   virtual CdmResponseType ReleaseAllUsageInfo(const std::string& app_id);
   virtual CdmResponseType ReleaseUsageInfo(
       const CdmUsageInfoReleaseMessage& message);
+  virtual CdmResponseType LoadUsageSession(const CdmKeySetId& key_set_id,
+                                           CdmKeyMessage* release_message);
 
   // Decryption and key related methods
   // Accept encrypted buffer and return decrypted data.
@@ -173,6 +175,7 @@ class CdmEngine {
 
  private:
   // private methods
+  void DeleteAllUsageReportsUponFactoryReset();
   bool ValidateKeySystem(const CdmKeySystem& key_system);
   CdmResponseType GetUsageInfo(const std::string& app_id,
                                SecurityLevel requested_security_level,

core/include/cdm_session.h

@@ -104,6 +104,8 @@ class CdmSession {
 
   virtual bool is_release() { return is_release_; }
   virtual bool is_offline() { return is_offline_; }
+  virtual bool is_temporary() { return is_temporary_; }
+  virtual bool license_received() { return license_received_; }
 
   // ReleaseCrypto() - Closes the underlying crypto session but leaves this
   // object alive. It is invalid to call any method that requires a crypto
@@ -141,6 +143,7 @@ class CdmSession {
   bool license_received_;
   bool is_offline_;
   bool is_release_;
+  bool is_temporary_;
   CdmSecurityLevel security_level_;
   SecurityLevel requested_security_level_;
   CdmAppParameterMap app_parameters_;

core/include/device_files.h

@@ -67,11 +67,13 @@ class DeviceFiles {
   virtual bool DeleteAllLicenses();
   virtual bool LicenseExists(const std::string& key_set_id);
   virtual bool ReserveLicenseId(const std::string& key_set_id);
+  virtual bool UnreserveLicenseId(const std::string& key_set_id);
 
   virtual bool StoreUsageInfo(const std::string& provider_session_token,
                               const CdmKeyMessage& key_request,
                               const CdmKeyResponse& key_response,
-                              const std::string& app_id);
+                              const std::string& app_id,
+                              const std::string& key_set_id);
   virtual bool DeleteUsageInfo(const std::string& app_id,
                                const std::string& provider_session_token);
   // Delete usage information from the file system.  Puts a list of all the
@@ -90,6 +92,12 @@ class DeviceFiles {
                                  const std::string& provider_session_token,
                                  CdmKeyMessage* license_request,
                                  CdmKeyResponse* license_response);
+  // Retrieve the usage info entry specified by |key_set_id|.
+  // Returns false if the entry could not be found.
+  virtual bool RetrieveUsageInfoByKeySetId(const std::string& app_id,
+                                           const std::string& key_set_id,
+                                           CdmKeyMessage* license_request,
+                                           CdmKeyResponse* license_response);
 
  private:
   // Helpers that wrap the File interface and automatically handle hashing, as

core/include/license.h

@@ -56,6 +56,10 @@ class CdmLicense {
     return provider_session_token_;
   }
 
+  virtual bool is_offline() {
+    return is_offline_;
+  }
+
   static CdmResponseType VerifySignedServiceCertificate(
       const std::string& signed_service_certificate);
 
@@ -89,6 +93,7 @@ class CdmLicense {
   std::set<KeyId> loaded_keys_;
   std::string provider_session_token_;
   bool renew_with_client_id_;
+  bool is_offline_;
 
   // Used for certificate based licensing
   CdmKeyMessage key_request_;

core/include/wv_cdm_types.h

@@ -207,6 +207,12 @@ enum CdmResponseType {
   DUPLICATE_SESSION_ID_SPECIFIED,
   LICENSE_RENEWAL_PROHIBITED,
   EMPTY_PROVISIONING_CERTIFICATE_2,
+  OFFLINE_LICENSE_PROHIBITED,
+  STORAGE_PROHIBITED,
+  EMPTY_KEYSET_ID_ENG_5,
+  SESSION_NOT_FOUND_11,
+  LOAD_USAGE_INFO_FILE_ERROR,
+  LOAD_USAGE_INFO_MISSING,
 };
 
 enum CdmKeyStatus {
@@ -229,6 +235,9 @@ enum CdmLicenseType {
   // If the original request was saved to make a service certificate request,
   // use Deferred for the license type in the subsequent request.
   kLicenseTypeDeferred,
+  // Like Streaming, but stricter.  Does not permit storage of any kind.
+  // Named after the 'temporary' session type in EME, which has this behavior.
+  kLicenseTypeTemporary,
 };
 
 enum SecurityLevel {