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

Unified Diff: media/mojo/services/mojo_media_client.h

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 | « media/mojo/services/mojo_media_application.cc ('k') | media/mojo/services/mojo_media_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_media_client.h
diff --git a/media/mojo/services/mojo_media_client.h b/media/mojo/services/mojo_media_client.h
index 7e6d07eab141c073fffc0eef4f7df7c08198646f..b2068f4ff95dad113a18b6f6e7c8d8389d0ffd1c 100644
--- a/media/mojo/services/mojo_media_client.h
+++ b/media/mojo/services/mojo_media_client.h
@@ -11,6 +11,7 @@
#include "media/base/audio_decoder.h"
#include "media/base/audio_hardware_config.h"
#include "media/base/audio_renderer_sink.h"
+#include "media/base/cdm_factory.h"
#include "media/base/media_log.h"
#include "media/base/renderer_factory.h"
#include "media/base/video_decoder.h"
@@ -50,6 +51,9 @@ class PlatformMojoMediaClient {
// The platform's audio hardware configuration. Note, this must remain
// constant for the lifetime of the PlatformMojoMediaClient.
virtual const AudioHardwareConfig& GetAudioHardwareConfig() = 0;
+
+ // Returns the CdmFactory to be used by MojoCdmService.
+ virtual scoped_ptr<CdmFactory> GetCdmFactory() = 0;
};
class MojoMediaClient {
@@ -71,6 +75,7 @@ class MojoMediaClient {
scoped_ptr<VideoRendererSink> GetVideoRendererSink(
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
const AudioHardwareConfig& GetAudioHardwareConfig();
+ scoped_ptr<CdmFactory> GetCdmFactory();
private:
friend struct base::DefaultLazyInstanceTraits<MojoMediaClient>;
« no previous file with comments | « media/mojo/services/mojo_media_application.cc ('k') | media/mojo/services/mojo_media_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698