| 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/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 8 #include "media/audio/audio_manager_base.h" | 8 #include "media/audio/audio_manager_base.h" |
| 9 #include "media/audio/audio_output_stream_sink.h" | 9 #include "media/audio/audio_output_stream_sink.h" |
| 10 #include "media/audio/fake_audio_log_factory.h" | 10 #include "media/audio/fake_audio_log_factory.h" |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) override { | 52 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) override { |
| 53 return make_scoped_ptr( | 53 return make_scoped_ptr( |
| 54 new NullVideoSink(false, base::TimeDelta::FromSecondsD(1.0 / 60), | 54 new NullVideoSink(false, base::TimeDelta::FromSecondsD(1.0 / 60), |
| 55 NullVideoSink::NewFrameCB(), task_runner)); | 55 NullVideoSink::NewFrameCB(), task_runner)); |
| 56 } | 56 } |
| 57 | 57 |
| 58 const AudioHardwareConfig* GetAudioHardwareConfig() override { | 58 const AudioHardwareConfig* GetAudioHardwareConfig() override { |
| 59 return audio_hardware_config_.get(); | 59 return audio_hardware_config_.get(); |
| 60 } | 60 } |
| 61 | 61 |
| 62 scoped_ptr<CdmFactory> CreateCdmFactory() override { | 62 scoped_ptr<CdmFactory> CreateCdmFactory( |
| 63 mojo::ServiceProvider* /* service_provider */) override { |
| 63 return make_scoped_ptr(new DefaultCdmFactory()); | 64 return make_scoped_ptr(new DefaultCdmFactory()); |
| 64 } | 65 } |
| 65 | 66 |
| 66 private: | 67 private: |
| 67 FakeAudioLogFactory fake_audio_log_factory_; | 68 FakeAudioLogFactory fake_audio_log_factory_; |
| 68 scoped_ptr<AudioHardwareConfig> audio_hardware_config_; | 69 scoped_ptr<AudioHardwareConfig> audio_hardware_config_; |
| 69 | 70 |
| 70 DISALLOW_COPY_AND_ASSIGN(DefaultMojoMediaClient); | 71 DISALLOW_COPY_AND_ASSIGN(DefaultMojoMediaClient); |
| 71 }; | 72 }; |
| 72 | 73 |
| 73 scoped_ptr<PlatformMojoMediaClient> CreatePlatformMojoMediaClient() { | 74 scoped_ptr<PlatformMojoMediaClient> CreatePlatformMojoMediaClient() { |
| 74 return make_scoped_ptr(new DefaultMojoMediaClient()); | 75 return make_scoped_ptr(new DefaultMojoMediaClient()); |
| 75 } | 76 } |
| 76 | 77 |
| 77 } // namespace internal | 78 } // namespace internal |
| 78 } // namespace media | 79 } // namespace media |
| OLD | NEW |