media/video/capture/linux/video_capture_device_factory_linux.h - Issue 294893006: VideoCaptureDeviceFactory: Change device enumeration to callback + QTKit enumerates in UI thread.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

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

« no previous file with comments | « media/video/capture/file_video_capture_device_factory.cc ('k') | media/video/capture/linux/video_capture_device_factory_linux.cc » ('j') | media/video/capture/mac/video_capture_device_factory_mac.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/video/capture/linux/video_capture_device_factory_linux.h

diff --git a/media/video/capture/linux/video_capture_device_factory_linux.h b/media/video/capture/linux/video_capture_device_factory_linux.h

index 8d9423fb531d9d9e5686f452f74935272d019ec6..9702cddd214f3723091a4fae122a850f929c0fc5 100644

--- a/media/video/capture/linux/video_capture_device_factory_linux.h

+++ b/media/video/capture/linux/video_capture_device_factory_linux.h

@@ -18,11 +18,11 @@ namespace media {

class MEDIA_EXPORT VideoCaptureDeviceFactoryLinux

: public VideoCaptureDeviceFactory {

public:

- VideoCaptureDeviceFactoryLinux() {}

- virtual ~VideoCaptureDeviceFactoryLinux() {}

+ explicit VideoCaptureDeviceFactoryLinux(

+ scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner);

+ virtual ~VideoCaptureDeviceFactoryLinux();

virtual scoped_ptr<VideoCaptureDevice> Create(

- scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,

const VideoCaptureDevice::Name& device_name) OVERRIDE;

virtual void GetDeviceNames(VideoCaptureDevice::Names* device_names) OVERRIDE;

virtual void GetDeviceSupportedFormats(

@@ -30,7 +30,7 @@ class MEDIA_EXPORT VideoCaptureDeviceFactoryLinux

VideoCaptureFormats* supported_formats) OVERRIDE;

private:

+ scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;

DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceFactoryLinux);

};