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

Side by Side Diff: mojo/services/html_viewer/webmediaplayer_factory.cc

Issue 795193003: Introduce MojoRendererFactory::ServiceProvider. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: git cl format Created 6 years 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 "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"
11 #include "media/audio/audio_manager.h" 11 #include "media/audio/audio_manager.h"
12 #include "media/audio/audio_manager_base.h" 12 #include "media/audio/audio_manager_base.h"
13 #include "media/audio/audio_output_stream_sink.h" 13 #include "media/audio/audio_output_stream_sink.h"
14 #include "media/base/audio_hardware_config.h" 14 #include "media/base/audio_hardware_config.h"
15 #include "media/base/media.h" 15 #include "media/base/media.h"
16 #include "media/base/media_log.h" 16 #include "media/base/media_log.h"
17 #include "media/blink/webmediaplayer_impl.h" 17 #include "media/blink/webmediaplayer_impl.h"
18 #include "media/blink/webmediaplayer_params.h" 18 #include "media/blink/webmediaplayer_params.h"
19 #include "media/filters/default_renderer_factory.h" 19 #include "media/filters/default_renderer_factory.h"
20 #include "media/filters/gpu_video_accelerator_factories.h" 20 #include "media/filters/gpu_video_accelerator_factories.h"
21 #include "media/mojo/interfaces/media_renderer.mojom.h" 21 #include "media/mojo/interfaces/media_renderer.mojom.h"
22 #include "media/mojo/services/mojo_renderer_factory.h" 22 #include "media/mojo/services/mojo_renderer_factory.h"
23 #include "mojo/public/cpp/application/connect.h" 23 #include "mojo/public/cpp/application/connect.h"
24 #include "mojo/public/interfaces/application/shell.mojom.h" 24 #include "mojo/public/interfaces/application/shell.mojom.h"
25 25
26 namespace mojo { 26 namespace mojo {
27 27
28 #if !defined(OS_ANDROID)
29 namespace {
30
31 class RendererServiceProvider
32 : public media::MojoRendererFactory::ServiceProvider {
33 public:
34 RendererServiceProvider(ServiceProviderPtr service_provider_ptr);
jamesr 2014/12/16 01:47:37 explicit
xhwang 2014/12/16 05:05:11 Done.
35 ~RendererServiceProvider() final;
36 void ConnectToService(
37 mojo::InterfacePtr<mojo::MediaRenderer>* media_renderer_ptr) final;
jamesr 2014/12/16 01:47:37 this code is in namespace mojo, you can drop all t
xhwang 2014/12/16 05:05:11 Done.
38
39 private:
40 ServiceProviderPtr service_provider_ptr_;
41
42 DISALLOW_COPY_AND_ASSIGN(RendererServiceProvider);
43 };
44
45 RendererServiceProvider::RendererServiceProvider(
jamesr 2014/12/16 01:47:37 i would just inline these
xhwang 2014/12/16 05:05:11 Done.
46 ServiceProviderPtr service_provider_ptr)
47 : service_provider_ptr_(service_provider_ptr.Pass()) {
48 }
49
50 RendererServiceProvider::~RendererServiceProvider() {
51 }
52
53 void RendererServiceProvider::ConnectToService(
54 mojo::InterfacePtr<mojo::MediaRenderer>* media_renderer_ptr) {
55 mojo::ConnectToService(service_provider_ptr_.get(), media_renderer_ptr);
56 }
57
58 } // namespace
59 #endif
60
28 WebMediaPlayerFactory::WebMediaPlayerFactory( 61 WebMediaPlayerFactory::WebMediaPlayerFactory(
29 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner, 62 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner,
30 bool enable_mojo_media_renderer) 63 bool enable_mojo_media_renderer)
31 : compositor_task_runner_(compositor_task_runner), 64 : compositor_task_runner_(compositor_task_runner),
32 enable_mojo_media_renderer_(enable_mojo_media_renderer), 65 enable_mojo_media_renderer_(enable_mojo_media_renderer),
33 media_thread_("Media"), 66 media_thread_("Media"),
34 audio_manager_(media::AudioManager::Create(&fake_audio_log_factory_)), 67 audio_manager_(media::AudioManager::Create(&fake_audio_log_factory_)),
35 audio_hardware_config_( 68 audio_hardware_config_(
36 audio_manager_->GetInputStreamParameters( 69 audio_manager_->GetInputStreamParameters(
37 media::AudioManagerBase::kDefaultDeviceId), 70 media::AudioManagerBase::kDefaultDeviceId),
(...skipping 17 matching lines...) Expand all
55 #if defined(OS_ANDROID) 88 #if defined(OS_ANDROID)
56 return nullptr; 89 return nullptr;
57 #else 90 #else
58 scoped_refptr<media::MediaLog> media_log(new media::MediaLog()); 91 scoped_refptr<media::MediaLog> media_log(new media::MediaLog());
59 scoped_ptr<media::RendererFactory> media_renderer_factory; 92 scoped_ptr<media::RendererFactory> media_renderer_factory;
60 93
61 if (enable_mojo_media_renderer_) { 94 if (enable_mojo_media_renderer_) {
62 ServiceProviderPtr media_renderer_service_provider; 95 ServiceProviderPtr media_renderer_service_provider;
63 shell->ConnectToApplication("mojo:media", 96 shell->ConnectToApplication("mojo:media",
64 GetProxy(&media_renderer_service_provider)); 97 GetProxy(&media_renderer_service_provider));
65 media_renderer_factory.reset( 98 media_renderer_factory.reset(new media::MojoRendererFactory(
66 new media::MojoRendererFactory(media_renderer_service_provider.Pass())); 99 scoped_ptr<media::MojoRendererFactory::ServiceProvider>(
jamesr 2014/12/16 01:47:37 you don't need to spell this type out again. just
xhwang 2014/12/16 05:05:11 Good to know. Thanks!
100 new RendererServiceProvider(
101 media_renderer_service_provider.Pass()))));
67 } else { 102 } else {
68 media_renderer_factory.reset( 103 media_renderer_factory.reset(
69 new media::DefaultRendererFactory(media_log, 104 new media::DefaultRendererFactory(media_log,
70 nullptr, // No GPU factory. 105 nullptr, // No GPU factory.
71 GetAudioHardwareConfig())); 106 GetAudioHardwareConfig()));
72 } 107 }
73 108
74 media::WebMediaPlayerParams params( 109 media::WebMediaPlayerParams params(
75 media::WebMediaPlayerParams::DeferLoadCB(), CreateAudioRendererSink(), 110 media::WebMediaPlayerParams::DeferLoadCB(), CreateAudioRendererSink(),
76 media_log, GetMediaThreadTaskRunner(), compositor_task_runner_, nullptr); 111 media_log, GetMediaThreadTaskRunner(), compositor_task_runner_, nullptr);
(...skipping 19 matching lines...) Expand all
96 131
97 scoped_refptr<base::SingleThreadTaskRunner> 132 scoped_refptr<base::SingleThreadTaskRunner>
98 WebMediaPlayerFactory::GetMediaThreadTaskRunner() { 133 WebMediaPlayerFactory::GetMediaThreadTaskRunner() {
99 if (!media_thread_.IsRunning()) 134 if (!media_thread_.IsRunning())
100 media_thread_.Start(); 135 media_thread_.Start();
101 136
102 return media_thread_.message_loop_proxy(); 137 return media_thread_.message_loop_proxy();
103 } 138 }
104 139
105 } // namespace mojo 140 } // namespace mojo
OLDNEW
« media/mojo/services/mojo_renderer_factory.h ('K') | « media/mojo/services/mojo_renderer_factory.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698