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

Side by Side Diff: media/mojo/services/mojo_media_application.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 unified diff | Download patch
« no previous file with comments | « media/mojo/services/mojo_cdm_service.cc ('k') | media/mojo/services/mojo_media_application.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/memory/scoped_ptr.h" 5 #include "base/memory/scoped_ptr.h"
6 #include "media/mojo/interfaces/content_decryption_module.mojom.h" 6 #include "media/mojo/interfaces/content_decryption_module.mojom.h"
7 #include "media/mojo/interfaces/media_renderer.mojom.h" 7 #include "media/mojo/interfaces/media_renderer.mojom.h"
8 #include "media/mojo/services/mojo_cdm_service_context.h" 8 #include "media/mojo/services/mojo_cdm_service_context.h"
9 #include "mojo/application/public/cpp/application_delegate.h" 9 #include "mojo/application/public/cpp/application_delegate.h"
10 #include "mojo/application/public/cpp/interface_factory_impl.h" 10 #include "mojo/application/public/cpp/interface_factory_impl.h"
11 #include "url/gurl.h" 11 #include "url/gurl.h"
12 12
13 namespace media { 13 namespace media {
14 14
15 class CdmFactory;
15 class MediaLog; 16 class MediaLog;
16 class RendererFactory; 17 class RendererFactory;
17 18
18 class MojoMediaApplication 19 class MojoMediaApplication
19 : public mojo::ApplicationDelegate, 20 : public mojo::ApplicationDelegate,
20 public mojo::InterfaceFactory<mojo::ContentDecryptionModule>, 21 public mojo::InterfaceFactory<mojo::ContentDecryptionModule>,
21 public mojo::InterfaceFactory<mojo::MediaRenderer> { 22 public mojo::InterfaceFactory<mojo::MediaRenderer> {
22 public: 23 public:
23 static GURL AppUrl(); 24 static GURL AppUrl();
24 static scoped_ptr<mojo::ApplicationDelegate> CreateApp(); 25 static scoped_ptr<mojo::ApplicationDelegate> CreateApp();
(...skipping 10 matching lines...) Expand all
35 // mojo::InterfaceFactory<mojo::ContentDecryptionModule> implementation. 36 // mojo::InterfaceFactory<mojo::ContentDecryptionModule> implementation.
36 void Create( 37 void Create(
37 mojo::ApplicationConnection* connection, 38 mojo::ApplicationConnection* connection,
38 mojo::InterfaceRequest<mojo::ContentDecryptionModule> request) final; 39 mojo::InterfaceRequest<mojo::ContentDecryptionModule> request) final;
39 40
40 // mojo::InterfaceFactory<mojo::MediaRenderer> implementation. 41 // mojo::InterfaceFactory<mojo::MediaRenderer> implementation.
41 void Create(mojo::ApplicationConnection* connection, 42 void Create(mojo::ApplicationConnection* connection,
42 mojo::InterfaceRequest<mojo::MediaRenderer> request) final; 43 mojo::InterfaceRequest<mojo::MediaRenderer> request) final;
43 44
44 RendererFactory* GetRendererFactory(); 45 RendererFactory* GetRendererFactory();
46 CdmFactory* GetCdmFactory();
45 47
46 MojoCdmServiceContext cdm_service_context_; 48 MojoCdmServiceContext cdm_service_context_;
47 scoped_ptr<RendererFactory> renderer_factory_; 49 scoped_ptr<RendererFactory> renderer_factory_;
50 scoped_ptr<CdmFactory> cdm_factory_;
48 scoped_refptr<MediaLog> media_log_; 51 scoped_refptr<MediaLog> media_log_;
49 }; 52 };
50 53
51 } // namespace media 54 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_cdm_service.cc ('k') | media/mojo/services/mojo_media_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698