Source release v3.0.1 + third_party

cdm/src/cdm.cpp

@@ -105,7 +105,6 @@ class PropertySet : public CdmClientPropertySet {
 };
 
 class CdmImpl : public Cdm,
-                public Cdm::ITimer::IClient,
                 public WvCdmEventListener {
  public:
   CdmImpl(IEventListener* listener,
@@ -134,6 +133,16 @@ class CdmImpl : public Cdm,
   virtual Status getKeyStatuses(const std::string& session_id,
                                 KeyStatusMap* key_statuses) OVERRIDE;
 
+  virtual Status setAppParameter(const std::string& key,
+                                 const std::string& value) OVERRIDE;
+
+  virtual Status getAppParameter(const std::string& key,
+                                 std::string* result) OVERRIDE;
+
+  virtual Status removeAppParameter(const std::string& key) OVERRIDE;
+
+  virtual Status clearAppParameters() OVERRIDE;
+
   virtual Status close(const std::string& session_id) OVERRIDE;
 
   virtual Status remove(const std::string& session_id) OVERRIDE;
@@ -141,7 +150,7 @@ class CdmImpl : public Cdm,
   virtual Status decrypt(const InputBuffer& input,
                          const OutputBuffer& output) OVERRIDE;
 
-  // ITimer::IClient:
+  // ITimerClient:
   virtual void onTimerExpired(void* context) OVERRIDE;
 
   // WvCdmEventListener:
@@ -160,6 +169,7 @@ class CdmImpl : public Cdm,
 
   CdmEngine cdm_engine_;
   PropertySet property_set_;
+  CdmAppParameterMap app_parameters_;
 
   std::map<std::string, SessionType> new_session_types_;
   std::map<std::string, int64_t> session_expirations_;
@@ -173,7 +183,9 @@ CdmImpl::CdmImpl(IEventListener* listener,
   property_set_.set_use_privacy_mode(privacy_mode);
 }
 
-CdmImpl::~CdmImpl() {}
+CdmImpl::~CdmImpl() {
+  host.timer->cancel(this);
+}
 
 Cdm::Status CdmImpl::setServerCertificate(const std::string& certificate) {
   if (!property_set_.use_privacy_mode()) {
@@ -283,14 +295,13 @@ Cdm::Status CdmImpl::generateRequest(const std::string& session_id,
     return kInvalidAccess;
   }
 
-  CdmAppParameterMap empty_app_parameters;
   std::string key_request;
   CdmKeyRequestType key_request_type;
   std::string ignored_server_url;
 
   CdmResponseType result = cdm_engine_.GenerateKeyRequest(
       session_id, session_id, init_data_obj,
-      license_type, empty_app_parameters, &key_request, &key_request_type,
+      license_type, app_parameters_, &key_request, &key_request_type,
       &ignored_server_url, NULL);
 
   if (result != KEY_MESSAGE) {
@@ -349,13 +360,12 @@ Cdm::Status CdmImpl::load(const std::string& session_id) {
     // This was partially removed already.
     // The EME spec states that we should send a release message right away.
     InitializationData empty_initialization_data;
-    CdmAppParameterMap empty_app_parameters;
     CdmKeyMessage key_request;
     std::string ignored_server_url;
 
     CdmResponseType result = cdm_engine_.GenerateKeyRequest(
         session_id, session_id, empty_initialization_data,
-        kLicenseTypeRelease, empty_app_parameters, &key_request, NULL,
+        kLicenseTypeRelease, app_parameters_, &key_request, NULL,
         &ignored_server_url, NULL);
     if (result != KEY_MESSAGE) {
       LOGE("Unexpected error %d", result);
@@ -412,14 +422,13 @@ Cdm::Status CdmImpl::update(const std::string& session_id,
     // The underlying session in CdmEngine has stored a copy of the original
     // init data, so we can use an empty one this time.
     InitializationData empty_init_data;
-    CdmAppParameterMap empty_app_parameters;
     std::string key_request;
     CdmKeyRequestType key_request_type;
     std::string ignored_server_url;
 
     CdmResponseType result = cdm_engine_.GenerateKeyRequest(
         session_id, session_id, empty_init_data, kLicenseTypeDeferred,
-        empty_app_parameters, &key_request, &key_request_type,
+        app_parameters_, &key_request, &key_request_type,
         &ignored_server_url, NULL);
 
     if (result != KEY_MESSAGE) {
@@ -476,6 +485,42 @@ Cdm::Status CdmImpl::getKeyStatuses(const std::string& session_id,
   return kSuccess;
 }
 
+Cdm::Status CdmImpl::setAppParameter(const std::string& key,
+                                     const std::string& value) {
+  if (key.empty()) {
+    return kInvalidAccess;
+  }
+  app_parameters_[key] = value;
+  return kSuccess;
+}
+
+Cdm::Status CdmImpl::getAppParameter(const std::string& key,
+                                     std::string* result) {
+  if (NULL == result || key.empty() ||
+      app_parameters_.find(key) == app_parameters_.end()) {
+    return kInvalidAccess;
+  }
+  *result = app_parameters_[key];
+  return kSuccess;
+}
+
+Cdm::Status CdmImpl::removeAppParameter(const std::string& key) {
+  if (key.empty()) {
+    return kInvalidAccess;
+  }
+  CdmAppParameterMap::iterator it = app_parameters_.find(key);
+  if (it == app_parameters_.end()) {
+    return kInvalidAccess;
+  }
+  app_parameters_.erase(it);
+  return kSuccess;
+}
+
+Cdm::Status CdmImpl::clearAppParameters() {
+  app_parameters_.clear();
+  return kSuccess;
+}
+
 Cdm::Status CdmImpl::close(const std::string& session_id) {
   if (!cdm_engine_.IsOpenSession(session_id)) {
     LOGE("No such session: %s", session_id.c_str());
@@ -507,13 +552,12 @@ Cdm::Status CdmImpl::remove(const std::string& session_id) {
   }
 
   InitializationData empty_initialization_data;
-  CdmAppParameterMap empty_app_parameters;
   CdmKeyMessage key_request;
   std::string ignored_server_url;
 
   CdmResponseType result = cdm_engine_.GenerateKeyRequest(
       session_id, session_id, empty_initialization_data,
-      kLicenseTypeRelease, empty_app_parameters, &key_request, NULL,
+      kLicenseTypeRelease, app_parameters_, &key_request, NULL,
       &ignored_server_url, NULL);
   if (result != KEY_MESSAGE) {
     LOGE("Unexpected error %d", result);