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

Unified Diff: media/mojo/services/mojo_cdm_service.cc

Issue 1227883002: media: Pass CdmConfig in mojo CDM interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase-only Created 5 years, 5 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_service.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_cdm_service.cc
diff --git a/media/mojo/services/mojo_cdm_service.cc b/media/mojo/services/mojo_cdm_service.cc
index 825d2fafecc6e93152c9ebd71af3f9596b6aa419..5199d8aa1d8104f93ee749ad0f7c1255343e4d92 100644
--- a/media/mojo/services/mojo_cdm_service.cc
+++ b/media/mojo/services/mojo_cdm_service.cc
@@ -47,6 +47,7 @@ void MojoCdmService::SetClient(mojo::ContentDecryptionModuleClientPtr client) {
void MojoCdmService::Initialize(
const mojo::String& key_system,
const mojo::String& security_origin,
+ mojo::CdmConfigPtr cdm_config,
int32_t cdm_id,
const mojo::Callback<void(mojo::CdmPromiseResultPtr)>& callback) {
DVLOG(1) << __FUNCTION__ << ": " << key_system;
@@ -55,7 +56,7 @@ void MojoCdmService::Initialize(
auto weak_this = weak_factory_.GetWeakPtr();
cdm_factory_->Create(
- key_system, GURL(security_origin), CdmConfig(),
+ key_system, GURL(security_origin), cdm_config.To<CdmConfig>(),
base::Bind(&MojoCdmService::OnSessionMessage, weak_this),
base::Bind(&MojoCdmService::OnSessionClosed, weak_this),
base::Bind(&MojoCdmService::OnLegacySessionError, weak_this),
@@ -66,7 +67,6 @@ void MojoCdmService::Initialize(
base::Passed(make_scoped_ptr(new SimpleMojoCdmPromise(callback)))));
}
-// mojo::MediaRenderer implementation.
void MojoCdmService::SetServerCertificate(
mojo::Array<uint8_t> certificate_data,
const mojo::Callback<void(mojo::CdmPromiseResultPtr)>& callback) {
« no previous file with comments | « media/mojo/services/mojo_cdm_service.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698