| 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/interface_factory_impl.h" | 5 #include "media/mojo/services/interface_factory_impl.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/memory/ptr_util.h" |
| 8 #include "base/threading/thread_task_runner_handle.h" | 9 #include "base/threading/thread_task_runner_handle.h" |
| 9 #include "media/base/media_log.h" | 10 #include "media/base/media_log.h" |
| 10 #include "media/mojo/services/mojo_media_client.h" | 11 #include "media/mojo/services/mojo_media_client.h" |
| 11 #include "mojo/public/cpp/bindings/strong_binding.h" | 12 #include "mojo/public/cpp/bindings/strong_binding.h" |
| 12 #include "services/service_manager/public/interfaces/interface_provider.mojom.h" | 13 #include "services/service_manager/public/interfaces/interface_provider.mojom.h" |
| 13 | 14 |
| 14 #if defined(ENABLE_MOJO_AUDIO_DECODER) | 15 #if defined(ENABLE_MOJO_AUDIO_DECODER) |
| 15 #include "media/mojo/services/mojo_audio_decoder_service.h" | 16 #include "media/mojo/services/mojo_audio_decoder_service.h" |
| 16 #endif // defined(ENABLE_MOJO_AUDIO_DECODER) | 17 #endif // defined(ENABLE_MOJO_AUDIO_DECODER) |
| 17 | 18 |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 CdmFactory* InterfaceFactoryImpl::GetCdmFactory() { | 154 CdmFactory* InterfaceFactoryImpl::GetCdmFactory() { |
| 154 if (!cdm_factory_) { | 155 if (!cdm_factory_) { |
| 155 cdm_factory_ = mojo_media_client_->CreateCdmFactory(interfaces_.get()); | 156 cdm_factory_ = mojo_media_client_->CreateCdmFactory(interfaces_.get()); |
| 156 LOG_IF(ERROR, !cdm_factory_) << "CdmFactory not available."; | 157 LOG_IF(ERROR, !cdm_factory_) << "CdmFactory not available."; |
| 157 } | 158 } |
| 158 return cdm_factory_.get(); | 159 return cdm_factory_.get(); |
| 159 } | 160 } |
| 160 #endif // defined(ENABLE_MOJO_CDM) | 161 #endif // defined(ENABLE_MOJO_CDM) |
| 161 | 162 |
| 162 } // namespace media | 163 } // namespace media |
| OLD | NEW |