| 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/threading/thread_task_runner_handle.h" | 9 #include "base/threading/thread_task_runner_handle.h" |
| 10 #include "media/base/media_log.h" | 10 #include "media/base/media_log.h" |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 if (!renderer_factory) | 96 if (!renderer_factory) |
| 97 return; | 97 return; |
| 98 | 98 |
| 99 scoped_refptr<base::SingleThreadTaskRunner> task_runner( | 99 scoped_refptr<base::SingleThreadTaskRunner> task_runner( |
| 100 base::ThreadTaskRunnerHandle::Get()); | 100 base::ThreadTaskRunnerHandle::Get()); |
| 101 auto audio_sink = | 101 auto audio_sink = |
| 102 mojo_media_client_->CreateAudioRendererSink(audio_device_id); | 102 mojo_media_client_->CreateAudioRendererSink(audio_device_id); |
| 103 auto video_sink = mojo_media_client_->CreateVideoRendererSink(task_runner); | 103 auto video_sink = mojo_media_client_->CreateVideoRendererSink(task_runner); |
| 104 auto renderer = renderer_factory->CreateRenderer( | 104 auto renderer = renderer_factory->CreateRenderer( |
| 105 task_runner, task_runner, audio_sink.get(), video_sink.get(), | 105 task_runner, task_runner, audio_sink.get(), video_sink.get(), |
| 106 RequestSurfaceCB()); | 106 RequestOverlayInfoCB()); |
| 107 if (!renderer) { | 107 if (!renderer) { |
| 108 LOG(ERROR) << "Renderer creation failed."; | 108 LOG(ERROR) << "Renderer creation failed."; |
| 109 return; | 109 return; |
| 110 } | 110 } |
| 111 | 111 |
| 112 std::unique_ptr<MojoRendererService> mojo_renderer_service = | 112 std::unique_ptr<MojoRendererService> mojo_renderer_service = |
| 113 base::MakeUnique<MojoRendererService>( | 113 base::MakeUnique<MojoRendererService>( |
| 114 cdm_service_context_.GetWeakPtr(), std::move(audio_sink), | 114 cdm_service_context_.GetWeakPtr(), std::move(audio_sink), |
| 115 std::move(video_sink), std::move(renderer), | 115 std::move(video_sink), std::move(renderer), |
| 116 MojoRendererService::InitiateSurfaceRequestCB()); | 116 MojoRendererService::InitiateSurfaceRequestCB()); |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 CdmFactory* InterfaceFactoryImpl::GetCdmFactory() { | 156 CdmFactory* InterfaceFactoryImpl::GetCdmFactory() { |
| 157 if (!cdm_factory_) { | 157 if (!cdm_factory_) { |
| 158 cdm_factory_ = mojo_media_client_->CreateCdmFactory(interfaces_.get()); | 158 cdm_factory_ = mojo_media_client_->CreateCdmFactory(interfaces_.get()); |
| 159 LOG_IF(ERROR, !cdm_factory_) << "CdmFactory not available."; | 159 LOG_IF(ERROR, !cdm_factory_) << "CdmFactory not available."; |
| 160 } | 160 } |
| 161 return cdm_factory_.get(); | 161 return cdm_factory_.get(); |
| 162 } | 162 } |
| 163 #endif // defined(ENABLE_MOJO_CDM) | 163 #endif // defined(ENABLE_MOJO_CDM) |
| 164 | 164 |
| 165 } // namespace media | 165 } // namespace media |
| OLD | NEW |