Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1137)

Unified Diff: media/remoting/remoting_cdm_factory.cc

Issue 2457563002: Media Remoting: Add remoting control logic for encrypted contents. (Closed)
Patch Set: Addressed xhwang's comments. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..434d50df4f80b02297b61411ad448968cf372499
--- /dev/null
+++ b/media/remoting/remoting_cdm_factory.cc
@@ -0,0 +1,87 @@
+// 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 {
+
+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),
+ weak_factory_(this) {
+ DCHECK(default_cdm_factory_);
+ DCHECK(remoter_factory_);
+}
+
+RemotingCdmFactory::~RemotingCdmFactory() {}
+
+std::unique_ptr<RemotingCdmController>
+RemotingCdmFactory::CreateRemotingCdmController() {
+ 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<RemotingCdmController>(
+ make_scoped_refptr(new RemotingSourceImpl(
+ std::move(remoting_source_request), std::move(remoter))));
+}
+
+// TODO(xjz): 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_cdm_controller =
+ CreateRemotingCdmController();
+ // Get the raw pointer of |remoting_cdm_controller| as it will be invalidated
+ // before calling |ShouldCreateRemotingCdm()| by base::Passed().
+ RemotingCdmController* remoting_cdm_controller_ptr =
+ remoting_cdm_controller.get();
+ remoting_cdm_controller_ptr->ShouldCreateRemotingCdm(base::Bind(
+ &RemotingCdmFactory::CreateCdm, weak_factory_.GetWeakPtr(), 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_cdm_controller)));
+}
+
+void RemotingCdmFactory::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_cdm_controller,
+ bool is_remoting) {
+ if (is_remoting) {
+ VLOG(1) << "Create remoting CDM.";
+ // TODO(xjz): Merge this with erickung's implementation to create remoting
+ // CDM.
+ NOTIMPLEMENTED();
+ } else {
+ VLOG(1) << "Create local CDM.";
xhwang 2016/11/02 06:47:05 The CDM could run in ppapi or other process so it'
xjz 2016/11/02 17:38:11 Done.
+ 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 media

Powered by Google App Engine
This is Rietveld 408576698