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

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

Issue 2568463003: media: Rename MediaKeys to ContentDecryptionModule (Closed)
Patch Set: comments addressed Created 4 years 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_renderer_service.h ('k') | media/remoting/proto/remoting_rpc_message.proto » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_renderer_service.cc
diff --git a/media/mojo/services/mojo_renderer_service.cc b/media/mojo/services/mojo_renderer_service.cc
index ad0f91dcacbaa3f86df46502ab41c135396cd041..5023c4f571d5b9e2bce742834463b0f1fd9d380b 100644
--- a/media/mojo/services/mojo_renderer_service.cc
+++ b/media/mojo/services/mojo_renderer_service.cc
@@ -9,7 +9,7 @@
#include "base/bind.h"
#include "base/optional.h"
#include "media/base/audio_renderer_sink.h"
-#include "media/base/media_keys.h"
+#include "media/base/content_decryption_module.h"
#include "media/base/media_url_demuxer.h"
#include "media/base/renderer.h"
#include "media/base/video_renderer_sink.h"
@@ -141,7 +141,8 @@ void MojoRendererService::SetCdm(int32_t cdm_id,
return;
}
- scoped_refptr<MediaKeys> cdm = mojo_cdm_service_context_->GetCdm(cdm_id);
+ scoped_refptr<ContentDecryptionModule> cdm =
+ mojo_cdm_service_context_->GetCdm(cdm_id);
if (!cdm) {
DVLOG(1) << "CDM not found: " << cdm_id;
callback.Run(false);
@@ -264,7 +265,7 @@ void MojoRendererService::OnFlushCompleted(const FlushCallback& callback) {
}
void MojoRendererService::OnCdmAttached(
- scoped_refptr<MediaKeys> cdm,
+ scoped_refptr<ContentDecryptionModule> cdm,
const base::Callback<void(bool)>& callback,
bool success) {
DVLOG(1) << __func__ << "(" << success << ")";
« no previous file with comments | « media/mojo/services/mojo_renderer_service.h ('k') | media/remoting/proto/remoting_rpc_message.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698