WIP - Add EME

media/remoting/remoting_cdm_factory.cc

Index: media/remoting/remoting_cdm_factory.cc
diff --git a/media/remoting/remoting_cdm_factory.cc b/media/remoting/remoting_cdm_factory.cc
new file mode 100644
index 0000000000000000000000000000000000000000..de9ec160a2cd04fc1fddce9a0e7fb1c9f275d123
--- /dev/null
+++ b/media/remoting/remoting_cdm_factory.cc
@@ -0,0 +1,84 @@
+// Copyright 2016 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 "media/remoting/remoting_cdm_factory.h"
+
+#include "base/bind.h"
+#include "base/single_thread_task_runner.h"
+#include "media/base/cdm_config.h"
+#include "media/remoting/remoting_cdm.h"
+#include "media/remoting/remoting_controller.h"
+
+namespace media {
+
+namespace {
+
+void CreateCdm(const std::string& key_system,
+               const GURL& security_origin,
+               const CdmConfig& cdm_config,
+               const SessionMessageCB& session_message_cb,
+               const SessionClosedCB& session_closed_cb,
+               const SessionKeysChangeCB& session_keys_change_cb,
+               const SessionExpirationUpdateCB& session_expiration_update_cb,
+               const CdmCreatedCB& cdm_created_cb,
+               std::unique_ptr<RemotingController> remoting_controller,
+               CdmFactory* const default_cdm_factory,
+               bool is_remoting) {
+  if (is_remoting) {
+    VLOG(1) << "Create remoting CDM.";
+    // TODO(xjz): Merge with Eric's implementation to create remoting CDM.
+    RemotingCdm::Create(key_system, security_origin, cdm_config,
+                        session_message_cb, session_closed_cb,
+                        session_keys_change_cb, session_expiration_update_cb,
+                        cdm_created_cb, std::move(remoting_controller));
+  } else {
+    VLOG(1) << "Create local CDM.";
+    default_cdm_factory->Create(key_system, security_origin, cdm_config,
+                                session_message_cb, session_closed_cb,
+                                session_keys_change_cb,
+                                session_expiration_update_cb, cdm_created_cb);
+  }
+}
+
+}  // namespace
+
+RemotingCdmFactory::RemotingCdmFactory(
+    std::unique_ptr<CdmFactory> default_cdm_factory,
+    mojom::RemoterFactory* remoter_factory)
+    : default_cdm_factory_(std::move(default_cdm_factory)),
+      remoter_factory_(remoter_factory) {}
+
+RemotingCdmFactory::~RemotingCdmFactory() {}
+
+std::unique_ptr<RemotingController>
+RemotingCdmFactory::CreateRemotingController() {

[miu, 2016/10/08 01:06:16]

Folks are probably going to suggest this code go into RenderFrameImpl, just like
in the last CL.

[xjz, 2016/10/20 21:25:27]

This is a different case. The RendererFactory is created one for each media
element. But the CdmFactory is one for each render frame. So we need to create
one remoting session for each CDM. 

+  mojom::RemotingSourcePtr remoting_source;
+  mojom::RemotingSourceRequest remoting_source_request =
+      mojo::GetProxy(&remoting_source);
+  mojom::RemoterPtr remoter;
+  remoter_factory_->Create(std::move(remoting_source),
+                           mojo::GetProxy(&remoter));
+  return base::MakeUnique<RemotingController>(
+      std::move(remoting_source_request), std::move(remoter));
+}
+
+void RemotingCdmFactory::Create(
+    const std::string& key_system,
+    const GURL& security_origin,
+    const CdmConfig& cdm_config,
+    const SessionMessageCB& session_message_cb,

[miu, 2016/10/08 01:06:16]

Not your problem, but this spaghetti mess of callbacks should be cleaned-up at
some point (i.e., replaced with an interface). Maybe file a TODO bug and assign
it to xwhang@ or sandersd@?

[xjz, 2016/10/20 21:25:27]

Done.

+    const SessionClosedCB& session_closed_cb,
+    const SessionKeysChangeCB& session_keys_change_cb,
+    const SessionExpirationUpdateCB& session_expiration_update_cb,
+    const CdmCreatedCB& cdm_created_cb) {
+  std::unique_ptr<RemotingController> remoting_controller =

[miu, 2016/10/08 01:06:16]

It's okay (and probably better) to create the RemotingController in the ctor. By
creating it earlier, it has a chance to receive the OnSinkAvailable()/Gone()
call earlier, and that means we'll know sooner whether to create a remoting CDM
or a local one.

[xjz, 2016/10/20 21:25:27]

Please see my reply above. This is created one for each CDM.

+      CreateRemotingController();
+  remoting_controller->ShouldCreateRemotingCdm(base::Bind(

[miu, 2016/10/08 01:06:16]

This will crash: base::Passed(&remoting_controller) will execute and invalidate
the std::unique_ptr before it is used as the "this" pointer to the
ShouldCreateRemotingCdm() method call.

[xjz, 2016/10/20 21:25:27]

Done.

+      &CreateCdm, key_system, security_origin, cdm_config, session_message_cb,
+      session_closed_cb, session_keys_change_cb, session_expiration_update_cb,
+      cdm_created_cb, base::Passed(&remoting_controller),
+      default_cdm_factory_.get()));
+}
+
+}  // namespace media