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" |
11 #include "services/shell/public/interfaces/interface_provider.mojom.h" | 11 #include "services/shell/public/interfaces/interface_provider.mojom.h" |
12 | 12 |
13 #if defined(ENABLE_MOJO_AUDIO_DECODER) | 13 #if defined(ENABLE_MOJO_AUDIO_DECODER) |
14 #include "media/mojo/services/mojo_audio_decoder_service.h" | 14 #include "media/mojo/services/mojo_audio_decoder_service.h" |
15 #endif // defined(ENABLE_MOJO_AUDIO_DECODER) | 15 #endif // defined(ENABLE_MOJO_AUDIO_DECODER) |
16 | 16 |
17 #if defined(ENABLE_MOJO_VIDEO_DECODER) | 17 #if defined(ENABLE_MOJO_VIDEO_DECODER) |
18 #include "media/mojo/services/mojo_video_decoder_service.h" | 18 #include "media/mojo/services/mojo_video_decoder_service.h" |
19 #endif // defined(ENABLE_MOJO_VIDEO_DECODER) | 19 #endif // defined(ENABLE_MOJO_VIDEO_DECODER) |
20 | 20 |
21 #if defined(ENABLE_MOJO_RENDERER) | 21 #if defined(ENABLE_MOJO_RENDERER) |
| 22 #include "media/base/audio_renderer_sink.h" |
22 #include "media/base/renderer_factory.h" | 23 #include "media/base/renderer_factory.h" |
| 24 #include "media/base/video_renderer_sink.h" |
23 #include "media/mojo/services/mojo_renderer_service.h" | 25 #include "media/mojo/services/mojo_renderer_service.h" |
24 #endif // defined(ENABLE_MOJO_RENDERER) | 26 #endif // defined(ENABLE_MOJO_RENDERER) |
25 | 27 |
26 #if defined(ENABLE_MOJO_CDM) | 28 #if defined(ENABLE_MOJO_CDM) |
27 #include "media/base/cdm_factory.h" | 29 #include "media/base/cdm_factory.h" |
28 #include "media/mojo/services/mojo_cdm_service.h" | 30 #include "media/mojo/services/mojo_cdm_service.h" |
29 #endif // defined(ENABLE_MOJO_CDM) | 31 #endif // defined(ENABLE_MOJO_CDM) |
30 | 32 |
31 namespace media { | 33 namespace media { |
32 | 34 |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
75 mojom::VideoDecoderRequest request) { | 77 mojom::VideoDecoderRequest request) { |
76 #if defined(ENABLE_MOJO_VIDEO_DECODER) | 78 #if defined(ENABLE_MOJO_VIDEO_DECODER) |
77 new MojoVideoDecoderService(std::move(request), mojo_media_client_); | 79 new MojoVideoDecoderService(std::move(request), mojo_media_client_); |
78 #endif // defined(ENABLE_MOJO_VIDEO_DECODER) | 80 #endif // defined(ENABLE_MOJO_VIDEO_DECODER) |
79 } | 81 } |
80 | 82 |
81 void ServiceFactoryImpl::CreateRenderer( | 83 void ServiceFactoryImpl::CreateRenderer( |
82 const mojo::String& audio_device_id, | 84 const mojo::String& audio_device_id, |
83 mojo::InterfaceRequest<mojom::Renderer> request) { | 85 mojo::InterfaceRequest<mojom::Renderer> request) { |
84 #if defined(ENABLE_MOJO_RENDERER) | 86 #if defined(ENABLE_MOJO_RENDERER) |
85 // The created object is owned by the pipe. | 87 RendererFactory* renderer_factory = GetRendererFactory(); |
86 // The audio and video sinks are owned by the client. | 88 if (!renderer_factory) |
| 89 return; |
| 90 |
87 scoped_refptr<base::SingleThreadTaskRunner> task_runner( | 91 scoped_refptr<base::SingleThreadTaskRunner> task_runner( |
88 base::ThreadTaskRunnerHandle::Get()); | 92 base::ThreadTaskRunnerHandle::Get()); |
89 | 93 auto audio_sink = |
90 std::unique_ptr<Renderer> renderer = mojo_media_client_->CreateRenderer( | 94 mojo_media_client_->CreateAudioRendererSink(audio_device_id); |
91 task_runner, media_log_, audio_device_id); | 95 auto video_sink = mojo_media_client_->CreateVideoRendererSink(task_runner); |
| 96 auto renderer = renderer_factory->CreateRenderer( |
| 97 task_runner, task_runner, audio_sink.get(), video_sink.get(), |
| 98 RequestSurfaceCB()); |
92 if (!renderer) { | 99 if (!renderer) { |
93 LOG(ERROR) << "Renderer creation failed."; | 100 LOG(ERROR) << "Renderer creation failed."; |
94 return; | 101 return; |
95 } | 102 } |
96 | 103 |
| 104 // The created object is owned by the pipe. |
97 new MojoRendererService(cdm_service_context_.GetWeakPtr(), | 105 new MojoRendererService(cdm_service_context_.GetWeakPtr(), |
| 106 std::move(audio_sink), std::move(video_sink), |
98 std::move(renderer), std::move(request)); | 107 std::move(renderer), std::move(request)); |
99 #endif // defined(ENABLE_MOJO_RENDERER) | 108 #endif // defined(ENABLE_MOJO_RENDERER) |
100 } | 109 } |
101 | 110 |
102 void ServiceFactoryImpl::CreateCdm( | 111 void ServiceFactoryImpl::CreateCdm( |
103 mojo::InterfaceRequest<mojom::ContentDecryptionModule> request) { | 112 mojo::InterfaceRequest<mojom::ContentDecryptionModule> request) { |
104 #if defined(ENABLE_MOJO_CDM) | 113 #if defined(ENABLE_MOJO_CDM) |
105 CdmFactory* cdm_factory = GetCdmFactory(); | 114 CdmFactory* cdm_factory = GetCdmFactory(); |
106 if (!cdm_factory) | 115 if (!cdm_factory) |
107 return; | 116 return; |
108 | 117 |
109 // The created object is owned by the pipe. | 118 // The created object is owned by the pipe. |
110 new MojoCdmService(cdm_service_context_.GetWeakPtr(), cdm_factory, | 119 new MojoCdmService(cdm_service_context_.GetWeakPtr(), cdm_factory, |
111 std::move(request)); | 120 std::move(request)); |
112 #endif // defined(ENABLE_MOJO_CDM) | 121 #endif // defined(ENABLE_MOJO_CDM) |
113 } | 122 } |
114 | 123 |
| 124 #if defined(ENABLE_MOJO_RENDERER) |
| 125 RendererFactory* ServiceFactoryImpl::GetRendererFactory() { |
| 126 if (!renderer_factory_) { |
| 127 renderer_factory_ = mojo_media_client_->CreateRendererFactory(media_log_); |
| 128 LOG_IF(ERROR, !renderer_factory_) << "RendererFactory not available."; |
| 129 } |
| 130 return renderer_factory_.get(); |
| 131 } |
| 132 #endif // defined(ENABLE_MOJO_RENDERER) |
| 133 |
115 #if defined(ENABLE_MOJO_CDM) | 134 #if defined(ENABLE_MOJO_CDM) |
116 CdmFactory* ServiceFactoryImpl::GetCdmFactory() { | 135 CdmFactory* ServiceFactoryImpl::GetCdmFactory() { |
117 if (!cdm_factory_) { | 136 if (!cdm_factory_) { |
118 cdm_factory_ = mojo_media_client_->CreateCdmFactory(interfaces_.get()); | 137 cdm_factory_ = mojo_media_client_->CreateCdmFactory(interfaces_.get()); |
119 LOG_IF(ERROR, !cdm_factory_) << "CdmFactory not available."; | 138 LOG_IF(ERROR, !cdm_factory_) << "CdmFactory not available."; |
120 } | 139 } |
121 return cdm_factory_.get(); | 140 return cdm_factory_.get(); |
122 } | 141 } |
123 #endif // defined(ENABLE_MOJO_CDM) | 142 #endif // defined(ENABLE_MOJO_CDM) |
124 | 143 |
125 } // namespace media | 144 } // namespace media |
OLD | NEW |