| 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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 task_runner, task_runner, audio_sink.get(), video_sink.get(), | 97 task_runner, task_runner, audio_sink.get(), video_sink.get(), |
| 98 RequestSurfaceCB()); | 98 RequestSurfaceCB()); |
| 99 if (!renderer) { | 99 if (!renderer) { |
| 100 LOG(ERROR) << "Renderer creation failed."; | 100 LOG(ERROR) << "Renderer creation failed."; |
| 101 return; | 101 return; |
| 102 } | 102 } |
| 103 | 103 |
| 104 // The created object is owned by the pipe. | 104 // The created object is owned by the pipe. |
| 105 new MojoRendererService(cdm_service_context_.GetWeakPtr(), | 105 new MojoRendererService(cdm_service_context_.GetWeakPtr(), |
| 106 std::move(audio_sink), std::move(video_sink), | 106 std::move(audio_sink), std::move(video_sink), |
| 107 std::move(renderer), std::move(request)); | 107 std::move(renderer), std::move(request), |
| 108 MojoRendererService::InitiateSurfaceRequestCB()); |
| 108 #endif // defined(ENABLE_MOJO_RENDERER) | 109 #endif // defined(ENABLE_MOJO_RENDERER) |
| 109 } | 110 } |
| 110 | 111 |
| 111 void ServiceFactoryImpl::CreateCdm( | 112 void ServiceFactoryImpl::CreateCdm( |
| 112 mojo::InterfaceRequest<mojom::ContentDecryptionModule> request) { | 113 mojo::InterfaceRequest<mojom::ContentDecryptionModule> request) { |
| 113 #if defined(ENABLE_MOJO_CDM) | 114 #if defined(ENABLE_MOJO_CDM) |
| 114 CdmFactory* cdm_factory = GetCdmFactory(); | 115 CdmFactory* cdm_factory = GetCdmFactory(); |
| 115 if (!cdm_factory) | 116 if (!cdm_factory) |
| 116 return; | 117 return; |
| 117 | 118 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 135 CdmFactory* ServiceFactoryImpl::GetCdmFactory() { | 136 CdmFactory* ServiceFactoryImpl::GetCdmFactory() { |
| 136 if (!cdm_factory_) { | 137 if (!cdm_factory_) { |
| 137 cdm_factory_ = mojo_media_client_->CreateCdmFactory(interfaces_.get()); | 138 cdm_factory_ = mojo_media_client_->CreateCdmFactory(interfaces_.get()); |
| 138 LOG_IF(ERROR, !cdm_factory_) << "CdmFactory not available."; | 139 LOG_IF(ERROR, !cdm_factory_) << "CdmFactory not available."; |
| 139 } | 140 } |
| 140 return cdm_factory_.get(); | 141 return cdm_factory_.get(); |
| 141 } | 142 } |
| 142 #endif // defined(ENABLE_MOJO_CDM) | 143 #endif // defined(ENABLE_MOJO_CDM) |
| 143 | 144 |
| 144 } // namespace media | 145 } // namespace media |
| OLD | NEW |