Source release v3.0.0-0-g8d3792b-ce + third_party

Change-Id: I399e71ddfffcd436171d1c60283c63ab4658e0b1

core/include/cdm_session.h

@@ -4,6 +4,7 @@
 #define WVCDM_CORE_CDM_SESSION_H_
 
 #include <set>
+#include <string>
 
 #include "crypto_session.h"
 #include "device_files.h"
@@ -21,7 +22,9 @@ class WvCdmEventListener;
 
 class CdmSession {
  public:
-  explicit CdmSession(const CdmClientPropertySet* cdm_client_property_set);
+  CdmSession(CdmClientPropertySet* cdm_client_property_set,
+             const std::string& origin, WvCdmEventListener* event_listener,
+             const CdmSessionId* forced_session_id);
   virtual ~CdmSession();
 
   virtual CdmResponseType Init();
@@ -34,9 +37,10 @@ class CdmSession {
   virtual const CdmSessionId& session_id() { return session_id_; }
 
   virtual CdmResponseType GenerateKeyRequest(
-      const InitializationData& init_data, const CdmLicenseType license_type,
+      const InitializationData& init_data, CdmLicenseType license_type,
       const CdmAppParameterMap& app_parameters, CdmKeyMessage* key_request,
-      std::string* server_url, CdmKeySetId* key_set_id);
+      CdmKeyRequestType* key_request_type, std::string* server_url,
+      CdmKeySetId* key_set_id);
 
   // AddKey() - Accept license response and extract key info.
   virtual CdmResponseType AddKey(const CdmKeyResponse& key_response,
@@ -74,24 +78,33 @@ class CdmSession {
 
   virtual bool IsKeyLoaded(const KeyId& key_id);
 
-  virtual bool AttachEventListener(WvCdmEventListener* listener);
-  virtual bool DetachEventListener(WvCdmEventListener* listener);
+  // Used for notifying the Policy Engine of resolution changes
+  virtual void NotifyResolution(uint32_t width, uint32_t height);
 
-  virtual void OnTimerEvent();
+  virtual void OnTimerEvent(bool update_usage);
   virtual void OnKeyReleaseEvent(const CdmKeySetId& key_set_id);
 
+  virtual void GetApplicationId(std::string* app_id);
   virtual SecurityLevel GetRequestedSecurityLevel() {
     return requested_security_level_;
   }
   virtual CdmSecurityLevel GetSecurityLevel() { return security_level_; }
 
+  // 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 bool is_initial_usage_update() { return is_initial_usage_update_; }
   virtual bool is_usage_update_needed() { return is_usage_update_needed_; }
-  virtual void reset_is_usage_update_needed() {
+  virtual void reset_usage_flags() {
+    is_initial_usage_update_ = false;
     is_usage_update_needed_ = false;
   }
 
+  virtual bool is_release() { return is_release_; }
+  virtual bool is_offline() { return is_offline_; }
+
   // 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
@@ -99,11 +112,10 @@ class CdmSession {
   // release the underlying crypto session) rather than call this method.
   virtual CdmResponseType ReleaseCrypto();
 
+  bool DeleteLicense();
+
  private:
-  // Internal constructor
-  void Create(CdmLicense* license_parser, CryptoSession* crypto_session,
-              PolicyEngine* policy_engine, DeviceFiles* file_handle,
-              const CdmClientPropertySet* cdm_client_property_set);
+  friend class CdmSessionTest;
 
   // Generate unique ID for each new session.
   CdmSessionId GenerateSessionId();
@@ -111,11 +123,17 @@ class CdmSession {
 
   CdmResponseType StoreLicense();
   bool StoreLicense(DeviceFiles::LicenseState state);
-  bool DeleteLicense();
+
+  // 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);
+  void set_policy_engine(PolicyEngine* policy_engine);
+  void set_file_handle(DeviceFiles* file_handle);
 
   // instance variables
   bool initialized_;
   CdmSessionId session_id_;
+  const std::string origin_;
   scoped_ptr<CdmLicense> license_parser_;
   scoped_ptr<CryptoSession> crypto_session_;
   scoped_ptr<PolicyEngine> policy_engine_;
@@ -123,11 +141,15 @@ class CdmSession {
   bool license_received_;
   bool is_offline_;
   bool is_release_;
-  bool is_usage_update_needed_;
-  bool is_initial_decryption_;
-
   CdmSecurityLevel security_level_;
   SecurityLevel requested_security_level_;
+  CdmAppParameterMap app_parameters_;
+
+  // decryption and usage flags
+  bool is_initial_decryption_;
+  bool has_decrypted_since_last_report_;  // ... last report to policy engine.
+  bool is_initial_usage_update_;
+  bool is_usage_update_needed_;
 
   // information useful for offline and usage scenarios
   CdmKeyMessage key_request_;
@@ -142,18 +164,6 @@ class CdmSession {
   // license type release and offline related information
   CdmKeySetId key_set_id_;
 
-  std::set<WvCdmEventListener*> listeners_;
-
-  // For testing only
-  // Takes ownership of license_parser, crypto_session, policy_engine
-  // and device_files
-  CdmSession(CdmLicense* license_parser, CryptoSession* crypto_session,
-             PolicyEngine* policy_engine, DeviceFiles* file_handle,
-             const CdmClientPropertySet* cdm_client_property_set);
-#if defined(UNIT_TEST)
-  friend class CdmSessionTest;
-#endif
-
   CORE_DISALLOW_COPY_AND_ASSIGN(CdmSession);
 };