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