media: Support RendererFactory in MojoMediaClient.

media/mojo/services/mojo_renderer_service.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/mojo/services/mojo_renderer_service.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "media/base/audio_decoder.h"
 #include "media/base/audio_renderer.h"
 #include "media/base/audio_renderer_sink.h"
 #include "media/base/cdm_context.h"
 #include "media/base/decryptor.h"
 #include "media/base/media_log.h"
+#include "media/base/renderer_factory.h"
 #include "media/base/video_renderer.h"
 #include "media/base/video_renderer_sink.h"
 #include "media/mojo/services/demuxer_stream_provider_shim.h"
 #include "media/mojo/services/mojo_media_client.h"
 #include "media/renderers/audio_renderer_impl.h"
 #include "media/renderers/renderer_impl.h"
 #include "media/renderers/video_renderer_impl.h"
 
 namespace media {
 
 // Time interval to update media time.
 const int kTimeUpdateIntervalMs = 50;
 
 MojoRendererService::MojoRendererService(
     CdmContextProvider* cdm_context_provider,
+    RendererFactory* renderer_factory,
+    const scoped_refptr<MediaLog>& media_log,
     mojo::InterfaceRequest<mojo::MediaRenderer> request)
     : binding_(this, request.Pass()),
       cdm_context_provider_(cdm_context_provider),
       state_(STATE_UNINITIALIZED),
       last_media_time_usec_(0),
       weak_factory_(this) {
   weak_this_ = weak_factory_.GetWeakPtr();
   DVLOG(1) << __FUNCTION__;
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner(
       base::MessageLoop::current()->task_runner());
-  scoped_refptr<MediaLog> media_log(new MediaLog());
   MojoMediaClient* mojo_media_client = MojoMediaClient::Get();
   audio_renderer_sink_ = mojo_media_client->GetAudioRendererSink();
   video_renderer_sink_ = mojo_media_client->GetVideoRendererSink(task_runner);
 
-  scoped_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl(
-      task_runner, audio_renderer_sink_.get(),
-      mojo_media_client->GetAudioDecoders(task_runner,
-                                        base::Bind(&MediaLog::AddLogEvent,
-                                                   media_log)).Pass(),
-      mojo_media_client->GetAudioHardwareConfig(), media_log));
-
-  scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl(
-      task_runner, video_renderer_sink_.get(),
-      mojo_media_client->GetVideoDecoders(task_runner,
-                                        base::Bind(&MediaLog::AddLogEvent,
-                                                   media_log)).Pass(),
-      true, nullptr, media_log));
-
   // Create renderer.
-  renderer_.reset(new RendererImpl(
-      task_runner, audio_renderer.Pass(), video_renderer.Pass()));
+  if (renderer_factory) {
+    renderer_ = renderer_factory->CreateRenderer(
+        task_runner, audio_renderer_sink_.get(), video_renderer_sink_.get());
+  } else {
+    scoped_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl(
+        task_runner, audio_renderer_sink_.get(),
+        mojo_media_client->GetAudioDecoders(task_runner, media_log).Pass(),
+        mojo_media_client->GetAudioHardwareConfig(), media_log));
+    scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl(
+        task_runner, video_renderer_sink_.get(),
+        mojo_media_client->GetVideoDecoders(task_runner, media_log).Pass(),
+        true, nullptr, media_log));
+    renderer_.reset(new RendererImpl(task_runner, audio_renderer.Pass(),
+                                     video_renderer.Pass()));
+  }
 }
 
 MojoRendererService::~MojoRendererService() {
 }
 
 void MojoRendererService::Initialize(mojo::MediaRendererClientPtr client,
                                      mojo::DemuxerStreamPtr audio,
                                      mojo::DemuxerStreamPtr video,
                                      const mojo::Closure& callback) {
   DVLOG(1) << __FUNCTION__;
@@ skipping 137 matching lines @@
 }
 
 void MojoRendererService::OnCdmAttached(
     const mojo::Callback<void(bool)>& callback,
     bool success) {
   DVLOG(1) << __FUNCTION__ << "(" << success << ")";
   callback.Run(success);
 }
 
 }  // namespace media