| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/test_mojo_media_client.h" | 5 #include "media/mojo/services/test_mojo_media_client.h" |
| 6 | 6 |
| 7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
| 8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
| 9 #include "base/threading/thread_task_runner_handle.h" | 9 #include "base/threading/thread_task_runner_handle.h" |
| 10 #include "media/audio/audio_device_description.h" | 10 #include "media/audio/audio_device_description.h" |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 } | 55 } |
| 56 | 56 |
| 57 std::unique_ptr<RendererFactory> TestMojoMediaClient::CreateRendererFactory( | 57 std::unique_ptr<RendererFactory> TestMojoMediaClient::CreateRendererFactory( |
| 58 const scoped_refptr<MediaLog>& media_log) { | 58 const scoped_refptr<MediaLog>& media_log) { |
| 59 DVLOG(1) << __FUNCTION__; | 59 DVLOG(1) << __FUNCTION__; |
| 60 return base::WrapUnique(new DefaultRendererFactory( | 60 return base::WrapUnique(new DefaultRendererFactory( |
| 61 media_log, nullptr, DefaultRendererFactory::GetGpuFactoriesCB(), | 61 media_log, nullptr, DefaultRendererFactory::GetGpuFactoriesCB(), |
| 62 *audio_hardware_config_)); | 62 *audio_hardware_config_)); |
| 63 } | 63 } |
| 64 | 64 |
| 65 AudioRendererSink* TestMojoMediaClient::CreateAudioRendererSink() { | 65 AudioRendererSink* TestMojoMediaClient::CreateAudioRendererSink( |
| 66 const std::string& device_id) { |
| 66 if (!audio_renderer_sink_) | 67 if (!audio_renderer_sink_) |
| 67 audio_renderer_sink_ = new AudioOutputStreamSink(); | 68 audio_renderer_sink_ = new AudioOutputStreamSink(); |
| 68 | 69 |
| 69 return audio_renderer_sink_.get(); | 70 return audio_renderer_sink_.get(); |
| 70 } | 71 } |
| 71 | 72 |
| 72 VideoRendererSink* TestMojoMediaClient::CreateVideoRendererSink( | 73 VideoRendererSink* TestMojoMediaClient::CreateVideoRendererSink( |
| 73 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) { | 74 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) { |
| 74 if (!video_renderer_sink_) { | 75 if (!video_renderer_sink_) { |
| 75 video_renderer_sink_ = base::WrapUnique( | 76 video_renderer_sink_ = base::WrapUnique( |
| 76 new NullVideoSink(false, base::TimeDelta::FromSecondsD(1.0 / 60), | 77 new NullVideoSink(false, base::TimeDelta::FromSecondsD(1.0 / 60), |
| 77 NullVideoSink::NewFrameCB(), task_runner)); | 78 NullVideoSink::NewFrameCB(), task_runner)); |
| 78 } | 79 } |
| 79 | 80 |
| 80 return video_renderer_sink_.get(); | 81 return video_renderer_sink_.get(); |
| 81 } | 82 } |
| 82 | 83 |
| 83 std::unique_ptr<CdmFactory> TestMojoMediaClient::CreateCdmFactory( | 84 std::unique_ptr<CdmFactory> TestMojoMediaClient::CreateCdmFactory( |
| 84 shell::mojom::InterfaceProvider* /* interface_provider */) { | 85 shell::mojom::InterfaceProvider* /* interface_provider */) { |
| 85 DVLOG(1) << __FUNCTION__; | 86 DVLOG(1) << __FUNCTION__; |
| 86 return base::WrapUnique(new DefaultCdmFactory()); | 87 return base::WrapUnique(new DefaultCdmFactory()); |
| 87 } | 88 } |
| 88 | 89 |
| 89 } // namespace media | 90 } // namespace media |
| OLD | NEW |