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 "components/html_viewer/media_factory.h" | 5 #include "components/html_viewer/media_factory.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
73 media_thread_("Media"), | 73 media_thread_("Media"), |
74 audio_manager_(media::AudioManager::Create(&fake_audio_log_factory_)), | 74 audio_manager_(media::AudioManager::Create(&fake_audio_log_factory_)), |
75 audio_hardware_config_( | 75 audio_hardware_config_( |
76 audio_manager_->GetInputStreamParameters( | 76 audio_manager_->GetInputStreamParameters( |
77 media::AudioManagerBase::kDefaultDeviceId), | 77 media::AudioManagerBase::kDefaultDeviceId), |
78 audio_manager_->GetDefaultOutputStreamParameters()), | 78 audio_manager_->GetDefaultOutputStreamParameters()), |
79 #endif | 79 #endif |
80 enable_mojo_media_renderer_(base::CommandLine::ForCurrentProcess() | 80 enable_mojo_media_renderer_(base::CommandLine::ForCurrentProcess() |
81 ->HasSwitch(kEnableMojoMediaRenderer)), | 81 ->HasSwitch(kEnableMojoMediaRenderer)), |
82 compositor_task_runner_(compositor_task_runner) { | 82 compositor_task_runner_(compositor_task_runner) { |
83 if (!media::IsMediaLibraryInitialized()) { | 83 media::InitializeMediaLibrary(); |
84 base::FilePath module_dir; | |
85 CHECK(PathService::Get(base::DIR_EXE, &module_dir)); | |
86 CHECK(media::InitializeMediaLibrary(module_dir)); | |
87 } | |
88 } | 84 } |
89 | 85 |
90 MediaFactory::~MediaFactory() { | 86 MediaFactory::~MediaFactory() { |
91 } | 87 } |
92 | 88 |
93 blink::WebMediaPlayer* MediaFactory::CreateMediaPlayer( | 89 blink::WebMediaPlayer* MediaFactory::CreateMediaPlayer( |
94 blink::WebLocalFrame* frame, | 90 blink::WebLocalFrame* frame, |
95 const blink::WebURL& url, | 91 const blink::WebURL& url, |
96 blink::WebMediaPlayerClient* client, | 92 blink::WebMediaPlayerClient* client, |
97 blink::WebContentDecryptionModule* initial_cdm, | 93 blink::WebContentDecryptionModule* initial_cdm, |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
167 scoped_refptr<base::SingleThreadTaskRunner> | 163 scoped_refptr<base::SingleThreadTaskRunner> |
168 MediaFactory::GetMediaThreadTaskRunner() { | 164 MediaFactory::GetMediaThreadTaskRunner() { |
169 if (!media_thread_.IsRunning()) | 165 if (!media_thread_.IsRunning()) |
170 media_thread_.Start(); | 166 media_thread_.Start(); |
171 | 167 |
172 return media_thread_.message_loop_proxy(); | 168 return media_thread_.message_loop_proxy(); |
173 } | 169 } |
174 #endif // !defined(OS_ANDROID) | 170 #endif // !defined(OS_ANDROID) |
175 | 171 |
176 } // namespace html_viewer | 172 } // namespace html_viewer |
OLD | NEW |