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..07b4ec0cae9225f2bafdc5571d6f04f907d1174b
--- /dev/null
+++ b/media/remoting/remoting_cdm_factory.cc
@@ -0,0 +1,88 @@
+// 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"
+
+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<RemotingCdmController> remoting_controller,
+               CdmFactory* const default_cdm_factory,
+               bool is_remoting) {
+  if (is_remoting) {
+    VLOG(1) << "Create remoting CDM.";
+    // TODO(xjz): Merge this with Eric's implementation to create remoting CDM.
+    new RemotingCdm(key_system, security_origin, cdm_config, session_message_cb,

[miu, 2016/10/25 04:21:25]

It's always a little strange to see a "new Foo()" by itself. Could you write a
comment explaining what takes ownership of RemotingCdm?

[xjz, 2016/10/26 22:00:25]

Oh, yes, this is wrong. I made this mistake while cleaning up some debugging
codes. Removed it.

+                    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) {}

[miu, 2016/10/25 04:21:25]

Please DCHECK that |default_cdm_factory_| and |remoter_factory_| are not null.

[xjz, 2016/10/26 22:00:25]

Done.

+
+RemotingCdmFactory::~RemotingCdmFactory() {}
+
+std::unique_ptr<RemotingCdmController>
+RemotingCdmFactory::CreateRemotingController() {
+  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));
+  scoped_refptr<RemotingSourceImpl> remoting_source_impl =
+      new RemotingSourceImpl(std::move(remoting_source_request),
+                             std::move(remoter));
+  return base::MakeUnique<RemotingCdmController>(
+      std::move(remoting_source_impl));

[miu, 2016/10/25 04:21:25]

ditto here: Consider using make_scoped_refptr() to simplify a little.

[xjz, 2016/10/26 22:00:25]

Done.

+}
+
+// TODO: Replace the callbacks with an interface. http://crbug.com/657940.
+void RemotingCdmFactory::Create(
+    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<RemotingCdmController> remoting_controller =
+      CreateRemotingController();
+  RemotingCdmController* remoting_controller_ptr = remoting_controller.get();
+  remoting_controller_ptr->ShouldCreateRemotingCdm(base::Bind(
+      &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