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

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

Issue 1525863002: Remove renderer_service -> media_client dependency. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed compile error Created 5 years 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
« no previous file with comments | « media/mojo/services/mojo_renderer_service.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/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 18 matching lines...) Expand all
29 } 29 }
30 30
31 ServiceFactoryImpl::~ServiceFactoryImpl() { 31 ServiceFactoryImpl::~ServiceFactoryImpl() {
32 DVLOG(1) << __FUNCTION__; 32 DVLOG(1) << __FUNCTION__;
33 } 33 }
34 34
35 // interfaces::ServiceFactory implementation. 35 // interfaces::ServiceFactory implementation.
36 void ServiceFactoryImpl::CreateRenderer( 36 void ServiceFactoryImpl::CreateRenderer(
37 mojo::InterfaceRequest<interfaces::Renderer> request) { 37 mojo::InterfaceRequest<interfaces::Renderer> request) {
38 // The created object is owned by the pipe. 38 // The created object is owned by the pipe.
39 scoped_refptr<base::SingleThreadTaskRunner> task_runner(
40 base::MessageLoop::current()->task_runner());
41 MojoMediaClient* mojo_media_client = MojoMediaClient::Get();
42 scoped_refptr<AudioRendererSink> audio_renderer_sink =
43 mojo_media_client->CreateAudioRendererSink();
44 scoped_ptr<VideoRendererSink> video_renderer_sink =
45 mojo_media_client->CreateVideoRendererSink(task_runner);
46 scoped_ptr<Renderer> renderer = GetRendererFactory()->CreateRenderer(
47 task_runner, task_runner, audio_renderer_sink.get(),
48 video_renderer_sink.get());
49
39 new MojoRendererService(cdm_service_context_.GetWeakPtr(), 50 new MojoRendererService(cdm_service_context_.GetWeakPtr(),
40 GetRendererFactory(), media_log_, std::move(request)); 51 std::move(renderer), std::move(request));
41 } 52 }
42 53
43 void ServiceFactoryImpl::CreateCdm( 54 void ServiceFactoryImpl::CreateCdm(
44 mojo::InterfaceRequest<interfaces::ContentDecryptionModule> request) { 55 mojo::InterfaceRequest<interfaces::ContentDecryptionModule> request) {
45 // The created object is owned by the pipe. 56 // The created object is owned by the pipe.
46 new MojoCdmService(cdm_service_context_.GetWeakPtr(), service_provider_, 57 new MojoCdmService(cdm_service_context_.GetWeakPtr(), service_provider_,
47 GetCdmFactory(), std::move(request)); 58 GetCdmFactory(), std::move(request));
48 } 59 }
49 60
50 RendererFactory* ServiceFactoryImpl::GetRendererFactory() { 61 RendererFactory* ServiceFactoryImpl::GetRendererFactory() {
51 if (!renderer_factory_) 62 if (!renderer_factory_)
52 renderer_factory_ = 63 renderer_factory_ =
53 MojoMediaClient::Get()->CreateRendererFactory(media_log_); 64 MojoMediaClient::Get()->CreateRendererFactory(media_log_);
54 return renderer_factory_.get(); 65 return renderer_factory_.get();
55 } 66 }
56 67
57 CdmFactory* ServiceFactoryImpl::GetCdmFactory() { 68 CdmFactory* ServiceFactoryImpl::GetCdmFactory() {
58 if (!cdm_factory_) 69 if (!cdm_factory_)
59 cdm_factory_ = MojoMediaClient::Get()->CreateCdmFactory(service_provider_); 70 cdm_factory_ = MojoMediaClient::Get()->CreateCdmFactory(service_provider_);
60 return cdm_factory_.get(); 71 return cdm_factory_.get();
61 } 72 }
62 73
63 } // namespace media 74 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_renderer_service.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698