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

Unified Diff: media/mojo/services/service_factory_impl.cc

Issue 2016053003: Add audio_device_id in mojo media ServiceFactory CreateRenderer api. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Minor change based on the comment Created 4 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/mojo/services/service_factory_impl.h ('k') | media/mojo/services/test_mojo_media_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/service_factory_impl.cc
diff --git a/media/mojo/services/service_factory_impl.cc b/media/mojo/services/service_factory_impl.cc
index 433a8a9beab1bab5da4c9efa8db8cef903b1f607..954568abfb018ec87cc1a8e5dcd99b3b2a70b6cc 100644
--- a/media/mojo/services/service_factory_impl.cc
+++ b/media/mojo/services/service_factory_impl.cc
@@ -79,24 +79,16 @@ void ServiceFactoryImpl::CreateVideoDecoder(
}
void ServiceFactoryImpl::CreateRenderer(
+ const mojo::String& audio_device_id,
mojo::InterfaceRequest<mojom::Renderer> request) {
#if defined(ENABLE_MOJO_RENDERER)
// The created object is owned by the pipe.
// The audio and video sinks are owned by the client.
scoped_refptr<base::SingleThreadTaskRunner> task_runner(
base::ThreadTaskRunnerHandle::Get());
- AudioRendererSink* audio_renderer_sink =
- mojo_media_client_->CreateAudioRendererSink();
- VideoRendererSink* video_renderer_sink =
- mojo_media_client_->CreateVideoRendererSink(task_runner);
- RendererFactory* renderer_factory = GetRendererFactory();
- if (!renderer_factory)
- return;
-
- std::unique_ptr<Renderer> renderer = renderer_factory->CreateRenderer(
- task_runner, task_runner, audio_renderer_sink, video_renderer_sink,
- RequestSurfaceCB());
+ std::unique_ptr<Renderer> renderer = mojo_media_client_->CreateRenderer(
+ task_runner, media_log_, audio_device_id);
if (!renderer) {
LOG(ERROR) << "Renderer creation failed.";
return;
@@ -120,16 +112,6 @@ void ServiceFactoryImpl::CreateCdm(
#endif // defined(ENABLE_MOJO_CDM)
}
-#if defined(ENABLE_MOJO_RENDERER)
-RendererFactory* ServiceFactoryImpl::GetRendererFactory() {
- if (!renderer_factory_) {
- renderer_factory_ = mojo_media_client_->CreateRendererFactory(media_log_);
- LOG_IF(ERROR, !renderer_factory_) << "RendererFactory not available.";
- }
- return renderer_factory_.get();
-}
-#endif // defined(ENABLE_MOJO_RENDERER)
-
#if defined(ENABLE_MOJO_CDM)
CdmFactory* ServiceFactoryImpl::GetCdmFactory() {
if (!cdm_factory_) {
« no previous file with comments | « media/mojo/services/service_factory_impl.h ('k') | media/mojo/services/test_mojo_media_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698