| 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/media_log.h" | 8 #include "media/base/media_log.h" |
| 9 #include "media/mojo/services/mojo_media_client.h" | 9 #include "media/mojo/services/mojo_media_client.h" |
| 10 #include "services/shell/public/interfaces/interface_provider.mojom.h" | 10 #include "services/shell/public/interfaces/interface_provider.mojom.h" |
| 11 | 11 |
| 12 #if defined(ENABLE_MOJO_AUDIO_DECODER) | 12 #if defined(ENABLE_MOJO_AUDIO_DECODER) |
| 13 #include "media/mojo/services/mojo_audio_decoder_service.h" | 13 #include "media/mojo/services/mojo_audio_decoder_service.h" |
| 14 #endif // defined(ENABLE_MOJO_AUDIO_DECODER) | 14 #endif // defined(ENABLE_MOJO_AUDIO_DECODER) |
| 15 | 15 |
| 16 #if defined(ENABLE_MOJO_VIDEO_DECODER) |
| 17 #include "media/mojo/services/mojo_video_decoder_service.h" |
| 18 #endif // defined(ENABLE_MOJO_VIDEO_DECODER) |
| 19 |
| 16 #if defined(ENABLE_MOJO_RENDERER) | 20 #if defined(ENABLE_MOJO_RENDERER) |
| 17 #include "media/base/renderer_factory.h" | 21 #include "media/base/renderer_factory.h" |
| 18 #include "media/mojo/services/mojo_renderer_service.h" | 22 #include "media/mojo/services/mojo_renderer_service.h" |
| 19 #endif // defined(ENABLE_MOJO_RENDERER) | 23 #endif // defined(ENABLE_MOJO_RENDERER) |
| 20 | 24 |
| 21 #if defined(ENABLE_MOJO_CDM) | 25 #if defined(ENABLE_MOJO_CDM) |
| 22 #include "media/base/cdm_factory.h" | 26 #include "media/base/cdm_factory.h" |
| 23 #include "media/mojo/services/mojo_cdm_service.h" | 27 #include "media/mojo/services/mojo_cdm_service.h" |
| 24 #endif // defined(ENABLE_MOJO_CDM) | 28 #endif // defined(ENABLE_MOJO_CDM) |
| 25 | 29 |
| (...skipping 30 matching lines...) Expand all Loading... |
| 56 if (!audio_decoder) { | 60 if (!audio_decoder) { |
| 57 LOG(ERROR) << "AudioDecoder creation failed."; | 61 LOG(ERROR) << "AudioDecoder creation failed."; |
| 58 return; | 62 return; |
| 59 } | 63 } |
| 60 | 64 |
| 61 new MojoAudioDecoderService(cdm_service_context_.GetWeakPtr(), | 65 new MojoAudioDecoderService(cdm_service_context_.GetWeakPtr(), |
| 62 std::move(audio_decoder), std::move(request)); | 66 std::move(audio_decoder), std::move(request)); |
| 63 #endif // defined(ENABLE_MOJO_AUDIO_DECODER) | 67 #endif // defined(ENABLE_MOJO_AUDIO_DECODER) |
| 64 } | 68 } |
| 65 | 69 |
| 70 void ServiceFactoryImpl::CreateVideoDecoder( |
| 71 interfaces::VideoDecoderRequest request) { |
| 72 #if defined(ENABLE_MOJO_VIDEO_DECODER) |
| 73 new MojoVideoDecoderService(std::move(request), mojo_media_client_); |
| 74 #endif // defined(ENABLE_MOJO_VIDEO_DECODER) |
| 75 } |
| 76 |
| 66 void ServiceFactoryImpl::CreateRenderer( | 77 void ServiceFactoryImpl::CreateRenderer( |
| 67 mojo::InterfaceRequest<interfaces::Renderer> request) { | 78 mojo::InterfaceRequest<interfaces::Renderer> request) { |
| 68 #if defined(ENABLE_MOJO_RENDERER) | 79 #if defined(ENABLE_MOJO_RENDERER) |
| 69 // The created object is owned by the pipe. | 80 // The created object is owned by the pipe. |
| 70 // The audio and video sinks are owned by the client. | 81 // The audio and video sinks are owned by the client. |
| 71 scoped_refptr<base::SingleThreadTaskRunner> task_runner( | 82 scoped_refptr<base::SingleThreadTaskRunner> task_runner( |
| 72 base::MessageLoop::current()->task_runner()); | 83 base::MessageLoop::current()->task_runner()); |
| 73 AudioRendererSink* audio_renderer_sink = | 84 AudioRendererSink* audio_renderer_sink = |
| 74 mojo_media_client_->CreateAudioRendererSink(); | 85 mojo_media_client_->CreateAudioRendererSink(); |
| 75 VideoRendererSink* video_renderer_sink = | 86 VideoRendererSink* video_renderer_sink = |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 CdmFactory* ServiceFactoryImpl::GetCdmFactory() { | 130 CdmFactory* ServiceFactoryImpl::GetCdmFactory() { |
| 120 if (!cdm_factory_) { | 131 if (!cdm_factory_) { |
| 121 cdm_factory_ = mojo_media_client_->CreateCdmFactory(interfaces_); | 132 cdm_factory_ = mojo_media_client_->CreateCdmFactory(interfaces_); |
| 122 LOG_IF(ERROR, !cdm_factory_) << "CdmFactory not available."; | 133 LOG_IF(ERROR, !cdm_factory_) << "CdmFactory not available."; |
| 123 } | 134 } |
| 124 return cdm_factory_.get(); | 135 return cdm_factory_.get(); |
| 125 } | 136 } |
| 126 #endif // defined(ENABLE_MOJO_CDM) | 137 #endif // defined(ENABLE_MOJO_CDM) |
| 127 | 138 |
| 128 } // namespace media | 139 } // namespace media |
| OLD | NEW |