| 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 "mojo/services/html_viewer/webmediaplayer_factory.h" | 5 #include "mojo/services/html_viewer/webmediaplayer_factory.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
| 9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
| 10 #include "base/threading/thread.h" | 10 #include "base/threading/thread.h" |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 const blink::WebURL& url, | 50 const blink::WebURL& url, |
| 51 blink::WebMediaPlayerClient* client, | 51 blink::WebMediaPlayerClient* client, |
| 52 Shell* shell) { | 52 Shell* shell) { |
| 53 #if defined(OS_ANDROID) | 53 #if defined(OS_ANDROID) |
| 54 return NULL; | 54 return NULL; |
| 55 #else | 55 #else |
| 56 scoped_ptr<media::Renderer> renderer; | 56 scoped_ptr<media::Renderer> renderer; |
| 57 | 57 |
| 58 if (enable_mojo_media_renderer_) { | 58 if (enable_mojo_media_renderer_) { |
| 59 ServiceProviderPtr media_renderer_service_provider; | 59 ServiceProviderPtr media_renderer_service_provider; |
| 60 shell->ConnectToApplication("mojo:mojo_media_renderer_app", | 60 shell->ConnectToApplication("mojo:media", |
| 61 GetProxy(&media_renderer_service_provider)); | 61 GetProxy(&media_renderer_service_provider)); |
| 62 renderer.reset(new media::MojoRendererImpl( | 62 renderer.reset(new media::MojoRendererImpl( |
| 63 GetMediaThreadTaskRunner(), media_renderer_service_provider.get())); | 63 GetMediaThreadTaskRunner(), media_renderer_service_provider.get())); |
| 64 } | 64 } |
| 65 | 65 |
| 66 media::WebMediaPlayerParams params( | 66 media::WebMediaPlayerParams params( |
| 67 media::WebMediaPlayerParams::DeferLoadCB(), | 67 media::WebMediaPlayerParams::DeferLoadCB(), |
| 68 CreateAudioRendererSink(), | 68 CreateAudioRendererSink(), |
| 69 GetAudioHardwareConfig(), | 69 GetAudioHardwareConfig(), |
| 70 new media::MediaLog(), | 70 new media::MediaLog(), |
| (...skipping 23 matching lines...) Expand all Loading... |
| 94 | 94 |
| 95 scoped_refptr<base::SingleThreadTaskRunner> | 95 scoped_refptr<base::SingleThreadTaskRunner> |
| 96 WebMediaPlayerFactory::GetMediaThreadTaskRunner() { | 96 WebMediaPlayerFactory::GetMediaThreadTaskRunner() { |
| 97 if (!media_thread_.IsRunning()) | 97 if (!media_thread_.IsRunning()) |
| 98 media_thread_.Start(); | 98 media_thread_.Start(); |
| 99 | 99 |
| 100 return media_thread_.message_loop_proxy(); | 100 return media_thread_.message_loop_proxy(); |
| 101 } | 101 } |
| 102 | 102 |
| 103 } // namespace mojo | 103 } // namespace mojo |
| OLD | NEW |