| 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/video/capture/video_capture_device_factory.h" | 5 #include "media/video/capture/video_capture_device_factory.h" |
| 6 | 6 |
| 7 namespace media { | 7 namespace media { |
| 8 | 8 |
| 9 VideoCaptureDeviceFactory::VideoCaptureDeviceFactory() { | 9 VideoCaptureDeviceFactory::VideoCaptureDeviceFactory() { |
| 10 thread_checker_.DetachFromThread(); | 10 thread_checker_.DetachFromThread(); |
| 11 }; | 11 }; |
| 12 | 12 |
| 13 scoped_ptr<VideoCaptureDevice> VideoCaptureDeviceFactory::Create( | 13 scoped_ptr<VideoCaptureDevice> VideoCaptureDeviceFactory::Create( |
| 14 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, |
| 14 const VideoCaptureDevice::Name& device_name) { | 15 const VideoCaptureDevice::Name& device_name) { |
| 15 DCHECK(thread_checker_.CalledOnValidThread()); | 16 DCHECK(thread_checker_.CalledOnValidThread()); |
| 16 return scoped_ptr<VideoCaptureDevice>( | 17 return scoped_ptr<VideoCaptureDevice>( |
| 17 VideoCaptureDevice::Create(device_name)); | 18 VideoCaptureDevice::Create(ui_task_runner, device_name)); |
| 18 } | 19 } |
| 19 | 20 |
| 20 void VideoCaptureDeviceFactory::GetDeviceNames( | 21 void VideoCaptureDeviceFactory::GetDeviceNames( |
| 21 VideoCaptureDevice::Names* device_names) { | 22 VideoCaptureDevice::Names* device_names) { |
| 22 DCHECK(thread_checker_.CalledOnValidThread()); | 23 DCHECK(thread_checker_.CalledOnValidThread()); |
| 23 VideoCaptureDevice::GetDeviceNames(device_names); | 24 VideoCaptureDevice::GetDeviceNames(device_names); |
| 24 } | 25 } |
| 25 | 26 |
| 26 void VideoCaptureDeviceFactory::GetDeviceSupportedFormats( | 27 void VideoCaptureDeviceFactory::GetDeviceSupportedFormats( |
| 27 const VideoCaptureDevice::Name& device, | 28 const VideoCaptureDevice::Name& device, |
| 28 VideoCaptureFormats* supported_formats) { | 29 VideoCaptureFormats* supported_formats) { |
| 29 DCHECK(thread_checker_.CalledOnValidThread()); | 30 DCHECK(thread_checker_.CalledOnValidThread()); |
| 30 VideoCaptureDevice::GetDeviceSupportedFormats(device, supported_formats); | 31 VideoCaptureDevice::GetDeviceSupportedFormats(device, supported_formats); |
| 31 } | 32 } |
| 32 | 33 |
| 33 } // namespace media | 34 } // namespace media |
| OLD | NEW |