Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(357)

Side by Side Diff: media/mojo/services/interface_factory_impl.cc

Issue 2882813002: media: Convert mojo media defines to buildflags (Closed)
Patch Set: rebase Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/single_thread_task_runner.h" 9 #include "base/single_thread_task_runner.h"
10 #include "base/threading/thread_task_runner_handle.h" 10 #include "base/threading/thread_task_runner_handle.h"
11 #include "media/base/media_log.h" 11 #include "media/base/media_log.h"
12 #include "media/mojo/services/mojo_media_client.h" 12 #include "media/mojo/services/mojo_media_client.h"
13 #include "mojo/public/cpp/bindings/strong_binding.h" 13 #include "mojo/public/cpp/bindings/strong_binding.h"
14 #include "services/service_manager/public/interfaces/interface_provider.mojom.h" 14 #include "services/service_manager/public/interfaces/interface_provider.mojom.h"
15 15
16 #if defined(ENABLE_MOJO_AUDIO_DECODER) 16 #if BUILDFLAG(ENABLE_MOJO_AUDIO_DECODER)
17 #include "media/mojo/services/mojo_audio_decoder_service.h" 17 #include "media/mojo/services/mojo_audio_decoder_service.h"
18 #endif // defined(ENABLE_MOJO_AUDIO_DECODER) 18 #endif // BUILDFLAG(ENABLE_MOJO_AUDIO_DECODER)
19 19
20 #if defined(ENABLE_MOJO_VIDEO_DECODER) 20 #if BUILDFLAG(ENABLE_MOJO_VIDEO_DECODER)
21 #include "media/mojo/services/mojo_video_decoder_service.h" 21 #include "media/mojo/services/mojo_video_decoder_service.h"
22 #endif // defined(ENABLE_MOJO_VIDEO_DECODER) 22 #endif // BUILDFLAG(ENABLE_MOJO_VIDEO_DECODER)
23 23
24 #if defined(ENABLE_MOJO_RENDERER) 24 #if BUILDFLAG(ENABLE_MOJO_RENDERER)
25 #include "base/bind_helpers.h" 25 #include "base/bind_helpers.h"
26 #include "media/base/audio_renderer_sink.h" 26 #include "media/base/audio_renderer_sink.h"
27 #include "media/base/renderer_factory.h" 27 #include "media/base/renderer_factory.h"
28 #include "media/base/video_renderer_sink.h" 28 #include "media/base/video_renderer_sink.h"
29 #include "media/mojo/services/mojo_renderer_service.h" 29 #include "media/mojo/services/mojo_renderer_service.h"
30 #endif // defined(ENABLE_MOJO_RENDERER) 30 #endif // BUILDFLAG(ENABLE_MOJO_RENDERER)
31 31
32 #if defined(ENABLE_MOJO_CDM) 32 #if BUILDFLAG(ENABLE_MOJO_CDM)
33 #include "media/base/cdm_factory.h" 33 #include "media/base/cdm_factory.h"
34 #include "media/mojo/services/mojo_cdm_service.h" 34 #include "media/mojo/services/mojo_cdm_service.h"
35 #endif // defined(ENABLE_MOJO_CDM) 35 #endif // BUILDFLAG(ENABLE_MOJO_CDM)
36 36
37 namespace media { 37 namespace media {
38 38
39 InterfaceFactoryImpl::InterfaceFactoryImpl( 39 InterfaceFactoryImpl::InterfaceFactoryImpl(
40 service_manager::mojom::InterfaceProviderPtr interfaces, 40 service_manager::mojom::InterfaceProviderPtr interfaces,
41 MediaLog* media_log, 41 MediaLog* media_log,
42 std::unique_ptr<service_manager::ServiceContextRef> connection_ref, 42 std::unique_ptr<service_manager::ServiceContextRef> connection_ref,
43 MojoMediaClient* mojo_media_client) 43 MojoMediaClient* mojo_media_client)
44 : 44 :
45 #if defined(ENABLE_MOJO_RENDERER) 45 #if BUILDFLAG(ENABLE_MOJO_RENDERER)
46 media_log_(media_log), 46 media_log_(media_log),
47 #endif 47 #endif
48 #if defined(ENABLE_MOJO_CDM) 48 #if BUILDFLAG(ENABLE_MOJO_CDM)
49 interfaces_(std::move(interfaces)), 49 interfaces_(std::move(interfaces)),
50 #endif 50 #endif
51 connection_ref_(std::move(connection_ref)), 51 connection_ref_(std::move(connection_ref)),
52 mojo_media_client_(mojo_media_client) { 52 mojo_media_client_(mojo_media_client) {
53 DVLOG(1) << __func__; 53 DVLOG(1) << __func__;
54 DCHECK(mojo_media_client_); 54 DCHECK(mojo_media_client_);
55 } 55 }
56 56
57 InterfaceFactoryImpl::~InterfaceFactoryImpl() { 57 InterfaceFactoryImpl::~InterfaceFactoryImpl() {
58 DVLOG(1) << __func__; 58 DVLOG(1) << __func__;
59 } 59 }
60 60
61 // mojom::InterfaceFactory implementation. 61 // mojom::InterfaceFactory implementation.
62 62
63 void InterfaceFactoryImpl::CreateAudioDecoder( 63 void InterfaceFactoryImpl::CreateAudioDecoder(
64 mojo::InterfaceRequest<mojom::AudioDecoder> request) { 64 mojo::InterfaceRequest<mojom::AudioDecoder> request) {
65 #if defined(ENABLE_MOJO_AUDIO_DECODER) 65 #if BUILDFLAG(ENABLE_MOJO_AUDIO_DECODER)
66 scoped_refptr<base::SingleThreadTaskRunner> task_runner( 66 scoped_refptr<base::SingleThreadTaskRunner> task_runner(
67 base::ThreadTaskRunnerHandle::Get()); 67 base::ThreadTaskRunnerHandle::Get());
68 68
69 std::unique_ptr<AudioDecoder> audio_decoder = 69 std::unique_ptr<AudioDecoder> audio_decoder =
70 mojo_media_client_->CreateAudioDecoder(task_runner); 70 mojo_media_client_->CreateAudioDecoder(task_runner);
71 if (!audio_decoder) { 71 if (!audio_decoder) {
72 LOG(ERROR) << "AudioDecoder creation failed."; 72 LOG(ERROR) << "AudioDecoder creation failed.";
73 return; 73 return;
74 } 74 }
75 75
76 audio_decoder_bindings_.AddBinding( 76 audio_decoder_bindings_.AddBinding(
77 base::MakeUnique<MojoAudioDecoderService>( 77 base::MakeUnique<MojoAudioDecoderService>(
78 cdm_service_context_.GetWeakPtr(), std::move(audio_decoder)), 78 cdm_service_context_.GetWeakPtr(), std::move(audio_decoder)),
79 std::move(request)); 79 std::move(request));
80 #endif // defined(ENABLE_MOJO_AUDIO_DECODER) 80 #endif // BUILDFLAG(ENABLE_MOJO_AUDIO_DECODER)
81 } 81 }
82 82
83 void InterfaceFactoryImpl::CreateVideoDecoder( 83 void InterfaceFactoryImpl::CreateVideoDecoder(
84 mojom::VideoDecoderRequest request) { 84 mojom::VideoDecoderRequest request) {
85 #if defined(ENABLE_MOJO_VIDEO_DECODER) 85 #if BUILDFLAG(ENABLE_MOJO_VIDEO_DECODER)
86 video_decoder_bindings_.AddBinding( 86 video_decoder_bindings_.AddBinding(
87 base::MakeUnique<MojoVideoDecoderService>(mojo_media_client_), 87 base::MakeUnique<MojoVideoDecoderService>(mojo_media_client_),
88 std::move(request)); 88 std::move(request));
89 #endif // defined(ENABLE_MOJO_VIDEO_DECODER) 89 #endif // BUILDFLAG(ENABLE_MOJO_VIDEO_DECODER)
90 } 90 }
91 91
92 void InterfaceFactoryImpl::CreateRenderer( 92 void InterfaceFactoryImpl::CreateRenderer(
93 const std::string& audio_device_id, 93 const std::string& audio_device_id,
94 mojo::InterfaceRequest<mojom::Renderer> request) { 94 mojo::InterfaceRequest<mojom::Renderer> request) {
95 #if defined(ENABLE_MOJO_RENDERER) 95 #if BUILDFLAG(ENABLE_MOJO_RENDERER)
96 RendererFactory* renderer_factory = GetRendererFactory(); 96 RendererFactory* renderer_factory = GetRendererFactory();
97 if (!renderer_factory) 97 if (!renderer_factory)
98 return; 98 return;
99 99
100 scoped_refptr<base::SingleThreadTaskRunner> task_runner( 100 scoped_refptr<base::SingleThreadTaskRunner> task_runner(
101 base::ThreadTaskRunnerHandle::Get()); 101 base::ThreadTaskRunnerHandle::Get());
102 auto audio_sink = 102 auto audio_sink =
103 mojo_media_client_->CreateAudioRendererSink(audio_device_id); 103 mojo_media_client_->CreateAudioRendererSink(audio_device_id);
104 auto video_sink = mojo_media_client_->CreateVideoRendererSink(task_runner); 104 auto video_sink = mojo_media_client_->CreateVideoRendererSink(task_runner);
105 auto renderer = renderer_factory->CreateRenderer( 105 auto renderer = renderer_factory->CreateRenderer(
(...skipping 14 matching lines...) Expand all
120 120
121 mojo::BindingId binding_id = renderer_bindings_.AddBinding( 121 mojo::BindingId binding_id = renderer_bindings_.AddBinding(
122 std::move(mojo_renderer_service), std::move(request)); 122 std::move(mojo_renderer_service), std::move(request));
123 123
124 // base::Unretained() is safe because the callback will be fired by 124 // base::Unretained() is safe because the callback will be fired by
125 // |mojo_renderer_service|, which is owned by |renderer_bindings_|. 125 // |mojo_renderer_service|, which is owned by |renderer_bindings_|.
126 mojo_renderer_service_ptr->set_bad_message_cb( 126 mojo_renderer_service_ptr->set_bad_message_cb(
127 base::Bind(base::IgnoreResult( 127 base::Bind(base::IgnoreResult(
128 &mojo::StrongBindingSet<mojom::Renderer>::RemoveBinding), 128 &mojo::StrongBindingSet<mojom::Renderer>::RemoveBinding),
129 base::Unretained(&renderer_bindings_), binding_id)); 129 base::Unretained(&renderer_bindings_), binding_id));
130 #endif // defined(ENABLE_MOJO_RENDERER) 130 #endif // BUILDFLAG(ENABLE_MOJO_RENDERER)
131 } 131 }
132 132
133 void InterfaceFactoryImpl::CreateCdm( 133 void InterfaceFactoryImpl::CreateCdm(
134 mojo::InterfaceRequest<mojom::ContentDecryptionModule> request) { 134 mojo::InterfaceRequest<mojom::ContentDecryptionModule> request) {
135 #if defined(ENABLE_MOJO_CDM) 135 #if BUILDFLAG(ENABLE_MOJO_CDM)
136 CdmFactory* cdm_factory = GetCdmFactory(); 136 CdmFactory* cdm_factory = GetCdmFactory();
137 if (!cdm_factory) 137 if (!cdm_factory)
138 return; 138 return;
139 139
140 cdm_bindings_.AddBinding(base::MakeUnique<MojoCdmService>( 140 cdm_bindings_.AddBinding(base::MakeUnique<MojoCdmService>(
141 cdm_service_context_.GetWeakPtr(), cdm_factory), 141 cdm_service_context_.GetWeakPtr(), cdm_factory),
142 std::move(request)); 142 std::move(request));
143 #endif // defined(ENABLE_MOJO_CDM) 143 #endif // BUILDFLAG(ENABLE_MOJO_CDM)
144 } 144 }
145 145
146 #if defined(ENABLE_MOJO_RENDERER) 146 #if BUILDFLAG(ENABLE_MOJO_RENDERER)
147 RendererFactory* InterfaceFactoryImpl::GetRendererFactory() { 147 RendererFactory* InterfaceFactoryImpl::GetRendererFactory() {
148 if (!renderer_factory_) { 148 if (!renderer_factory_) {
149 renderer_factory_ = mojo_media_client_->CreateRendererFactory(media_log_); 149 renderer_factory_ = mojo_media_client_->CreateRendererFactory(media_log_);
150 LOG_IF(ERROR, !renderer_factory_) << "RendererFactory not available."; 150 LOG_IF(ERROR, !renderer_factory_) << "RendererFactory not available.";
151 } 151 }
152 return renderer_factory_.get(); 152 return renderer_factory_.get();
153 } 153 }
154 #endif // defined(ENABLE_MOJO_RENDERER) 154 #endif // BUILDFLAG(ENABLE_MOJO_RENDERER)
155 155
156 #if defined(ENABLE_MOJO_CDM) 156 #if BUILDFLAG(ENABLE_MOJO_CDM)
157 CdmFactory* InterfaceFactoryImpl::GetCdmFactory() { 157 CdmFactory* InterfaceFactoryImpl::GetCdmFactory() {
158 if (!cdm_factory_) { 158 if (!cdm_factory_) {
159 cdm_factory_ = mojo_media_client_->CreateCdmFactory(interfaces_.get()); 159 cdm_factory_ = mojo_media_client_->CreateCdmFactory(interfaces_.get());
160 LOG_IF(ERROR, !cdm_factory_) << "CdmFactory not available."; 160 LOG_IF(ERROR, !cdm_factory_) << "CdmFactory not available.";
161 } 161 }
162 return cdm_factory_.get(); 162 return cdm_factory_.get();
163 } 163 }
164 #endif // defined(ENABLE_MOJO_CDM) 164 #endif // BUILDFLAG(ENABLE_MOJO_CDM)
165 165
166 } // namespace media 166 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/interface_factory_impl.h ('k') | media/mojo/services/media_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698