| 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 "base/threading/thread_task_runner_handle.h" | 8 #include "base/threading/thread_task_runner_handle.h" |
| 9 #include "media/base/media_log.h" | 9 #include "media/base/media_log.h" |
| 10 #include "media/mojo/services/mojo_media_client.h" | 10 #include "media/mojo/services/mojo_media_client.h" |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 #include "media/base/cdm_factory.h" | 27 #include "media/base/cdm_factory.h" |
| 28 #include "media/mojo/services/mojo_cdm_service.h" | 28 #include "media/mojo/services/mojo_cdm_service.h" |
| 29 #endif // defined(ENABLE_MOJO_CDM) | 29 #endif // defined(ENABLE_MOJO_CDM) |
| 30 | 30 |
| 31 namespace media { | 31 namespace media { |
| 32 | 32 |
| 33 ServiceFactoryImpl::ServiceFactoryImpl( | 33 ServiceFactoryImpl::ServiceFactoryImpl( |
| 34 mojo::InterfaceRequest<mojom::ServiceFactory> request, | 34 mojo::InterfaceRequest<mojom::ServiceFactory> request, |
| 35 shell::mojom::InterfaceProvider* interfaces, | 35 shell::mojom::InterfaceProvider* interfaces, |
| 36 scoped_refptr<MediaLog> media_log, | 36 scoped_refptr<MediaLog> media_log, |
| 37 std::unique_ptr<shell::ShellConnectionRef> connection_ref, | 37 std::unique_ptr<shell::ServiceContextRef> connection_ref, |
| 38 MojoMediaClient* mojo_media_client) | 38 MojoMediaClient* mojo_media_client) |
| 39 : binding_(this, std::move(request)), | 39 : binding_(this, std::move(request)), |
| 40 #if defined(ENABLE_MOJO_CDM) | 40 #if defined(ENABLE_MOJO_CDM) |
| 41 interfaces_(interfaces), | 41 interfaces_(interfaces), |
| 42 #endif | 42 #endif |
| 43 media_log_(media_log), | 43 media_log_(media_log), |
| 44 connection_ref_(std::move(connection_ref)), | 44 connection_ref_(std::move(connection_ref)), |
| 45 mojo_media_client_(mojo_media_client) { | 45 mojo_media_client_(mojo_media_client) { |
| 46 DVLOG(1) << __FUNCTION__; | 46 DVLOG(1) << __FUNCTION__; |
| 47 DCHECK(mojo_media_client_); | 47 DCHECK(mojo_media_client_); |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 CdmFactory* ServiceFactoryImpl::GetCdmFactory() { | 134 CdmFactory* ServiceFactoryImpl::GetCdmFactory() { |
| 135 if (!cdm_factory_) { | 135 if (!cdm_factory_) { |
| 136 cdm_factory_ = mojo_media_client_->CreateCdmFactory(interfaces_); | 136 cdm_factory_ = mojo_media_client_->CreateCdmFactory(interfaces_); |
| 137 LOG_IF(ERROR, !cdm_factory_) << "CdmFactory not available."; | 137 LOG_IF(ERROR, !cdm_factory_) << "CdmFactory not available."; |
| 138 } | 138 } |
| 139 return cdm_factory_.get(); | 139 return cdm_factory_.get(); |
| 140 } | 140 } |
| 141 #endif // defined(ENABLE_MOJO_CDM) | 141 #endif // defined(ENABLE_MOJO_CDM) |
| 142 | 142 |
| 143 } // namespace media | 143 } // namespace media |
| OLD | NEW |