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

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

Issue 1942803002: Caching AudioOutputDevice instances in mixer manager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make WebAudioSourceProvider to always return real sink info reguardless the client - to avoid behavior change. Created 4 years, 6 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
« no previous file with comments | « media/mojo/services/test_mojo_media_client.h ('k') | media/renderers/audio_renderer_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/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 21 matching lines...) Expand all
32 // across multiple threads... 32 // across multiple threads...
33 AudioManager* audio_manager = AudioManager::Get(); 33 AudioManager* audio_manager = AudioManager::Get();
34 if (!audio_manager) { 34 if (!audio_manager) {
35 audio_manager_ = media::AudioManager::CreateForTesting( 35 audio_manager_ = media::AudioManager::CreateForTesting(
36 base::ThreadTaskRunnerHandle::Get()); 36 base::ThreadTaskRunnerHandle::Get());
37 audio_manager = audio_manager_.get(); 37 audio_manager = audio_manager_.get();
38 // Flush the message loop to ensure that the audio manager is initialized. 38 // Flush the message loop to ensure that the audio manager is initialized.
39 base::RunLoop().RunUntilIdle(); 39 base::RunLoop().RunUntilIdle();
40 } 40 }
41 41
42 audio_hardware_config_.reset(new AudioHardwareConfig(
43 audio_manager->GetInputStreamParameters(
44 AudioDeviceDescription::kDefaultDeviceId),
45 audio_manager->GetDefaultOutputStreamParameters()));
46 } 42 }
47 43
48 void TestMojoMediaClient::WillQuit() { 44 void TestMojoMediaClient::WillQuit() {
49 DVLOG(1) << __FUNCTION__; 45 DVLOG(1) << __FUNCTION__;
50 // AudioManager destructor requires MessageLoop. 46 // AudioManager destructor requires MessageLoop.
51 // Destroy it before the message loop goes away. 47 // Destroy it before the message loop goes away.
52 audio_manager_.reset(); 48 audio_manager_.reset();
53 // Flush the message loop to ensure that the audio manager is destroyed. 49 // Flush the message loop to ensure that the audio manager is destroyed.
54 base::RunLoop().RunUntilIdle(); 50 base::RunLoop().RunUntilIdle();
55 } 51 }
56 52
57 std::unique_ptr<RendererFactory> TestMojoMediaClient::CreateRendererFactory( 53 std::unique_ptr<RendererFactory> TestMojoMediaClient::CreateRendererFactory(
58 const scoped_refptr<MediaLog>& media_log) { 54 const scoped_refptr<MediaLog>& media_log) {
59 DVLOG(1) << __FUNCTION__; 55 DVLOG(1) << __FUNCTION__;
60 return base::WrapUnique(new DefaultRendererFactory( 56 return base::WrapUnique(new DefaultRendererFactory(
61 media_log, nullptr, DefaultRendererFactory::GetGpuFactoriesCB(), 57 media_log, nullptr, DefaultRendererFactory::GetGpuFactoriesCB()));
62 *audio_hardware_config_));
63 } 58 }
64 59
65 AudioRendererSink* TestMojoMediaClient::CreateAudioRendererSink() { 60 AudioRendererSink* TestMojoMediaClient::CreateAudioRendererSink() {
66 if (!audio_renderer_sink_) 61 if (!audio_renderer_sink_)
67 audio_renderer_sink_ = new AudioOutputStreamSink(); 62 audio_renderer_sink_ = new AudioOutputStreamSink();
68 63
69 return audio_renderer_sink_.get(); 64 return audio_renderer_sink_.get();
70 } 65 }
71 66
72 VideoRendererSink* TestMojoMediaClient::CreateVideoRendererSink( 67 VideoRendererSink* TestMojoMediaClient::CreateVideoRendererSink(
73 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) { 68 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) {
74 if (!video_renderer_sink_) { 69 if (!video_renderer_sink_) {
75 video_renderer_sink_ = base::WrapUnique( 70 video_renderer_sink_ = base::WrapUnique(
76 new NullVideoSink(false, base::TimeDelta::FromSecondsD(1.0 / 60), 71 new NullVideoSink(false, base::TimeDelta::FromSecondsD(1.0 / 60),
77 NullVideoSink::NewFrameCB(), task_runner)); 72 NullVideoSink::NewFrameCB(), task_runner));
78 } 73 }
79 74
80 return video_renderer_sink_.get(); 75 return video_renderer_sink_.get();
81 } 76 }
82 77
83 std::unique_ptr<CdmFactory> TestMojoMediaClient::CreateCdmFactory( 78 std::unique_ptr<CdmFactory> TestMojoMediaClient::CreateCdmFactory(
84 shell::mojom::InterfaceProvider* /* interface_provider */) { 79 shell::mojom::InterfaceProvider* /* interface_provider */) {
85 DVLOG(1) << __FUNCTION__; 80 DVLOG(1) << __FUNCTION__;
86 return base::WrapUnique(new DefaultCdmFactory()); 81 return base::WrapUnique(new DefaultCdmFactory());
87 } 82 }
88 83
89 } // namespace media 84 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/test_mojo_media_client.h ('k') | media/renderers/audio_renderer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698