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

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

Issue 1899363002: Finish plumbing MojoVideoDecoder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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/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_RENDERER) 16 #if defined(ENABLE_MOJO_RENDERER)
17 #include "media/base/renderer_factory.h" 17 #include "media/base/renderer_factory.h"
18 #include "media/mojo/services/mojo_renderer_service.h" 18 #include "media/mojo/services/mojo_renderer_service.h"
19 #endif // defined(ENABLE_MOJO_RENDERER) 19 #endif // defined(ENABLE_MOJO_RENDERER)
20 20
21 #if defined(ENABLE_MOJO_CDM) 21 #if defined(ENABLE_MOJO_CDM)
22 #include "media/base/cdm_factory.h" 22 #include "media/base/cdm_factory.h"
23 #include "media/mojo/services/mojo_cdm_service.h" 23 #include "media/mojo/services/mojo_cdm_service.h"
24 #endif // defined(ENABLE_MOJO_CDM) 24 #endif // defined(ENABLE_MOJO_CDM)
25 25
26 #if defined(ENABLE_MOJO_VIDEO_DECODER)
27 #include "media/mojo/services/mojo_video_decoder_service.h"
28 #endif // defined(ENABLE_MOJO_VIDEO_DECODER)
29
26 namespace media { 30 namespace media {
27 31
28 ServiceFactoryImpl::ServiceFactoryImpl( 32 ServiceFactoryImpl::ServiceFactoryImpl(
29 mojo::InterfaceRequest<interfaces::ServiceFactory> request, 33 mojo::InterfaceRequest<interfaces::ServiceFactory> request,
30 shell::mojom::InterfaceProvider* interfaces, 34 shell::mojom::InterfaceProvider* interfaces,
31 scoped_refptr<MediaLog> media_log, 35 scoped_refptr<MediaLog> media_log,
32 std::unique_ptr<shell::MessageLoopRef> parent_app_refcount, 36 std::unique_ptr<shell::MessageLoopRef> parent_app_refcount,
33 MojoMediaClient* mojo_media_client) 37 MojoMediaClient* mojo_media_client)
34 : binding_(this, std::move(request)), 38 : binding_(this, std::move(request)),
35 interfaces_(interfaces), 39 interfaces_(interfaces),
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 CdmFactory* cdm_factory = GetCdmFactory(); 102 CdmFactory* cdm_factory = GetCdmFactory();
99 if (!cdm_factory) 103 if (!cdm_factory)
100 return; 104 return;
101 105
102 // The created object is owned by the pipe. 106 // The created object is owned by the pipe.
103 new MojoCdmService(cdm_service_context_.GetWeakPtr(), cdm_factory, 107 new MojoCdmService(cdm_service_context_.GetWeakPtr(), cdm_factory,
104 std::move(request)); 108 std::move(request));
105 #endif // defined(ENABLE_MOJO_CDM) 109 #endif // defined(ENABLE_MOJO_CDM)
106 } 110 }
107 111
112 void ServiceFactoryImpl::CreateVideoDecoder(
113 mojo::InterfaceRequest<interfaces::VideoDecoder> request) {
114 #if defined(ENABLE_MOJO_VIDEO_DECODER)
115 new MojoVideoDecoderService(std::move(request), mojo_media_client_);
116 #endif // defined(ENABLE_MOJO_AUDIO_DECODER)
117 }
118
108 #if defined(ENABLE_MOJO_RENDERER) 119 #if defined(ENABLE_MOJO_RENDERER)
109 RendererFactory* ServiceFactoryImpl::GetRendererFactory() { 120 RendererFactory* ServiceFactoryImpl::GetRendererFactory() {
110 if (!renderer_factory_) { 121 if (!renderer_factory_) {
111 renderer_factory_ = mojo_media_client_->CreateRendererFactory(media_log_); 122 renderer_factory_ = mojo_media_client_->CreateRendererFactory(media_log_);
112 LOG_IF(ERROR, !renderer_factory_) << "RendererFactory not available."; 123 LOG_IF(ERROR, !renderer_factory_) << "RendererFactory not available.";
113 } 124 }
114 return renderer_factory_.get(); 125 return renderer_factory_.get();
115 } 126 }
116 #endif // defined(ENABLE_MOJO_RENDERER) 127 #endif // defined(ENABLE_MOJO_RENDERER)
117 128
118 #if defined(ENABLE_MOJO_CDM) 129 #if defined(ENABLE_MOJO_CDM)
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
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698