media: Support unprefixed EME API on Android.

content/browser/media/cdm/browser_cdm_manager.cc

Index: content/browser/media/cdm/browser_cdm_manager.cc
diff --git a/content/browser/media/cdm/browser_cdm_manager.cc b/content/browser/media/cdm/browser_cdm_manager.cc
index 1b3790fbbf3affaf2b1a3fd4959a10fc492d37a8..d5792eb72140c4ec4258ba8fc35c95fbc4f8fb2e 100644
--- a/content/browser/media/cdm/browser_cdm_manager.cc
+++ b/content/browser/media/cdm/browser_cdm_manager.cc
@@ -4,9 +4,12 @@
 
 #include "content/browser/media/cdm/browser_cdm_manager.h"
 
+#include <string>
+
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/task_runner.h"
 #include "content/common/media/cdm_messages.h"
 #include "content/public/browser/browser_thread.h"
@@ -18,6 +21,7 @@
 #include "content/public/common/content_switches.h"
 #include "media/base/browser_cdm.h"
 #include "media/base/browser_cdm_factory.h"
+#include "media/base/cdm_promise.h"
 #include "media/base/media_switches.h"
 
 namespace content {
@@ -25,6 +29,8 @@ namespace content {
 using media::BrowserCdm;
 using media::MediaKeys;
 
+namespace {
+
 // Maximum lengths for various EME API parameters. These are checks to
 // prevent unnecessarily large parameters from being passed around, and the
 // lengths are somewhat arbitrary as the EME spec doesn't specify any limits.
@@ -35,15 +41,60 @@ const size_t kMaxKeySystemLength = 256;
 // The ID used in this class is a concatenation of |render_frame_id| and
 // |cdm_id|, i.e. (render_frame_id << 32) + cdm_id.
 
-static uint64 GetId(int render_frame_id, int cdm_id) {
+uint64 GetId(int render_frame_id, int cdm_id) {
   return (static_cast<uint64>(render_frame_id) << 32) +
          static_cast<uint64>(cdm_id);
 }
 
-static bool IdBelongsToFrame(uint64 id, int render_frame_id) {
+bool IdBelongsToFrame(uint64 id, int render_frame_id) {
   return (id >> 32) == static_cast<uint64>(render_frame_id);
 }
 
+// media::CdmPromiseTemplate implementation backed by a BrowserCdmManager.
+template <typename... T>
+class CdmPromiseInternal : public media::CdmPromiseTemplate<T...> {
+ public:
+  CdmPromiseInternal(BrowserCdmManager* manager,
+                     int render_frame_id,
+                     int cdm_id,
+                     uint32_t promise_id)
+      : manager_(manager),
+        render_frame_id_(render_frame_id),
+        cdm_id_(cdm_id),
+        promise_id_(promise_id) {
+    DCHECK(manager_);
+  }
+
+  ~CdmPromiseInternal() final {}
+
+  // CdmPromiseTemplate<> implementation.
+  void resolve(const T&... result) final {
+    MarkPromiseSettled();
+    manager_->ResolvePromise(render_frame_id_, cdm_id_, promise_id_, result...);
+  }
+
+  void reject(MediaKeys::Exception exception,
+              uint32_t system_code,
+              const std::string& error_message) final {
+    MarkPromiseSettled();
+    manager_->RejectPromise(render_frame_id_, cdm_id_, promise_id_, exception,
+                            system_code, error_message);
+  }
+
+ private:
+  using media::CdmPromiseTemplate<T...>::MarkPromiseSettled;
+
+  BrowserCdmManager* const manager_;
+  const int render_frame_id_;
+  const int cdm_id_;
+  const uint32_t promise_id_;
+};
+
+typedef CdmPromiseInternal<> SimplePromise;
+typedef CdmPromiseInternal<std::string> NewSessionPromise;
+
+}  // namespace
+
 // Render process ID to BrowserCdmManager map.
 typedef std::map<int, BrowserCdmManager*> BrowserCdmManagerMap;
 base::LazyInstance<BrowserCdmManagerMap> g_browser_cdm_manager_map =
@@ -107,9 +158,11 @@ bool BrowserCdmManager::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(BrowserCdmManager, msg)
     IPC_MESSAGE_HANDLER(CdmHostMsg_InitializeCdm, OnInitializeCdm)
-    IPC_MESSAGE_HANDLER(CdmHostMsg_CreateSession, OnCreateSession)
+    IPC_MESSAGE_HANDLER(CdmHostMsg_SetServerCertificate, OnSetServerCertificate)
+    IPC_MESSAGE_HANDLER(CdmHostMsg_CreateSessionAndGenerateRequest,
+                        OnCreateSessionAndGenerateRequest)
     IPC_MESSAGE_HANDLER(CdmHostMsg_UpdateSession, OnUpdateSession)
-    IPC_MESSAGE_HANDLER(CdmHostMsg_ReleaseSession, OnReleaseSession)
+    IPC_MESSAGE_HANDLER(CdmHostMsg_CloseSession, OnCloseSession)
     IPC_MESSAGE_HANDLER(CdmHostMsg_DestroyCdm, OnDestroyCdm)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
@@ -132,17 +185,36 @@ void BrowserCdmManager::RenderFrameDeleted(int render_frame_id) {
   RemoveAllCdmForFrame(render_frame_id);
 }
 
-void BrowserCdmManager::OnSessionCreated(int render_frame_id,
+template <>
+void BrowserCdmManager::ResolvePromise<>(int render_frame_id,
                                          int cdm_id,
-                                         uint32 session_id,
-                                         const std::string& web_session_id) {
-  Send(new CdmMsg_SessionCreated(
-      render_frame_id, cdm_id, session_id, web_session_id));
+                                         uint32_t promise_id) {
+  Send(new CdmMsg_ResolvePromise(render_frame_id, cdm_id, promise_id));
+}
+
+template <>
+void BrowserCdmManager::ResolvePromise<std::string>(
+    int render_frame_id,
+    int cdm_id,
+    uint32_t promise_id,
+    const std::string& session_id) {
+  Send(new CdmMsg_ResolvePromiseWithSession(render_frame_id, cdm_id, promise_id,
+                                            session_id));
+}
+
+void BrowserCdmManager::RejectPromise(int render_frame_id,
+                                      int cdm_id,
+                                      uint32_t promise_id,
+                                      media::MediaKeys::Exception exception,
+                                      uint32_t system_code,
+                                      const std::string& error_message) {
+  Send(new CdmMsg_RejectPromise(render_frame_id, cdm_id, promise_id, exception,
+                                system_code, error_message));
 }
 
 void BrowserCdmManager::OnSessionMessage(int render_frame_id,
                                          int cdm_id,
-                                         uint32 session_id,
+                                         const std::string& session_id,
                                          const std::vector<uint8>& message,
                                          const GURL& destination_url) {
   GURL verified_gurl = destination_url;
@@ -156,25 +228,42 @@ void BrowserCdmManager::OnSessionMessage(int render_frame_id,
       render_frame_id, cdm_id, session_id, message, verified_gurl));
 }
 
-void BrowserCdmManager::OnSessionReady(int render_frame_id,
-                                       int cdm_id,
-                                       uint32 session_id) {
-  Send(new CdmMsg_SessionReady(render_frame_id, cdm_id, session_id));
-}
-
 void BrowserCdmManager::OnSessionClosed(int render_frame_id,
                                         int cdm_id,
-                                        uint32 session_id) {
+                                        const std::string& session_id) {
   Send(new CdmMsg_SessionClosed(render_frame_id, cdm_id, session_id));
 }
 
 void BrowserCdmManager::OnSessionError(int render_frame_id,
                                        int cdm_id,
-                                       uint32 session_id,
-                                       MediaKeys::KeyError error_code,
-                                       uint32 system_code) {
-  Send(new CdmMsg_SessionError(
-      render_frame_id, cdm_id, session_id, error_code, system_code));
+                                       const std::string& session_id,
+                                       MediaKeys::Exception exception_code,
+                                       uint32 system_code,
+                                       const std::string& error_message) {
+  Send(new CdmMsg_SessionError(render_frame_id, cdm_id, session_id,
+                               exception_code, system_code, error_message));
+}
+
+void BrowserCdmManager::OnSessionKeysChange(int render_frame_id,
+                                            int cdm_id,
+                                            const std::string& session_id,
+                                            bool has_additional_usable_key,
+                                            media::CdmKeysInfo keys_info) {
+  std::vector<media::CdmKeyInformation> key_info_vector;
+  for (const auto& key_info : keys_info)
+    key_info_vector.push_back(*key_info);
+  Send(new CdmMsg_SessionKeysChange(render_frame_id, cdm_id, session_id,
+                                    has_additional_usable_key,
+                                    key_info_vector));
+}
+
+void BrowserCdmManager::OnSessionExpirationUpdate(
+    int render_frame_id,
+    int cdm_id,
+    const std::string& session_id,
+    const base::Time& new_expiry_time) {
+  Send(new CdmMsg_SessionExpirationUpdate(render_frame_id, cdm_id, session_id,
+                                          new_expiry_time));
 }
 
 void BrowserCdmManager::OnInitializeCdm(int render_frame_id,
@@ -191,16 +280,42 @@ void BrowserCdmManager::OnInitializeCdm(int render_frame_id,
   AddCdm(render_frame_id, cdm_id, key_system, security_origin);
 }
 
-void BrowserCdmManager::OnCreateSession(
+void BrowserCdmManager::OnSetServerCertificate(
     int render_frame_id,
     int cdm_id,
-    uint32 session_id,
-    CdmHostMsg_CreateSession_ContentType content_type,
+    uint32_t promise_id,
+    const std::vector<uint8_t>& certificate) {
+  scoped_ptr<SimplePromise> promise(
+      new SimplePromise(this, render_frame_id, cdm_id, promise_id));
+
+  BrowserCdm* cdm = GetCdm(render_frame_id, cdm_id);
+  if (!cdm) {
+    promise->reject(MediaKeys::INVALID_STATE_ERROR, 0, "CDM not found.");
+    return;
+  }
+
+  if (certificate.empty()) {
+    promise->reject(MediaKeys::INVALID_ACCESS_ERROR, 0, "Empty certificate.");
+    return;
+  }
+
+  cdm->SetServerCertificate(&certificate[0], certificate.size(),
+                            promise.Pass());
+}
+
+void BrowserCdmManager::OnCreateSessionAndGenerateRequest(

[ddorwin, 2015/01/14 23:09:20]

The session type should be passed. (We can DCHECK for now.)

[xhwang, 2015/01/15 08:13:13]

Chromium IPC only supports at most 5 parameters. I'd hate to have a struct (e.g.
CreateSessionData) to pass SessionType over IPC. If ChromeCast ever needs
persistent sessions, I can add it later (in a separate CL). Otherwise, I'll keep
it as is, and hopefully this will be replaced by mojo soon.

[ddorwin, 2015/01/15 17:36:52]

Acknowledged.

+    int render_frame_id,
+    int cdm_id,
+    uint32_t promise_id,
+    CdmHostMsg_CreateSession_InitDataType init_data_type,
     const std::vector<uint8>& init_data) {
+  scoped_ptr<NewSessionPromise> promise(
+      new NewSessionPromise(this, render_frame_id, cdm_id, promise_id));
+
   if (init_data.size() > kMaxInitDataLength) {
     LOG(WARNING) << "InitData for ID: " << cdm_id
                  << " too long: " << init_data.size();
-    SendSessionError(render_frame_id, cdm_id, session_id);
+    promise->reject(MediaKeys::INVALID_ACCESS_ERROR, 0, "Init data too long.");
     return;
   }
 
@@ -209,7 +324,7 @@ void BrowserCdmManager::OnCreateSession(
   // Ref:
   // https://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html#dom-createsession
   std::string mime_type;
-  switch (content_type) {
+  switch (init_data_type) {
     case CREATE_SESSION_TYPE_WEBM:
       mime_type = "video/webm";
       break;
@@ -218,14 +333,16 @@ void BrowserCdmManager::OnCreateSession(
       break;
     default:
       NOTREACHED();
+      promise->reject(MediaKeys::INVALID_ACCESS_ERROR, 0,
+                      "Invalid init data type.");
       return;
   }
 
 #if defined(OS_ANDROID)
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableInfobarForProtectedMediaIdentifier)) {
-    CreateSessionIfPermitted(
-        render_frame_id, cdm_id, session_id, mime_type, init_data, true);
+    CreateSessionIfPermitted(render_frame_id, cdm_id, mime_type, init_data,
+                             promise.Pass(), true);
     return;
   }
 #endif
@@ -233,7 +350,7 @@ void BrowserCdmManager::OnCreateSession(
   BrowserCdm* cdm = GetCdm(render_frame_id, cdm_id);
   if (!cdm) {
     DLOG(WARNING) << "No CDM found for: " << render_frame_id << ", " << cdm_id;
-    SendSessionError(render_frame_id, cdm_id, session_id);
+    promise->reject(MediaKeys::INVALID_STATE_ERROR, 0, "CDM not found.");
     return;
   }
 
@@ -241,65 +358,64 @@ void BrowserCdmManager::OnCreateSession(
       cdm_security_origin_map_.find(GetId(render_frame_id, cdm_id));
   if (iter == cdm_security_origin_map_.end()) {
     NOTREACHED();
-    SendSessionError(render_frame_id, cdm_id, session_id);
+    promise->reject(MediaKeys::INVALID_STATE_ERROR, 0, "CDM not found.");
     return;
   }
   GURL security_origin = iter->second;
 
-  RequestSessionPermission(render_frame_id,
-                           security_origin,
-                           cdm_id,
-                           session_id,
-                           mime_type,
-                           init_data);
+  RequestSessionPermission(render_frame_id, security_origin, cdm_id, mime_type,
+                           init_data, promise.Pass());
 }
 
-void BrowserCdmManager::OnUpdateSession(
-    int render_frame_id,
-    int cdm_id,
-    uint32 session_id,
-    const std::vector<uint8>& response) {
+void BrowserCdmManager::OnUpdateSession(int render_frame_id,
+                                        int cdm_id,
+                                        uint32_t promise_id,
+                                        const std::string& session_id,
+                                        const std::vector<uint8>& response) {
+  scoped_ptr<SimplePromise> promise(
+      new SimplePromise(this, render_frame_id, cdm_id, promise_id));
+
   BrowserCdm* cdm = GetCdm(render_frame_id, cdm_id);
   if (!cdm) {
-    DLOG(WARNING) << "No CDM found for: " << render_frame_id << ", " << cdm_id;
-    SendSessionError(render_frame_id, cdm_id, session_id);
+    promise->reject(MediaKeys::INVALID_STATE_ERROR, 0, "CDM not found.");
     return;
   }
 
   if (response.size() > kMaxSessionResponseLength) {
     LOG(WARNING) << "Response for ID " << cdm_id
                  << " is too long: " << response.size();
-    SendSessionError(render_frame_id, cdm_id, session_id);
+    promise->reject(MediaKeys::INVALID_ACCESS_ERROR, 0, "Response too long.");
     return;
   }
 
-  cdm->UpdateSession(session_id, &response[0], response.size());
+  if (response.empty()) {
+    promise->reject(MediaKeys::INVALID_ACCESS_ERROR, 0, "Response is empty.");
+    return;
+  }
+
+  cdm->UpdateSession(session_id, &response[0], response.size(), promise.Pass());
 }
 
-void BrowserCdmManager::OnReleaseSession(int render_frame_id,
-                                         int cdm_id,
-                                         uint32 session_id) {
+void BrowserCdmManager::OnCloseSession(int render_frame_id,
+                                       int cdm_id,
+                                       uint32_t promise_id,
+                                       const std::string& session_id) {
+  scoped_ptr<SimplePromise> promise(
+      new SimplePromise(this, render_frame_id, cdm_id, promise_id));
+
   BrowserCdm* cdm = GetCdm(render_frame_id, cdm_id);
   if (!cdm) {
-    DLOG(WARNING) << "No CDM found for: " << render_frame_id << ", " << cdm_id;
-    SendSessionError(render_frame_id, cdm_id, session_id);
+    promise->reject(MediaKeys::INVALID_STATE_ERROR, 0, "CDM not found.");
     return;
   }
 
-  cdm->ReleaseSession(session_id);
+  cdm->CloseSession(session_id, promise.Pass());
 }
 
 void BrowserCdmManager::OnDestroyCdm(int render_frame_id, int cdm_id) {
   RemoveCdm(GetId(render_frame_id, cdm_id));
 }
 
-void BrowserCdmManager::SendSessionError(int render_frame_id,
-                                         int cdm_id,
-                                         uint32 session_id) {
-  OnSessionError(
-        render_frame_id, cdm_id, session_id, MediaKeys::kUnknownError, 0);
-}
-
 #define BROWSER_CDM_MANAGER_CB(func) \
   base::Bind(&BrowserCdmManager::func, this, render_frame_id, cdm_id)
 
@@ -310,17 +426,16 @@ void BrowserCdmManager::AddCdm(int render_frame_id,
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
   DCHECK(!GetCdm(render_frame_id, cdm_id));
 
-  scoped_ptr<BrowserCdm> cdm(
-      media::CreateBrowserCdm(key_system,
-                              BROWSER_CDM_MANAGER_CB(OnSessionCreated),
-                              BROWSER_CDM_MANAGER_CB(OnSessionMessage),
-                              BROWSER_CDM_MANAGER_CB(OnSessionReady),
-                              BROWSER_CDM_MANAGER_CB(OnSessionClosed),
-                              BROWSER_CDM_MANAGER_CB(OnSessionError)));
+  scoped_ptr<BrowserCdm> cdm(media::CreateBrowserCdm(
+      key_system, BROWSER_CDM_MANAGER_CB(OnSessionMessage),
+      BROWSER_CDM_MANAGER_CB(OnSessionClosed),
+      BROWSER_CDM_MANAGER_CB(OnSessionError),
+      BROWSER_CDM_MANAGER_CB(OnSessionKeysChange),
+      BROWSER_CDM_MANAGER_CB(OnSessionExpirationUpdate)));
 
   if (!cdm) {
-    // This failure will be discovered and reported by OnCreateSession()
-    // as GetCdm() will return null.
+    // This failure will be discovered and reported by
+    // OnCreateSessionAndGenerateRequest() as GetCdm() will return null.
     DVLOG(1) << "failed to create CDM.";
     return;
   }
@@ -358,21 +473,15 @@ void BrowserCdmManager::RequestSessionPermission(
     int render_frame_id,
     const GURL& security_origin,
     int cdm_id,
-    uint32 session_id,
-    const std::string& content_type,
-    const std::vector<uint8>& init_data) {
+    const std::string& init_data_type,
+    const std::vector<uint8>& init_data,
+    scoped_ptr<media::NewSessionCdmPromise> promise) {
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     BrowserThread::PostTask(
-        BrowserThread::UI,
-        FROM_HERE,
-        base::Bind(&BrowserCdmManager::RequestSessionPermission,
-                   this,
-                   render_frame_id,
-                   security_origin,
-                   cdm_id,
-                   session_id,
-                   content_type,
-                   init_data));
+        BrowserThread::UI, FROM_HERE,
+        base::Bind(&BrowserCdmManager::RequestSessionPermission, this,
+                   render_frame_id, security_origin, cdm_id, init_data_type,
+                   init_data, base::Passed(&promise)));
     return;
   }
 
@@ -381,44 +490,40 @@ void BrowserCdmManager::RequestSessionPermission(
   WebContents* web_contents = WebContents::FromRenderFrameHost(rfh);
   DCHECK(web_contents);
   GetContentClient()->browser()->RequestPermission(
-      content::PERMISSION_PROTECTED_MEDIA,
-      web_contents,
+      content::PERMISSION_PROTECTED_MEDIA, web_contents,
       0,  // bridge id
       security_origin,
       // Only implemented for Android infobars which do not support
       // user gestures.
-      true,
-      base::Bind(&BrowserCdmManager::CreateSessionIfPermitted,
-                 this,
-                 render_frame_id,
-                 cdm_id,
-                 session_id,
-                 content_type,
-                 init_data));
+      true, base::Bind(&BrowserCdmManager::CreateSessionIfPermitted, this,
+                       render_frame_id, cdm_id, init_data_type, init_data,
+                       base::Passed(&promise)));
 }
 
 void BrowserCdmManager::CreateSessionIfPermitted(

[ddorwin, 2015/01/14 23:09:20]

GenerateRequestIfPermitted?

[xhwang, 2015/01/15 08:13:13]

Done.

     int render_frame_id,
     int cdm_id,
-    uint32 session_id,
-    const std::string& content_type,
+    const std::string& init_data_type,
     const std::vector<uint8>& init_data,
+    scoped_ptr<media::NewSessionCdmPromise> promise,
     bool permitted) {
   cdm_cancel_permission_map_.erase(GetId(render_frame_id, cdm_id));
   if (!permitted) {
-    SendSessionError(render_frame_id, cdm_id, session_id);
+    promise->reject(MediaKeys::NOT_SUPPORTED_ERROR, 0, "Permission denied.");
     return;
   }
 
   BrowserCdm* cdm = GetCdm(render_frame_id, cdm_id);
   if (!cdm) {
-    DLOG(WARNING) << "No CDM found for: " << render_frame_id << ", " << cdm_id;
-    SendSessionError(render_frame_id, cdm_id, session_id);
+    promise->reject(MediaKeys::INVALID_STATE_ERROR, 0, "CDM not found.");
     return;
   }
 
-  // This could fail, in which case a SessionError will be fired.
-  cdm->CreateSession(session_id, content_type, &init_data[0], init_data.size());
+  // Only temporary session is supported in browser CDM path. Add SessionType

[ddorwin, 2015/01/14 23:09:20]

Then you won't need this comment. :)

[xhwang, 2015/01/15 08:13:13]

ditto

+  // support if needed.
+  cdm->CreateSessionAndGenerateRequest(media::MediaKeys::TEMPORARY_SESSION,
+                                       init_data_type, &init_data[0],
+                                       init_data.size(), promise.Pass());
 }
 
 }  // namespace content