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

Unified Diff: chromecast/browser/media/media_pipeline_host.cc

Issue 894173002: Adds hook for content embedders to get media::BrowserCdm*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes CmaMessageFilterHost callback reference, rebase Created 5 years, 10 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 | « chromecast/browser/media/media_pipeline_host.h ('k') | content/browser/media/cdm/browser_cdm_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromecast/browser/media/media_pipeline_host.cc
diff --git a/chromecast/browser/media/media_pipeline_host.cc b/chromecast/browser/media/media_pipeline_host.cc
index 2120e5211c04accc7d9da62c0dbb4eaf2f91f2aa..df28699db25954119dd6fa42b2d643e129f8a01d 100644
--- a/chromecast/browser/media/media_pipeline_host.cc
+++ b/chromecast/browser/media/media_pipeline_host.cc
@@ -153,13 +153,9 @@ void MediaPipelineHost::SetVolume(TrackId track_id, float volume) {
media_pipeline_->GetAudioPipeline()->SetVolume(volume);
}
-void MediaPipelineHost::SetCdm(
- int render_process_id, int render_frame_id, int cdm_id) {
+void MediaPipelineHost::SetCdm(::media::BrowserCdm* cdm) {
DCHECK(thread_checker_.CalledOnValidThread());
-
- // TODO(gunsch): crbug.com/444930. Find a way to get
- // content::BrowserCdmManager since it is not under content/public/.
- NOTIMPLEMENTED();
+ media_pipeline_->SetCdm(cdm);
}
void MediaPipelineHost::NotifyPipeWrite(TrackId track_id) {
« no previous file with comments | « chromecast/browser/media/media_pipeline_host.h ('k') | content/browser/media/cdm/browser_cdm_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698