Enable usage header table and entries

[ Merge of http://go/wvgerrit/24022 ]

b/34327459

Test: Verified by unit, integration tests on angler

Change-Id: Idb17dc472dddbdad217c35bdaa3fb20ae8152371

libwvdrmengine/cdm/core/include/cdm_session.h

@@ -23,6 +23,7 @@ namespace wvcdm {
 
 class CdmClientPropertySet;
 class WvCdmEventListener;
+class UsageTableHeader;
 
 class CdmSession {
  public:
@@ -37,7 +38,7 @@ class CdmSession {
   virtual CdmResponseType RestoreOfflineSession(
       const CdmKeySetId& key_set_id, const CdmLicenseType license_type);
   virtual CdmResponseType RestoreUsageSession(
-      const CdmKeyMessage& key_request, const CdmKeyResponse& key_response);
+      const DeviceFiles::CdmUsageData& usage_data);
 
   virtual const CdmSessionId& session_id() { return session_id_; }
   virtual const CdmKeySetId& key_set_id() { return key_set_id_; }
@@ -81,6 +82,9 @@ class CdmSession {
   // ReleaseKey() - Accept response and release key.
   virtual CdmResponseType ReleaseKey(const CdmKeyResponse& key_response);
 
+  virtual CdmResponseType DeleteUsageEntry(
+      const DeviceFiles::CdmUsageData& usage_data);
+
   virtual bool IsKeyLoaded(const KeyId& key_id);
   virtual int64_t GetDurationRemaining();
 
@@ -99,7 +103,8 @@ class CdmSession {
   // Delete usage information for the list of tokens, |provider_session_tokens|.
   virtual CdmResponseType DeleteMultipleUsageInformation(
       const std::vector<std::string>& provider_session_tokens);
-  virtual CdmResponseType UpdateUsageInformation();
+  virtual CdmResponseType UpdateUsageTableInformation();
+  virtual CdmResponseType UpdateUsageEntryInformation();
 
   virtual bool is_initial_usage_update() { return is_initial_usage_update_; }
   virtual bool is_usage_update_needed() { return is_usage_update_needed_; }
@@ -113,6 +118,9 @@ class CdmSession {
   virtual bool is_temporary() { return is_temporary_; }
   virtual bool license_received() { return license_received_; }
 
+  virtual CdmUsageSupportType get_usage_support_type()
+      { return usage_support_type_; }
+
   // ReleaseCrypto() - Closes the underlying crypto session but leaves this
   // object alive. It is invalid to call any method that requires a crypto
   // session after calling this. Since calling this renders this object mostly
@@ -165,6 +173,8 @@ class CdmSession {
   CdmResponseType StoreLicense();
   bool StoreLicense(DeviceFiles::LicenseState state);
 
+  bool UpdateUsageInfo();
+
   // These setters are for testing only. Takes ownership of the pointers.
   void set_license_parser(CdmLicense* license_parser);
   void set_crypto_session(CryptoSession* crypto_session);
@@ -197,11 +207,18 @@ class CdmSession {
   SecurityLevel requested_security_level_;
   CdmAppParameterMap app_parameters_;
 
-  // decryption and usage flags
+  // decryption flags
   bool is_initial_decryption_;
   bool has_decrypted_since_last_report_;  // ... last report to policy engine.
+
+  // Usage related flags and data
   bool is_initial_usage_update_;
   bool is_usage_update_needed_;
+  CdmUsageSupportType usage_support_type_;
+  UsageTableHeader* usage_table_header_;
+  uint32_t usage_entry_number_;
+  CdmUsageEntry usage_entry_;
+  std::string usage_provider_session_token_;
 
   // information useful for offline and usage scenarios
   CdmKeyMessage key_request_;

libwvdrmengine/cdm/core/include/wv_cdm_types.h

@@ -290,6 +290,11 @@ enum CdmResponseType {
   USAGE_STORE_LICENSE_FAILED,
   USAGE_STORE_USAGE_INFO_FAILED,
   USAGE_INVALID_LOAD_ENTRY, /* 250 */
+  RELEASE_ALL_USAGE_INFO_ERROR_4,
+  RELEASE_ALL_USAGE_INFO_ERROR_5,
+  RELEASE_USAGE_INFO_FAILED,
+  INCORRECT_USAGE_SUPPORT_TYPE_1,
+  INCORRECT_USAGE_SUPPORT_TYPE_2, /* 255 */
 };
 
 enum CdmKeyStatus {