Chromium Code Reviews| 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 "media/mojo/services/mojo_media_client.h" | 5 #include "media/mojo/services/mojo_media_application.h" |
| 6 | 6 |
| 7 #include "base/macros.h" | 7 #include "base/macros.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "media/audio/audio_manager_base.h" | 9 #include "media/audio/audio_manager_base.h" |
| 10 #include "media/audio/audio_output_stream_sink.h" | 10 #include "media/audio/audio_output_stream_sink.h" |
| 11 #include "media/audio/fake_audio_log_factory.h" | 11 #include "media/audio/fake_audio_log_factory.h" |
| 12 #include "media/base/audio_hardware_config.h" | 12 #include "media/base/audio_hardware_config.h" |
| 13 #include "media/base/media.h" | 13 #include "media/base/media.h" |
| 14 #include "media/base/null_video_sink.h" | 14 #include "media/base/null_video_sink.h" |
| 15 #include "media/cdm/default_cdm_factory.h" | 15 #include "media/cdm/default_cdm_factory.h" |
| 16 #include "media/mojo/services/mojo_media_client.h" | |
| 16 #include "media/renderers/default_renderer_factory.h" | 17 #include "media/renderers/default_renderer_factory.h" |
| 17 #include "media/renderers/gpu_video_accelerator_factories.h" | 18 #include "media/renderers/gpu_video_accelerator_factories.h" |
| 18 | 19 |
| 19 namespace media { | 20 namespace media { |
| 20 | 21 |
| 21 namespace { | 22 namespace { |
| 22 class DefaultMojoMediaClient : public MojoMediaClient { | 23 class DefaultMojoMediaClient : public MojoMediaClient { |
| 23 public: | 24 public: |
| 24 DefaultMojoMediaClient() {} | 25 DefaultMojoMediaClient() {} |
| 25 | 26 |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 71 return make_scoped_ptr(new DefaultCdmFactory()); | 72 return make_scoped_ptr(new DefaultCdmFactory()); |
| 72 } | 73 } |
| 73 | 74 |
| 74 private: | 75 private: |
| 75 FakeAudioLogFactory fake_audio_log_factory_; | 76 FakeAudioLogFactory fake_audio_log_factory_; |
| 76 scoped_ptr<AudioHardwareConfig> audio_hardware_config_; | 77 scoped_ptr<AudioHardwareConfig> audio_hardware_config_; |
| 77 scoped_refptr<AudioRendererSink> audio_renderer_sink_; | 78 scoped_refptr<AudioRendererSink> audio_renderer_sink_; |
| 78 scoped_ptr<VideoRendererSink> video_renderer_sink_; | 79 scoped_ptr<VideoRendererSink> video_renderer_sink_; |
| 79 | 80 |
| 80 DISALLOW_COPY_AND_ASSIGN(DefaultMojoMediaClient); | 81 DISALLOW_COPY_AND_ASSIGN(DefaultMojoMediaClient); |
| 81 }; | 82 }; |
|
xhwang
2016/02/01 21:06:18
This file is more about implementing a MojoMediaCl
alokp
2016/02/01 23:17:59
Done.
| |
| 82 | 83 |
| 83 } // namespace (anonymous) | 84 } // namespace (anonymous) |
| 84 | 85 |
| 85 scoped_ptr<MojoMediaClient> MojoMediaClient::Create() { | 86 // static |
| 86 return make_scoped_ptr(new DefaultMojoMediaClient()); | 87 scoped_ptr<mojo::ApplicationDelegate> MojoMediaApplication::CreateApp() { |
| 88 return make_scoped_ptr( | |
| 89 new MojoMediaApplication(make_scoped_ptr(new DefaultMojoMediaClient()))); | |
| 87 } | 90 } |
| 88 | 91 |
| 89 } // namespace media | 92 } // namespace media |
| OLD | NEW |