| OLD | NEW |
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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/utility_mojo_media_client.h" | 5 #include "media/mojo/services/utility_mojo_media_client.h" |
| 6 | 6 |
| 7 #include "base/threading/thread_task_runner_handle.h" | 7 #include "base/threading/thread_task_runner_handle.h" |
| 8 #include "media/audio/null_audio_sink.h" | 8 #include "media/audio/null_audio_sink.h" |
| 9 #include "media/base/media.h" | 9 #include "media/base/media.h" |
| 10 #include "media/base/video_decoder.h" | 10 #include "media/base/video_decoder.h" |
| 11 #include "media/mojo/common/mojo_shared_buffer_video_frame.h" | 11 #include "media/mojo/common/mojo_shared_buffer_video_frame.h" |
| 12 #include "media/mojo/common/mojo_video_frame_provider.h" | 12 #include "media/mojo/common/mojo_video_frame_provider.h" |
| 13 #include "media/mojo/common/mojo_video_frame_provider_factory.h" | 13 #include "media/mojo/common/mojo_video_frame_provider_factory.h" |
| 14 #include "media/mojo/services/mojo_audio_renderer_sink_adapter.h" |
| 14 #include "media/mojo/services/mojo_video_renderer_sink_adapter.h" | 15 #include "media/mojo/services/mojo_video_renderer_sink_adapter.h" |
| 15 #include "media/renderers/default_renderer_factory.h" | 16 #include "media/renderers/default_renderer_factory.h" |
| 16 #include "media/renderers/gpu_video_accelerator_factories.h" | 17 #include "media/renderers/gpu_video_accelerator_factories.h" |
| 17 | 18 |
| 18 #if !defined(DISABLE_FFMPEG_VIDEO_DECODERS) | 19 #if !defined(DISABLE_FFMPEG_VIDEO_DECODERS) |
| 19 #include "media/filters/ffmpeg_video_decoder.h" | 20 #include "media/filters/ffmpeg_video_decoder.h" |
| 20 #endif | 21 #endif |
| 21 | 22 |
| 22 namespace media { | 23 namespace media { |
| 23 | 24 |
| 24 UtilityMojoMediaClient::UtilityMojoMediaClient( | 25 UtilityMojoMediaClient::UtilityMojoMediaClient( |
| 25 scoped_refptr<base::SingleThreadTaskRunner> utility_task_runner) | 26 scoped_refptr<base::SingleThreadTaskRunner> utility_task_runner) |
| 26 : utility_task_runner_(std::move(utility_task_runner)) {} | 27 : utility_task_runner_(std::move(utility_task_runner)) {} |
| 27 | 28 |
| 28 UtilityMojoMediaClient::~UtilityMojoMediaClient() {} | 29 UtilityMojoMediaClient::~UtilityMojoMediaClient() {} |
| 29 | 30 |
| 30 void UtilityMojoMediaClient::Initialize(service_manager::Connector* connector) { | 31 void UtilityMojoMediaClient::Initialize(service_manager::Connector* connector) { |
| 31 InitializeMediaLibrary(); | 32 InitializeMediaLibrary(); |
| 32 } | 33 } |
| 33 | 34 |
| 34 scoped_refptr<AudioRendererSink> | 35 scoped_refptr<AudioRendererSink> |
| 35 UtilityMojoMediaClient::CreateAudioRendererSink( | 36 UtilityMojoMediaClient::CreateAudioRendererSink( |
| 36 const std::string& /* audio_device_id */) { | 37 const std::string& audio_device_id) { |
| 37 return new NullAudioSink(utility_task_runner_); | 38 return new MojoAudioRendererSinkAdapter(audio_device_id); |
| 38 } | 39 } |
| 39 | 40 |
| 40 std::unique_ptr<VideoRendererSink> | 41 std::unique_ptr<VideoRendererSink> |
| 41 UtilityMojoMediaClient::CreateVideoRendererSink( | 42 UtilityMojoMediaClient::CreateVideoRendererSink( |
| 42 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) { | 43 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) { |
| 43 return base::MakeUnique<MojoVideoRendererSinkAdapter>(task_runner); | 44 return base::MakeUnique<MojoVideoRendererSinkAdapter>(task_runner); |
| 44 } | 45 } |
| 45 | 46 |
| 46 std::unique_ptr<VideoDecoder> UtilityMojoMediaClient::CreateVideoDecoder( | 47 std::unique_ptr<VideoDecoder> UtilityMojoMediaClient::CreateVideoDecoder( |
| 47 scoped_refptr<base::SingleThreadTaskRunner> task_runner, | 48 scoped_refptr<base::SingleThreadTaskRunner> task_runner, |
| (...skipping 13 matching lines...) Expand all Loading... |
| 61 const scoped_refptr<MediaLog>& media_log) { | 62 const scoped_refptr<MediaLog>& media_log) { |
| 62 std::unique_ptr<VideoFrameProviderFactory> video_frame_provider_factory( | 63 std::unique_ptr<VideoFrameProviderFactory> video_frame_provider_factory( |
| 63 new MojoVideoFrameProviderFactory()); | 64 new MojoVideoFrameProviderFactory()); |
| 64 return base::MakeUnique<DefaultRendererFactory>( | 65 return base::MakeUnique<DefaultRendererFactory>( |
| 65 std::move(media_log), nullptr, | 66 std::move(media_log), nullptr, |
| 66 DefaultRendererFactory::GetGpuFactoriesCB(), | 67 DefaultRendererFactory::GetGpuFactoriesCB(), |
| 67 std::move(video_frame_provider_factory)); | 68 std::move(video_frame_provider_factory)); |
| 68 } | 69 } |
| 69 | 70 |
| 70 } // namespace media | 71 } // namespace media |
| OLD | NEW |