| Index: media/mojo/services/utility_mojo_media_client.cc
|
| diff --git a/media/mojo/services/utility_mojo_media_client.cc b/media/mojo/services/utility_mojo_media_client.cc
|
| index 7d19e1e39ebf0f91f546d38c070d67cbf6cbe0fb..e31872b7ba9da35d471a1e9afebb7ffd3aadd26c 100644
|
| --- a/media/mojo/services/utility_mojo_media_client.cc
|
| +++ b/media/mojo/services/utility_mojo_media_client.cc
|
| @@ -5,10 +5,15 @@
|
| #include "media/mojo/services/utility_mojo_media_client.h"
|
|
|
| #include "base/threading/thread_task_runner_handle.h"
|
| +#include "media/audio/null_audio_sink.h"
|
| #include "media/base/media.h"
|
| #include "media/base/video_decoder.h"
|
| #include "media/mojo/common/mojo_shared_buffer_video_frame.h"
|
| #include "media/mojo/common/mojo_video_frame_provider.h"
|
| +#include "media/mojo/common/mojo_video_frame_provider_factory.h"
|
| +#include "media/mojo/services/mojo_video_renderer_sink_adapter.h"
|
| +#include "media/renderers/default_renderer_factory.h"
|
| +#include "media/renderers/gpu_video_accelerator_factories.h"
|
|
|
| #if !defined(DISABLE_FFMPEG_VIDEO_DECODERS)
|
| #include "media/filters/ffmpeg_video_decoder.h"
|
| @@ -16,7 +21,9 @@
|
|
|
| namespace media {
|
|
|
| -UtilityMojoMediaClient::UtilityMojoMediaClient() {}
|
| +UtilityMojoMediaClient::UtilityMojoMediaClient(
|
| + scoped_refptr<base::SingleThreadTaskRunner> utility_task_runner)
|
| + : utility_task_runner_(std::move(utility_task_runner)) {}
|
|
|
| UtilityMojoMediaClient::~UtilityMojoMediaClient() {}
|
|
|
| @@ -24,6 +31,18 @@ void UtilityMojoMediaClient::Initialize(service_manager::Connector* connector) {
|
| InitializeMediaLibrary();
|
| }
|
|
|
| +scoped_refptr<AudioRendererSink>
|
| +UtilityMojoMediaClient::CreateAudioRendererSink(
|
| + const std::string& /* audio_device_id */) {
|
| + return new NullAudioSink(utility_task_runner_);
|
| +}
|
| +
|
| +std::unique_ptr<VideoRendererSink>
|
| +UtilityMojoMediaClient::CreateVideoRendererSink(
|
| + const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) {
|
| + return base::MakeUnique<MojoVideoRendererSinkAdapter>(task_runner);
|
| +}
|
| +
|
| std::unique_ptr<VideoDecoder> UtilityMojoMediaClient::CreateVideoDecoder(
|
| scoped_refptr<base::SingleThreadTaskRunner> task_runner,
|
| mojom::CommandBufferIdPtr command_buffer_id) {
|
| @@ -38,4 +57,14 @@ std::unique_ptr<VideoDecoder> UtilityMojoMediaClient::CreateVideoDecoder(
|
| return decoder;
|
| }
|
|
|
| +std::unique_ptr<RendererFactory> UtilityMojoMediaClient::CreateRendererFactory(
|
| + const scoped_refptr<MediaLog>& media_log) {
|
| + std::unique_ptr<VideoFrameProviderFactory> video_frame_provider_factory(
|
| + new MojoVideoFrameProviderFactory());
|
| + return base::MakeUnique<DefaultRendererFactory>(
|
| + std::move(media_log), nullptr,
|
| + DefaultRendererFactory::GetGpuFactoriesCB(),
|
| + std::move(video_frame_provider_factory));
|
| +}
|
| +
|
| } // namespace media
|
|
|