| 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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 mojo_media_client_->CreateAudioRendererSink(audio_device_id); | 98 mojo_media_client_->CreateAudioRendererSink(audio_device_id); |
| 99 auto video_sink = mojo_media_client_->CreateVideoRendererSink(task_runner); | 99 auto video_sink = mojo_media_client_->CreateVideoRendererSink(task_runner); |
| 100 auto renderer = renderer_factory->CreateRenderer( | 100 auto renderer = renderer_factory->CreateRenderer( |
| 101 task_runner, task_runner, audio_sink.get(), video_sink.get(), | 101 task_runner, task_runner, audio_sink.get(), video_sink.get(), |
| 102 RequestSurfaceCB()); | 102 RequestSurfaceCB()); |
| 103 if (!renderer) { | 103 if (!renderer) { |
| 104 LOG(ERROR) << "Renderer creation failed."; | 104 LOG(ERROR) << "Renderer creation failed."; |
| 105 return; | 105 return; |
| 106 } | 106 } |
| 107 | 107 |
| 108 mojo::MakeStrongBinding( | 108 MojoRendererService::Create( |
| 109 base::MakeUnique<MojoRendererService>( | 109 cdm_service_context_.GetWeakPtr(), std::move(audio_sink), |
| 110 cdm_service_context_.GetWeakPtr(), std::move(audio_sink), | 110 std::move(video_sink), std::move(renderer), |
| 111 std::move(video_sink), std::move(renderer)), | 111 MojoRendererService::InitiateSurfaceRequestCB(), std::move(request)); |
| 112 std::move(request)); | |
| 113 #endif // defined(ENABLE_MOJO_RENDERER) | 112 #endif // defined(ENABLE_MOJO_RENDERER) |
| 114 } | 113 } |
| 115 | 114 |
| 116 void ServiceFactoryImpl::CreateCdm( | 115 void ServiceFactoryImpl::CreateCdm( |
| 117 mojo::InterfaceRequest<mojom::ContentDecryptionModule> request) { | 116 mojo::InterfaceRequest<mojom::ContentDecryptionModule> request) { |
| 118 #if defined(ENABLE_MOJO_CDM) | 117 #if defined(ENABLE_MOJO_CDM) |
| 119 CdmFactory* cdm_factory = GetCdmFactory(); | 118 CdmFactory* cdm_factory = GetCdmFactory(); |
| 120 if (!cdm_factory) | 119 if (!cdm_factory) |
| 121 return; | 120 return; |
| 122 | 121 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 140 CdmFactory* ServiceFactoryImpl::GetCdmFactory() { | 139 CdmFactory* ServiceFactoryImpl::GetCdmFactory() { |
| 141 if (!cdm_factory_) { | 140 if (!cdm_factory_) { |
| 142 cdm_factory_ = mojo_media_client_->CreateCdmFactory(interfaces_.get()); | 141 cdm_factory_ = mojo_media_client_->CreateCdmFactory(interfaces_.get()); |
| 143 LOG_IF(ERROR, !cdm_factory_) << "CdmFactory not available."; | 142 LOG_IF(ERROR, !cdm_factory_) << "CdmFactory not available."; |
| 144 } | 143 } |
| 145 return cdm_factory_.get(); | 144 return cdm_factory_.get(); |
| 146 } | 145 } |
| 147 #endif // defined(ENABLE_MOJO_CDM) | 146 #endif // defined(ENABLE_MOJO_CDM) |
| 148 | 147 |
| 149 } // namespace media | 148 } // namespace media |
| OLD | NEW |