Encrypted Media: Implement IPC based SetCdm().

content/renderer/media/cdm_session_adapter.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/cdm_session_adapter.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "content/renderer/media/crypto/content_decryption_module_factory.h"
 #include "content/renderer/media/webcontentdecryptionmodulesession_impl.h"
 #include "media/base/media_keys.h"
 #include "url/gurl.h"
 
+#if defined(OS_ANDROID)
+#include "content/renderer/media/android/renderer_media_player_manager.h"

[ddorwin, 2014/03/25 23:04:00]

This is a very odd include in this file. Would it be bad to just initialize to
0?

[xhwang, 2014/03/26 06:02:04]

GetCdmId() should only be called after Initialize() so initializing to 0 sgtm.
But since we are doing so, I deleted the DCHECK in
ContentDecryptionModuleFactory because we can't just assume kInvalidCmdId is
zero. ContentDecryptionModuleFactory::Create() will always set |cdm_id| so we
are safe.

+#endif
+
 namespace content {
 
 const uint32 kStartingSessionId = 1;
 uint32 CdmSessionAdapter::next_session_id_ = kStartingSessionId;
 COMPILE_ASSERT(kStartingSessionId > media::MediaKeys::kInvalidSessionId,
                invalid_starting_value);
 
-CdmSessionAdapter::CdmSessionAdapter() : weak_ptr_factory_(this) {}
+CdmSessionAdapter::CdmSessionAdapter() :
+#if defined(OS_ANDROID)
+    cdm_id_(RendererMediaPlayerManager::kInvalidCdmId),
+#endif
+    weak_ptr_factory_(this) {}
 
 CdmSessionAdapter::~CdmSessionAdapter() {}
 
 bool CdmSessionAdapter::Initialize(
 #if defined(ENABLE_PEPPER_CDMS)
     const CreatePepperCdmCB& create_pepper_cdm_cb,
-#endif
+#endif  // defined(ENABLE_PEPPER_CDMS)
     const std::string& key_system) {
+

[ddorwin, 2014/03/25 23:04:00]

remove

[xhwang, 2014/03/26 06:02:04]

Done.

   base::WeakPtr<CdmSessionAdapter> weak_this = weak_ptr_factory_.GetWeakPtr();
   media_keys_ =
       ContentDecryptionModuleFactory::Create(
           key_system,
 #if defined(ENABLE_PEPPER_CDMS)
           create_pepper_cdm_cb,
 #elif defined(OS_ANDROID)
           // TODO(xhwang): Support Android.
           NULL,
-          0,
           // TODO(ddorwin): Get the URL for the frame containing the MediaKeys.
           GURL(),
+          &cdm_id_,
 #endif  // defined(ENABLE_PEPPER_CDMS)
           base::Bind(&CdmSessionAdapter::OnSessionCreated, weak_this),
           base::Bind(&CdmSessionAdapter::OnSessionMessage, weak_this),
           base::Bind(&CdmSessionAdapter::OnSessionReady, weak_this),
           base::Bind(&CdmSessionAdapter::OnSessionClosed, weak_this),
           base::Bind(&CdmSessionAdapter::OnSessionError, weak_this));
 
   // Success if |media_keys_| created.
   return media_keys_;
 }
@@ skipping 32 matching lines @@
 
 void CdmSessionAdapter::ReleaseSession(uint32 session_id) {
   DCHECK(sessions_.find(session_id) != sessions_.end());
   media_keys_->ReleaseSession(session_id);
 }
 
 media::Decryptor* CdmSessionAdapter::GetDecryptor() {
   return media_keys_->GetDecryptor();
 }
 
+#if defined(OS_ANDROID)
+int CdmSessionAdapter::GetCdmId() const {
+  return cdm_id_;
+}
+#endif  // defined(OS_ANDROID)
+
 void CdmSessionAdapter::OnSessionCreated(uint32 session_id,
                                          const std::string& web_session_id) {
   WebContentDecryptionModuleSessionImpl* session = GetSession(session_id);
   DLOG_IF(WARNING, !session) << __FUNCTION__ << " for unknown session "
                              << session_id;
   if (session)
     session->OnSessionCreated(web_session_id);
 }
 
 void CdmSessionAdapter::OnSessionMessage(uint32 session_id,
@@ skipping 35 matching lines @@
 WebContentDecryptionModuleSessionImpl* CdmSessionAdapter::GetSession(
     uint32 session_id) {
   // Since session objects may get garbage collected, it is possible that there
   // are events coming back from the CDM and the session has been unregistered.
   // We can not tell if the CDM is firing events at sessions that never existed.
   SessionMap::iterator session = sessions_.find(session_id);
   return (session != sessions_.end()) ? session->second : NULL;
 }
 
 }  // namespace content