| 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 "media/base/cdm_factory.h" | 8 #include "media/base/cdm_factory.h" |
| 9 #include "media/base/media_log.h" | 9 #include "media/base/media_log.h" |
| 10 #include "media/base/renderer_factory.h" | 10 #include "media/base/renderer_factory.h" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 AudioRendererSink* audio_renderer_sink = | 43 AudioRendererSink* audio_renderer_sink = |
| 44 mojo_media_client_->CreateAudioRendererSink(); | 44 mojo_media_client_->CreateAudioRendererSink(); |
| 45 VideoRendererSink* video_renderer_sink = | 45 VideoRendererSink* video_renderer_sink = |
| 46 mojo_media_client_->CreateVideoRendererSink(task_runner); | 46 mojo_media_client_->CreateVideoRendererSink(task_runner); |
| 47 | 47 |
| 48 RendererFactory* renderer_factory = GetRendererFactory(); | 48 RendererFactory* renderer_factory = GetRendererFactory(); |
| 49 if (!renderer_factory) | 49 if (!renderer_factory) |
| 50 return; | 50 return; |
| 51 | 51 |
| 52 scoped_ptr<Renderer> renderer = renderer_factory->CreateRenderer( | 52 scoped_ptr<Renderer> renderer = renderer_factory->CreateRenderer( |
| 53 task_runner, task_runner, audio_renderer_sink, video_renderer_sink); | 53 task_runner, task_runner, audio_renderer_sink, video_renderer_sink, |
| 54 RequestSurfaceCB()); |
| 54 if (!renderer) { | 55 if (!renderer) { |
| 55 LOG(ERROR) << "Renderer creation failed."; | 56 LOG(ERROR) << "Renderer creation failed."; |
| 56 return; | 57 return; |
| 57 } | 58 } |
| 58 | 59 |
| 59 new MojoRendererService(cdm_service_context_.GetWeakPtr(), | 60 new MojoRendererService(cdm_service_context_.GetWeakPtr(), |
| 60 std::move(renderer), std::move(request)); | 61 std::move(renderer), std::move(request)); |
| 61 } | 62 } |
| 62 | 63 |
| 63 void ServiceFactoryImpl::CreateCdm( | 64 void ServiceFactoryImpl::CreateCdm( |
| (...skipping 17 matching lines...) Expand all Loading... |
| 81 | 82 |
| 82 CdmFactory* ServiceFactoryImpl::GetCdmFactory() { | 83 CdmFactory* ServiceFactoryImpl::GetCdmFactory() { |
| 83 if (!cdm_factory_) { | 84 if (!cdm_factory_) { |
| 84 cdm_factory_ = mojo_media_client_->CreateCdmFactory(interfaces_); | 85 cdm_factory_ = mojo_media_client_->CreateCdmFactory(interfaces_); |
| 85 LOG_IF(ERROR, !cdm_factory_) << "CdmFactory not available."; | 86 LOG_IF(ERROR, !cdm_factory_) << "CdmFactory not available."; |
| 86 } | 87 } |
| 87 return cdm_factory_.get(); | 88 return cdm_factory_.get(); |
| 88 } | 89 } |
| 89 | 90 |
| 90 } // namespace media | 91 } // namespace media |
| OLD | NEW |