| Index: media/mojo/services/test_mojo_media_client.cc
|
| diff --git a/media/mojo/services/test_mojo_media_client.cc b/media/mojo/services/test_mojo_media_client.cc
|
| index 3b4fbde2f224f7ef267727a8bd4c0809423d942b..512223d95e2135c9eb26ebe382b15037ae7271cd 100644
|
| --- a/media/mojo/services/test_mojo_media_client.cc
|
| +++ b/media/mojo/services/test_mojo_media_client.cc
|
| @@ -5,6 +5,7 @@
|
| #include "media/mojo/services/test_mojo_media_client.h"
|
|
|
| #include "base/memory/ptr_util.h"
|
| +#include "base/message_loop/message_loop.h"
|
| #include "base/run_loop.h"
|
| #include "base/threading/thread_task_runner_handle.h"
|
| #include "media/audio/audio_device_description.h"
|
| @@ -13,6 +14,7 @@
|
| #include "media/base/audio_hardware_config.h"
|
| #include "media/base/cdm_factory.h"
|
| #include "media/base/media.h"
|
| +#include "media/base/media_log.h"
|
| #include "media/base/null_video_sink.h"
|
| #include "media/base/renderer_factory.h"
|
| #include "media/cdm/default_cdm_factory.h"
|
| @@ -50,11 +52,33 @@ void TestMojoMediaClient::WillQuit() {
|
| base::RunLoop().RunUntilIdle();
|
| }
|
|
|
| -std::unique_ptr<RendererFactory> TestMojoMediaClient::CreateRendererFactory(
|
| +std::unique_ptr<Renderer> TestMojoMediaClient::CreateRenderer(
|
| + const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
|
| + const scoped_refptr<MediaLog>& media_log,
|
| + const std::string& audio_device_id) {
|
| + DVLOG(1) << __FUNCTION__;
|
| + AudioRendererSink* audio_renderer_sink = CreateAudioRendererSink();
|
| + VideoRendererSink* video_renderer_sink =
|
| + CreateVideoRendererSink(media_task_runner);
|
| +
|
| + RendererFactory* renderer_factory = CreateRendererFactory(media_log);
|
| + if (!renderer_factory)
|
| + return nullptr;
|
| +
|
| + return renderer_factory->CreateRenderer(
|
| + media_task_runner, media_task_runner, audio_renderer_sink,
|
| + video_renderer_sink, RequestSurfaceCB());
|
| +}
|
| +
|
| +RendererFactory* TestMojoMediaClient::CreateRendererFactory(
|
| const scoped_refptr<MediaLog>& media_log) {
|
| DVLOG(1) << __FUNCTION__;
|
| - return base::WrapUnique(new DefaultRendererFactory(
|
| - media_log, nullptr, DefaultRendererFactory::GetGpuFactoriesCB()));
|
| + if (!renderer_factory_) {
|
| + renderer_factory_ = base::WrapUnique(new DefaultRendererFactory(
|
| + media_log, nullptr, DefaultRendererFactory::GetGpuFactoriesCB()));
|
| + }
|
| +
|
| + return renderer_factory_.get();
|
| }
|
|
|
| AudioRendererSink* TestMojoMediaClient::CreateAudioRendererSink() {
|
|
|