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

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

Issue 1231623003: media: Support CdmFactory in MojoMediaClient. (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 | « no previous file | media/mojo/services/mojo_cdm_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/default_mojo_media_client.cc
diff --git a/media/mojo/services/default_mojo_media_client.cc b/media/mojo/services/default_mojo_media_client.cc
index 37448ba6c1dc5a9ed66d91499b70b9d8b9cbff97..5d19401bd62f90dbc954f664e59419b1708db719 100644
--- a/media/mojo/services/default_mojo_media_client.cc
+++ b/media/mojo/services/default_mojo_media_client.cc
@@ -10,6 +10,7 @@
#include "media/audio/fake_audio_log_factory.h"
#include "media/base/media.h"
#include "media/base/null_video_sink.h"
+#include "media/cdm/default_cdm_factory.h"
#include "media/renderers/default_renderer_factory.h"
#include "media/renderers/gpu_video_accelerator_factories.h"
@@ -72,6 +73,10 @@ class DefaultMojoMediaClient : public PlatformMojoMediaClient {
return *audio_hardware_config_;
}
+ scoped_ptr<CdmFactory> GetCdmFactory() override {
+ return make_scoped_ptr(new DefaultCdmFactory());
+ }
+
private:
FakeAudioLogFactory fake_audio_log_factory_;
scoped_ptr<AudioHardwareConfig> audio_hardware_config_;
« no previous file with comments | « no previous file | media/mojo/services/mojo_cdm_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698