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

Unified Diff: mojo/services/html_viewer/webmediaplayer_factory.cc

Issue 815293002: Support unprefixed EME in HTMLViewer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 6 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
Index: mojo/services/html_viewer/webmediaplayer_factory.cc
diff --git a/mojo/services/html_viewer/webmediaplayer_factory.cc b/mojo/services/html_viewer/webmediaplayer_factory.cc
index 83ff6baa3c9584cd5f2038fad2c65dd50b9b7872..98b4dc06db6a2f8dd1a62c388a7056909be8b1f1 100644
--- a/mojo/services/html_viewer/webmediaplayer_factory.cc
+++ b/mojo/services/html_viewer/webmediaplayer_factory.cc
@@ -78,6 +78,7 @@ blink::WebMediaPlayer* WebMediaPlayerFactory::CreateMediaPlayer(
blink::WebLocalFrame* frame,
const blink::WebURL& url,
blink::WebMediaPlayerClient* client,
+ blink::WebContentDecryptionModule* initial_cdm,
mojo::Shell* shell) {
#if defined(OS_ANDROID)
return nullptr;
@@ -98,9 +99,10 @@ blink::WebMediaPlayer* WebMediaPlayerFactory::CreateMediaPlayer(
GetAudioHardwareConfig()));
}
- media::WebMediaPlayerParams params(
- media::WebMediaPlayerParams::DeferLoadCB(), CreateAudioRendererSink(),
- media_log, GetMediaThreadTaskRunner(), compositor_task_runner_, nullptr);
+ media::WebMediaPlayerParams params(media::WebMediaPlayerParams::DeferLoadCB(),
+ CreateAudioRendererSink(), media_log,
+ GetMediaThreadTaskRunner(),
+ compositor_task_runner_, initial_cdm);
base::WeakPtr<media::WebMediaPlayerDelegate> delegate;
scoped_ptr<media::CdmFactory> cdm_factory(new media::DefaultCdmFactory());
« no previous file with comments | « mojo/services/html_viewer/webmediaplayer_factory.h ('k') | mojo/services/html_viewer/webmimeregistry_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698