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_client.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" |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 if (!video_renderer_sink_) { | 60 if (!video_renderer_sink_) { |
61 video_renderer_sink_ = make_scoped_ptr( | 61 video_renderer_sink_ = make_scoped_ptr( |
62 new NullVideoSink(false, base::TimeDelta::FromSecondsD(1.0 / 60), | 62 new NullVideoSink(false, base::TimeDelta::FromSecondsD(1.0 / 60), |
63 NullVideoSink::NewFrameCB(), task_runner)); | 63 NullVideoSink::NewFrameCB(), task_runner)); |
64 } | 64 } |
65 | 65 |
66 return video_renderer_sink_.get(); | 66 return video_renderer_sink_.get(); |
67 } | 67 } |
68 | 68 |
69 scoped_ptr<CdmFactory> CreateCdmFactory( | 69 scoped_ptr<CdmFactory> CreateCdmFactory( |
70 mojo::InterfaceProvider* /* service_provider */) override { | 70 mojo::shell::mojom::InterfaceProvider* /* service_provider */) override { |
71 return make_scoped_ptr(new DefaultCdmFactory()); | 71 return make_scoped_ptr(new DefaultCdmFactory()); |
72 } | 72 } |
73 | 73 |
74 private: | 74 private: |
75 FakeAudioLogFactory fake_audio_log_factory_; | 75 FakeAudioLogFactory fake_audio_log_factory_; |
76 scoped_ptr<AudioHardwareConfig> audio_hardware_config_; | 76 scoped_ptr<AudioHardwareConfig> audio_hardware_config_; |
77 scoped_refptr<AudioRendererSink> audio_renderer_sink_; | 77 scoped_refptr<AudioRendererSink> audio_renderer_sink_; |
78 scoped_ptr<VideoRendererSink> video_renderer_sink_; | 78 scoped_ptr<VideoRendererSink> video_renderer_sink_; |
79 | 79 |
80 DISALLOW_COPY_AND_ASSIGN(DefaultMojoMediaClient); | 80 DISALLOW_COPY_AND_ASSIGN(DefaultMojoMediaClient); |
81 }; | 81 }; |
82 | 82 |
83 } // namespace (anonymous) | 83 } // namespace (anonymous) |
84 | 84 |
85 scoped_ptr<MojoMediaClient> MojoMediaClient::Create() { | 85 scoped_ptr<MojoMediaClient> MojoMediaClient::Create() { |
86 return make_scoped_ptr(new DefaultMojoMediaClient()); | 86 return make_scoped_ptr(new DefaultMojoMediaClient()); |
87 } | 87 } |
88 | 88 |
89 } // namespace media | 89 } // namespace media |
OLD | NEW |