Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(804)

Unified Diff: media/video/capture/linux/video_capture_device_factory_linux.cc

Issue 294893006: VideoCaptureDeviceFactory: Change device enumeration to callback + QTKit enumerates in UI thread. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: QTKit/AVFoundation Factory create of inexistent device and associated unit tests Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/video/capture/linux/video_capture_device_factory_linux.cc
diff --git a/media/video/capture/linux/video_capture_device_factory_linux.cc b/media/video/capture/linux/video_capture_device_factory_linux.cc
index 5627dc0f8eea3a2bb4cf5b54feb4afe4217fb2a6..c8821eebbdbe6c06055dee919a8bedec8a85cc22 100644
--- a/media/video/capture/linux/video_capture_device_factory_linux.cc
+++ b/media/video/capture/linux/video_capture_device_factory_linux.cc
@@ -44,13 +44,20 @@ static bool HasUsableFormats(int fd) {
return false;
}
+VideoCaptureDeviceFactoryLinux::VideoCaptureDeviceFactoryLinux(
+ scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
+ : ui_task_runner_(ui_task_runner) {
+}
+
+VideoCaptureDeviceFactoryLinux::~VideoCaptureDeviceFactoryLinux() {
+}
+
scoped_ptr<VideoCaptureDevice> VideoCaptureDeviceFactoryLinux::Create(
- scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
const VideoCaptureDevice::Name& device_name) {
DCHECK(thread_checker_.CalledOnValidThread());
#if defined(OS_CHROMEOS)
VideoCaptureDeviceChromeOS* self =
- new VideoCaptureDeviceChromeOS(ui_task_runner, device_name);
+ new VideoCaptureDeviceChromeOS(ui_task_runner_, device_name);
#else
VideoCaptureDeviceLinux* self = new VideoCaptureDeviceLinux(device_name);
#endif

Powered by Google App Engine
This is Rietveld 408576698