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

Unified Diff: media/mojo/services/mojo_cdm_factory.h

Issue 840473002: media: Support creation and SetCdm() for mojo based CDM. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only; compiles but needs more polish... Created 5 years, 7 months 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
« no previous file with comments | « media/mojo/services/mojo_cdm.cc ('k') | media/mojo/services/mojo_cdm_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_cdm_factory.h
diff --git a/media/cdm/default_cdm_factory.h b/media/mojo/services/mojo_cdm_factory.h
similarity index 60%
copy from media/cdm/default_cdm_factory.h
copy to media/mojo/services/mojo_cdm_factory.h
index 78d4f2f50b0e970e82df694b4da350d173c64fe5..f241e9b40fd864c6606257f3679b92af038015f4 100644
--- a/media/cdm/default_cdm_factory.h
+++ b/media/mojo/services/mojo_cdm_factory.h
@@ -2,20 +2,20 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MEDIA_CDM_DEFAULT_CDM_FACTORY_H_
-#define MEDIA_CDM_DEFAULT_CDM_FACTORY_H_
+#ifndef MEDIA_MOJO_SERVICES_MOJO_CDM_FACTORY_H_
+#define MEDIA_MOJO_SERVICES_MOJO_CDM_FACTORY_H_
#include "base/macros.h"
#include "media/base/cdm_factory.h"
+#include "media/mojo/interfaces/content_decryption_module_factory.mojom.h"
namespace media {
-struct CdmConfig;
-
-class DefaultCdmFactory : public CdmFactory {
+class MojoCdmFactory : public CdmFactory {
public:
- DefaultCdmFactory();
- ~DefaultCdmFactory() final;
+ explicit MojoCdmFactory(
+ mojo::ContentDecryptionModuleFactoryPtr remote_factory);
+ ~MojoCdmFactory() final;
// CdmFactory implementation.
void Create(const std::string& key_system,
@@ -29,9 +29,14 @@ class DefaultCdmFactory : public CdmFactory {
const CdmCreatedCB& cdm_created_cb) final;
private:
- DISALLOW_COPY_AND_ASSIGN(DefaultCdmFactory);
+ // The next CDM ID for the current process.
+ static int next_cdm_id_;
+
+ mojo::ContentDecryptionModuleFactoryPtr remote_factory_;
+
+ DISALLOW_COPY_AND_ASSIGN(MojoCdmFactory);
};
} // namespace media
-#endif // MEDIA_CDM_DEFAULT_CDM_FACTORY_H_
+#endif // MEDIA_MOJO_SERVICES_MOJO_CDM_FACTORY_H_
« no previous file with comments | « media/mojo/services/mojo_cdm.cc ('k') | media/mojo/services/mojo_cdm_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698