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

Side by Side Diff: media/mojo/services/mojo_media_application.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 unified diff | Download patch
« no previous file with comments | « media/mojo/services/mojo_media_application.h ('k') | media/mojo/services/mojo_media_client.h » ('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 "media/mojo/services/mojo_media_application.h" 5 #include "media/mojo/services/mojo_media_application.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "media/base/cdm_factory.h"
8 #include "media/base/media_log.h" 9 #include "media/base/media_log.h"
9 #include "media/base/renderer_factory.h" 10 #include "media/base/renderer_factory.h"
10 #include "media/mojo/services/mojo_cdm_service.h" 11 #include "media/mojo/services/mojo_cdm_service.h"
11 #include "media/mojo/services/mojo_media_client.h" 12 #include "media/mojo/services/mojo_media_client.h"
12 #include "media/mojo/services/mojo_renderer_service.h" 13 #include "media/mojo/services/mojo_renderer_service.h"
13 #include "mojo/application/public/cpp/application_connection.h" 14 #include "mojo/application/public/cpp/application_connection.h"
14 #include "mojo/application/public/cpp/application_impl.h" 15 #include "mojo/application/public/cpp/application_impl.h"
15 16
16 namespace media { 17 namespace media {
17 18
(...skipping 29 matching lines...) Expand all
47 connection->AddService<mojo::ContentDecryptionModule>(this); 48 connection->AddService<mojo::ContentDecryptionModule>(this);
48 connection->AddService<mojo::MediaRenderer>(this); 49 connection->AddService<mojo::MediaRenderer>(this);
49 return true; 50 return true;
50 } 51 }
51 52
52 void MojoMediaApplication::Create( 53 void MojoMediaApplication::Create(
53 mojo::ApplicationConnection* connection, 54 mojo::ApplicationConnection* connection,
54 mojo::InterfaceRequest<mojo::ContentDecryptionModule> request) { 55 mojo::InterfaceRequest<mojo::ContentDecryptionModule> request) {
55 // The created object is owned by the pipe. 56 // The created object is owned by the pipe.
56 new MojoCdmService(&cdm_service_context_, connection->GetServiceProvider(), 57 new MojoCdmService(&cdm_service_context_, connection->GetServiceProvider(),
57 request.Pass()); 58 GetCdmFactory(), request.Pass());
58 } 59 }
59 60
60 void MojoMediaApplication::Create( 61 void MojoMediaApplication::Create(
61 mojo::ApplicationConnection* connection, 62 mojo::ApplicationConnection* connection,
62 mojo::InterfaceRequest<mojo::MediaRenderer> request) { 63 mojo::InterfaceRequest<mojo::MediaRenderer> request) {
63 // The created object is owned by the pipe. 64 // The created object is owned by the pipe.
64 new MojoRendererService(&cdm_service_context_, GetRendererFactory(), 65 new MojoRendererService(&cdm_service_context_, GetRendererFactory(),
65 media_log_, request.Pass()); 66 media_log_, request.Pass());
66 } 67 }
67 68
68 RendererFactory* MojoMediaApplication::GetRendererFactory() { 69 RendererFactory* MojoMediaApplication::GetRendererFactory() {
69 if (!renderer_factory_) 70 if (!renderer_factory_)
70 renderer_factory_ = MojoMediaClient::Get()->GetRendererFactory(media_log_); 71 renderer_factory_ = MojoMediaClient::Get()->GetRendererFactory(media_log_);
71 return renderer_factory_.get(); 72 return renderer_factory_.get();
72 } 73 }
73 74
75 CdmFactory* MojoMediaApplication::GetCdmFactory() {
76 if (!cdm_factory_)
77 cdm_factory_ = MojoMediaClient::Get()->GetCdmFactory();
78 return cdm_factory_.get();
79 }
80
74 } // namespace media 81 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_media_application.h ('k') | media/mojo/services/mojo_media_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698