Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(45)

Side by Side Diff: media/mojo/services/test_mojo_media_client.cc

Issue 1806313003: Pass task runners to AudioManager constructor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removed AudioManagerBase::Shutdown Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/thread_task_runner_handle.h"
8 #include "media/audio/audio_manager_base.h" 9 #include "media/audio/audio_manager_base.h"
9 #include "media/audio/audio_output_stream_sink.h" 10 #include "media/audio/audio_output_stream_sink.h"
10 #include "media/base/audio_hardware_config.h" 11 #include "media/base/audio_hardware_config.h"
11 #include "media/base/media.h" 12 #include "media/base/media.h"
12 #include "media/base/null_video_sink.h" 13 #include "media/base/null_video_sink.h"
13 #include "media/cdm/default_cdm_factory.h" 14 #include "media/cdm/default_cdm_factory.h"
14 #include "media/renderers/default_renderer_factory.h" 15 #include "media/renderers/default_renderer_factory.h"
15 #include "media/renderers/gpu_video_accelerator_factories.h" 16 #include "media/renderers/gpu_video_accelerator_factories.h"
16 17
17 namespace media { 18 namespace media {
18 19
19 TestMojoMediaClient::TestMojoMediaClient() {} 20 TestMojoMediaClient::TestMojoMediaClient() {}
20 21
21 TestMojoMediaClient::~TestMojoMediaClient() {} 22 TestMojoMediaClient::~TestMojoMediaClient() {}
22 23
23 void TestMojoMediaClient::Initialize() { 24 void TestMojoMediaClient::Initialize() {
24 InitializeMediaLibrary(); 25 InitializeMediaLibrary();
25 // TODO(dalecurtis): We should find a single owner per process for the audio 26 // TODO(dalecurtis): We should find a single owner per process for the audio
26 // manager or make it a lazy instance. It's not safe to call Get()/Create() 27 // manager or make it a lazy instance. It's not safe to call Get()/Create()
27 // across multiple threads... 28 // across multiple threads...
28 //
29 // TODO(dalecurtis): Eventually we'll want something other than a fake audio
30 // log factory here too. We should probably at least DVLOG() such info.
31 AudioManager* audio_manager = AudioManager::Get(); 29 AudioManager* audio_manager = AudioManager::Get();
32 if (!audio_manager) 30 if (!audio_manager) {
33 audio_manager = media::AudioManager::Create(&fake_audio_log_factory_); 31 audio_manager_ = media::AudioManager::CreateForTesting(
32 base::ThreadTaskRunnerHandle::Get());
33 audio_manager = audio_manager_.get();
34 }
34 35
35 audio_hardware_config_.reset(new AudioHardwareConfig( 36 audio_hardware_config_.reset(new AudioHardwareConfig(
36 audio_manager->GetInputStreamParameters( 37 audio_manager->GetInputStreamParameters(
37 AudioManagerBase::kDefaultDeviceId), 38 AudioManagerBase::kDefaultDeviceId),
38 audio_manager->GetDefaultOutputStreamParameters())); 39 audio_manager->GetDefaultOutputStreamParameters()));
39 } 40 }
40 41
41 std::unique_ptr<RendererFactory> TestMojoMediaClient::CreateRendererFactory( 42 std::unique_ptr<RendererFactory> TestMojoMediaClient::CreateRendererFactory(
42 const scoped_refptr<MediaLog>& media_log) { 43 const scoped_refptr<MediaLog>& media_log) {
43 DVLOG(1) << __FUNCTION__; 44 DVLOG(1) << __FUNCTION__;
(...skipping 20 matching lines...) Expand all
64 return video_renderer_sink_.get(); 65 return video_renderer_sink_.get();
65 } 66 }
66 67
67 std::unique_ptr<CdmFactory> TestMojoMediaClient::CreateCdmFactory( 68 std::unique_ptr<CdmFactory> TestMojoMediaClient::CreateCdmFactory(
68 mojo::shell::mojom::InterfaceProvider* /* interface_provider */) { 69 mojo::shell::mojom::InterfaceProvider* /* interface_provider */) {
69 DVLOG(1) << __FUNCTION__; 70 DVLOG(1) << __FUNCTION__;
70 return base::WrapUnique(new DefaultCdmFactory()); 71 return base::WrapUnique(new DefaultCdmFactory());
71 } 72 }
72 73
73 } // namespace media 74 } // namespace media
OLDNEW
« media/audio/mac/audio_manager_mac.cc ('K') | « media/mojo/services/test_mojo_media_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698