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/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
10 #include "base/threading/thread_task_runner_handle.h" | 10 #include "base/threading/thread_task_runner_handle.h" |
11 #include "media/audio/audio_device_description.h" | 11 #include "media/audio/audio_device_description.h" |
12 #include "media/audio/audio_manager.h" | 12 #include "media/audio/audio_manager.h" |
13 #include "media/audio/audio_output_stream_sink.h" | 13 #include "media/audio/audio_output_stream_sink.h" |
| 14 #include "media/audio/audio_thread_impl.h" |
14 #include "media/base/cdm_factory.h" | 15 #include "media/base/cdm_factory.h" |
15 #include "media/base/media.h" | 16 #include "media/base/media.h" |
16 #include "media/base/media_log.h" | 17 #include "media/base/media_log.h" |
17 #include "media/base/null_video_sink.h" | 18 #include "media/base/null_video_sink.h" |
18 #include "media/base/renderer_factory.h" | 19 #include "media/base/renderer_factory.h" |
19 #include "media/cdm/default_cdm_factory.h" | 20 #include "media/cdm/default_cdm_factory.h" |
20 #include "media/renderers/default_renderer_factory.h" | 21 #include "media/renderers/default_renderer_factory.h" |
21 #include "media/renderers/gpu_video_accelerator_factories.h" | 22 #include "media/renderers/gpu_video_accelerator_factories.h" |
22 | 23 |
23 namespace media { | 24 namespace media { |
(...skipping 11 matching lines...) Expand all Loading... |
35 | 36 |
36 void TestMojoMediaClient::Initialize( | 37 void TestMojoMediaClient::Initialize( |
37 service_manager::Connector* /* connector */) { | 38 service_manager::Connector* /* connector */) { |
38 InitializeMediaLibrary(); | 39 InitializeMediaLibrary(); |
39 // TODO(dalecurtis): We should find a single owner per process for the audio | 40 // TODO(dalecurtis): We should find a single owner per process for the audio |
40 // manager or make it a lazy instance. It's not safe to call Get()/Create() | 41 // manager or make it a lazy instance. It's not safe to call Get()/Create() |
41 // across multiple threads... | 42 // across multiple threads... |
42 AudioManager* audio_manager = AudioManager::Get(); | 43 AudioManager* audio_manager = AudioManager::Get(); |
43 if (!audio_manager) { | 44 if (!audio_manager) { |
44 audio_manager_ = media::AudioManager::CreateForTesting( | 45 audio_manager_ = media::AudioManager::CreateForTesting( |
45 base::ThreadTaskRunnerHandle::Get()); | 46 base::MakeUnique<AudioThreadImpl>()); |
46 audio_manager = audio_manager_.get(); | 47 audio_manager = audio_manager_.get(); |
47 // Flush the message loop to ensure that the audio manager is initialized. | 48 // Flush the message loop to ensure that the audio manager is initialized. |
48 base::RunLoop().RunUntilIdle(); | 49 base::RunLoop().RunUntilIdle(); |
49 } | 50 } |
50 } | 51 } |
51 | 52 |
52 scoped_refptr<AudioRendererSink> TestMojoMediaClient::CreateAudioRendererSink( | 53 scoped_refptr<AudioRendererSink> TestMojoMediaClient::CreateAudioRendererSink( |
53 const std::string& /* audio_device_id */) { | 54 const std::string& /* audio_device_id */) { |
54 return new AudioOutputStreamSink(); | 55 return new AudioOutputStreamSink(); |
55 } | 56 } |
(...skipping 11 matching lines...) Expand all Loading... |
67 media_log, nullptr, DefaultRendererFactory::GetGpuFactoriesCB()); | 68 media_log, nullptr, DefaultRendererFactory::GetGpuFactoriesCB()); |
68 } | 69 } |
69 | 70 |
70 std::unique_ptr<CdmFactory> TestMojoMediaClient::CreateCdmFactory( | 71 std::unique_ptr<CdmFactory> TestMojoMediaClient::CreateCdmFactory( |
71 service_manager::mojom::InterfaceProvider* /* host_interfaces */) { | 72 service_manager::mojom::InterfaceProvider* /* host_interfaces */) { |
72 DVLOG(1) << __func__; | 73 DVLOG(1) << __func__; |
73 return base::MakeUnique<DefaultCdmFactory>(); | 74 return base::MakeUnique<DefaultCdmFactory>(); |
74 } | 75 } |
75 | 76 |
76 } // namespace media | 77 } // namespace media |
OLD | NEW |