| 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/test_mojo_media_client.h" | 5 #include "media/mojo/services/test_mojo_media_client.h" |
| 6 | 6 |
| 7 #include "media/audio/audio_manager_base.h" | 7 #include "media/audio/audio_manager_base.h" |
| 8 #include "media/audio/audio_output_stream_sink.h" | 8 #include "media/audio/audio_output_stream_sink.h" |
| 9 #include "media/base/audio_hardware_config.h" | 9 #include "media/base/audio_hardware_config.h" |
| 10 #include "media/base/media.h" | 10 #include "media/base/media.h" |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 | 33 |
| 34 audio_hardware_config_.reset(new AudioHardwareConfig( | 34 audio_hardware_config_.reset(new AudioHardwareConfig( |
| 35 audio_manager->GetInputStreamParameters( | 35 audio_manager->GetInputStreamParameters( |
| 36 AudioManagerBase::kDefaultDeviceId), | 36 AudioManagerBase::kDefaultDeviceId), |
| 37 audio_manager->GetDefaultOutputStreamParameters())); | 37 audio_manager->GetDefaultOutputStreamParameters())); |
| 38 } | 38 } |
| 39 | 39 |
| 40 scoped_ptr<RendererFactory> TestMojoMediaClient::CreateRendererFactory( | 40 scoped_ptr<RendererFactory> TestMojoMediaClient::CreateRendererFactory( |
| 41 const scoped_refptr<MediaLog>& media_log) { | 41 const scoped_refptr<MediaLog>& media_log) { |
| 42 DVLOG(1) << __FUNCTION__; | 42 DVLOG(1) << __FUNCTION__; |
| 43 return make_scoped_ptr(new DefaultRendererFactory(media_log, nullptr, nullptr, | 43 return make_scoped_ptr(new DefaultRendererFactory( |
| 44 *audio_hardware_config_)); | 44 media_log, nullptr, DefaultRendererFactory::GetGpuFactoriesCB(), |
| 45 *audio_hardware_config_)); |
| 45 } | 46 } |
| 46 | 47 |
| 47 AudioRendererSink* TestMojoMediaClient::CreateAudioRendererSink() { | 48 AudioRendererSink* TestMojoMediaClient::CreateAudioRendererSink() { |
| 48 if (!audio_renderer_sink_) | 49 if (!audio_renderer_sink_) |
| 49 audio_renderer_sink_ = new AudioOutputStreamSink(); | 50 audio_renderer_sink_ = new AudioOutputStreamSink(); |
| 50 | 51 |
| 51 return audio_renderer_sink_.get(); | 52 return audio_renderer_sink_.get(); |
| 52 } | 53 } |
| 53 | 54 |
| 54 VideoRendererSink* TestMojoMediaClient::CreateVideoRendererSink( | 55 VideoRendererSink* TestMojoMediaClient::CreateVideoRendererSink( |
| 55 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) { | 56 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) { |
| 56 if (!video_renderer_sink_) { | 57 if (!video_renderer_sink_) { |
| 57 video_renderer_sink_ = make_scoped_ptr( | 58 video_renderer_sink_ = make_scoped_ptr( |
| 58 new NullVideoSink(false, base::TimeDelta::FromSecondsD(1.0 / 60), | 59 new NullVideoSink(false, base::TimeDelta::FromSecondsD(1.0 / 60), |
| 59 NullVideoSink::NewFrameCB(), task_runner)); | 60 NullVideoSink::NewFrameCB(), task_runner)); |
| 60 } | 61 } |
| 61 | 62 |
| 62 return video_renderer_sink_.get(); | 63 return video_renderer_sink_.get(); |
| 63 } | 64 } |
| 64 | 65 |
| 65 scoped_ptr<CdmFactory> TestMojoMediaClient::CreateCdmFactory( | 66 scoped_ptr<CdmFactory> TestMojoMediaClient::CreateCdmFactory( |
| 66 mojo::shell::mojom::InterfaceProvider* /* interface_provider */) { | 67 mojo::shell::mojom::InterfaceProvider* /* interface_provider */) { |
| 67 DVLOG(1) << __FUNCTION__; | 68 DVLOG(1) << __FUNCTION__; |
| 68 return make_scoped_ptr(new DefaultCdmFactory()); | 69 return make_scoped_ptr(new DefaultCdmFactory()); |
| 69 } | 70 } |
| 70 | 71 |
| 71 } // namespace media | 72 } // namespace media |
| OLD | NEW |