Update MediaKeys interface for EME

content/renderer/media/crypto/proxy_media_keys.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/crypto/proxy_media_keys.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "content/renderer/media/crypto/key_systems.h"
 #include "content/renderer/media/crypto/renderer_cdm_manager.h"
 #include "media/base/cdm_promise.h"
 
 namespace content {
 
 scoped_ptr<ProxyMediaKeys> ProxyMediaKeys::Create(
     const std::string& key_system,
     const GURL& security_origin,
     RendererCdmManager* manager,
     const media::SessionMessageCB& session_message_cb,
     const media::SessionReadyCB& session_ready_cb,
     const media::SessionClosedCB& session_closed_cb,
-    const media::SessionErrorCB& session_error_cb) {
+    const media::SessionErrorCB& session_error_cb,
+    const media::SessionKeysChangeCB& session_keys_change_cb,
+    const media::SessionExpirationChangeCB& session_expiration_change_cb) {
   DCHECK(manager);
+
+  // TODO(jrummell): Add support for SessionKeysChangeCB and
+  // SessionExpirationChangeCB.
   scoped_ptr<ProxyMediaKeys> proxy_media_keys(
       new ProxyMediaKeys(manager,
                          session_message_cb,
                          session_ready_cb,
                          session_closed_cb,
                          session_error_cb));
   proxy_media_keys->InitializeCdm(key_system, security_origin);
   return proxy_media_keys.Pass();
 }
 
 ProxyMediaKeys::~ProxyMediaKeys() {
   manager_->DestroyCdm(cdm_id_);
   manager_->UnregisterMediaKeys(cdm_id_);
 
   // Reject any outstanding promises.
   for (PromiseMap::iterator it = session_id_to_promise_map_.begin();
        it != session_id_to_promise_map_.end();
        ++it) {
     it->second->reject(
         media::MediaKeys::NOT_SUPPORTED_ERROR, 0, "The operation was aborted.");
   }
   session_id_to_promise_map_.clear();
 }
 
+void ProxyMediaKeys::SetServerCertificate(
+    const uint8* certificate_data,
+    int certificate_data_length,
+    scoped_ptr<media::SimpleCdmPromise> promise) {
+  promise->reject(NOT_SUPPORTED_ERROR, 0, "Not yet implemented.");
+}
+
 void ProxyMediaKeys::CreateSession(
     const std::string& init_data_type,
     const uint8* init_data,
     int init_data_length,
     SessionType session_type,
     scoped_ptr<media::NewSessionCdmPromise> promise) {
   // TODO(xhwang): Move these checks up to blink and DCHECK here.
   // See http://crbug.com/342510
   CdmHostMsg_CreateSession_ContentType create_session_content_type;
   if (init_data_type == "cenc") {
@@ skipping 39 matching lines @@
     return;
   }
 
   SavePromise(session_id, promise.PassAs<media::CdmPromise>());
   manager_->UpdateSession(
       cdm_id_,
       session_id,
       std::vector<uint8>(response, response + response_length));
 }
 
-void ProxyMediaKeys::ReleaseSession(
-    const std::string& web_session_id,
-    scoped_ptr<media::SimpleCdmPromise> promise) {
+void ProxyMediaKeys::CloseSession(const std::string& web_session_id,
+                                  scoped_ptr<media::SimpleCdmPromise> promise) {
+  // Both CloseSession() and RemoveSession() call ReleaseSession(), so calling
+  // either one will release the session. Calling both will result in an error
+  // for the second call.
+  // TODO(jrummell): Implement Close/Remove properly.
   uint32 session_id = LookupSessionId(web_session_id);
   if (!session_id) {
     promise->reject(INVALID_ACCESS_ERROR, 0, "Session does not exist.");
+    return;
+  }
+
+  SavePromise(session_id, promise.PassAs<media::CdmPromise>());
+  manager_->ReleaseSession(cdm_id_, session_id);
+}
+
+void ProxyMediaKeys::RemoveSession(
+    const std::string& web_session_id,
+    scoped_ptr<media::SimpleCdmPromise> promise) {
+  // Both CloseSession() and RemoveSession() call ReleaseSession(), so calling

[ddorwin, 2014/09/11 23:31:11]

Remove is not implemented on Android because persistent sessions are not
currently supported on Android. I think we should make CloseSession the single
working implementation and return NOT_SUPPORTED from RemoveSession.

What does ReleaseSession() do? I'm guessing it calls MediaDrm.CKR(), but I don't
know what that does either. Since there are no uses of webkitCKR on Android, I
think it's fine to fail (you said in the previous PS that it calls
RemoveSession()).

[jrummell, 2014/09/15 18:22:39]

Done. I was more concerned about v0.1b calling CKR, which is converted to call
RemoveSession() today. But if nobody uses it, it should be fine to return not
implemented.

+  // either one will release the session. Calling both will result in an error
+  // for the second call.
+  uint32 session_id = LookupSessionId(web_session_id);
+  if (!session_id) {
+    promise->reject(INVALID_ACCESS_ERROR, 0, "Session does not exist.");
     return;
   }
 
   SavePromise(session_id, promise.PassAs<media::CdmPromise>());
   manager_->ReleaseSession(cdm_id_, session_id);
 }
 
+void ProxyMediaKeys::GetUsableKeyIds(const std::string& web_session_id,
+                                     scoped_ptr<media::KeyIdsPromise> promise) {
+  promise->reject(NOT_SUPPORTED_ERROR, 0, "Not yet implemented.");
+}
+
 void ProxyMediaKeys::OnSessionCreated(uint32 session_id,
                                       const std::string& web_session_id) {
   AssignWebSessionId(session_id, web_session_id);
   scoped_ptr<media::CdmPromise> promise = TakePromise(session_id);
   if (promise) {
     media::NewSessionCdmPromise* session_promise(
         static_cast<media::NewSessionCdmPromise*>(promise.get()));
     session_promise->resolve(web_session_id);
   }
 }
@@ skipping 131 matching lines @@
 
 scoped_ptr<media::CdmPromise> ProxyMediaKeys::TakePromise(uint32_t session_id) {
   PromiseMap::iterator it = session_id_to_promise_map_.find(session_id);
   // May not be a promise associated with this session for asynchronous events.
   if (it == session_id_to_promise_map_.end())
     return scoped_ptr<media::CdmPromise>();
   return session_id_to_promise_map_.take_and_erase(it);
 }
 
 }  // namespace content