| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/service_factory_impl.h" | 5 #include "media/mojo/services/service_factory_impl.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "media/base/cdm_factory.h" | 8 #include "media/base/cdm_factory.h" |
| 9 #include "media/base/media_log.h" | 9 #include "media/base/media_log.h" |
| 10 #include "media/base/renderer_factory.h" | 10 #include "media/base/renderer_factory.h" |
| 11 #include "media/mojo/services/mojo_cdm_service.h" | 11 #include "media/mojo/services/mojo_cdm_service.h" |
| 12 #include "media/mojo/services/mojo_media_client.h" | 12 #include "media/mojo/services/mojo_media_client.h" |
| 13 #include "media/mojo/services/mojo_renderer_service.h" | 13 #include "media/mojo/services/mojo_renderer_service.h" |
| 14 #include "mojo/application/public/cpp/app_lifetime_helper.h" | 14 #include "mojo/application/public/cpp/app_lifetime_helper.h" |
| 15 #include "mojo/application/public/interfaces/service_provider.mojom.h" |
| 15 | 16 |
| 16 namespace media { | 17 namespace media { |
| 17 | 18 |
| 18 ServiceFactoryImpl::ServiceFactoryImpl( | 19 ServiceFactoryImpl::ServiceFactoryImpl( |
| 19 mojo::InterfaceRequest<interfaces::ServiceFactory> request, | 20 mojo::InterfaceRequest<interfaces::ServiceFactory> request, |
| 20 mojo::ServiceProvider* service_provider, | 21 mojo::ServiceProvider* service_provider, |
| 21 scoped_refptr<MediaLog> media_log, | 22 scoped_refptr<MediaLog> media_log, |
| 22 scoped_ptr<mojo::AppRefCount> parent_app_refcount) | 23 scoped_ptr<mojo::AppRefCount> parent_app_refcount) |
| 23 : binding_(this, request.Pass()), | 24 : binding_(this, request.Pass()), |
| 24 service_provider_(service_provider), | 25 service_provider_(service_provider), |
| (...skipping 23 matching lines...) Expand all Loading... |
| 48 | 49 |
| 49 RendererFactory* ServiceFactoryImpl::GetRendererFactory() { | 50 RendererFactory* ServiceFactoryImpl::GetRendererFactory() { |
| 50 if (!renderer_factory_) | 51 if (!renderer_factory_) |
| 51 renderer_factory_ = | 52 renderer_factory_ = |
| 52 MojoMediaClient::Get()->CreateRendererFactory(media_log_); | 53 MojoMediaClient::Get()->CreateRendererFactory(media_log_); |
| 53 return renderer_factory_.get(); | 54 return renderer_factory_.get(); |
| 54 } | 55 } |
| 55 | 56 |
| 56 CdmFactory* ServiceFactoryImpl::GetCdmFactory() { | 57 CdmFactory* ServiceFactoryImpl::GetCdmFactory() { |
| 57 if (!cdm_factory_) | 58 if (!cdm_factory_) |
| 58 cdm_factory_ = MojoMediaClient::Get()->CreateCdmFactory(); | 59 cdm_factory_ = MojoMediaClient::Get()->CreateCdmFactory(service_provider_); |
| 59 return cdm_factory_.get(); | 60 return cdm_factory_.get(); |
| 60 } | 61 } |
| 61 | 62 |
| 62 } // namespace media | 63 } // namespace media |
| OLD | NEW |