media/video/capture/mac/video_capture_device_qtkit_mac.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/mac/video_capture_device_qtkit_mac.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

« media/video/capture/mac/video_capture_device_factory_mac.mm ('K') | « media/video/capture/mac/video_capture_device_factory_mac_unittest.mm ('k') | media/video/capture/video_capture_device_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/video/capture/mac/video_capture_device_qtkit_mac.h

diff --git a/media/video/capture/mac/video_capture_device_qtkit_mac.h b/media/video/capture/mac/video_capture_device_qtkit_mac.h

index 1eba8a12ea240dd36a5bbc00c5b34ca1d848840a..1ed511b54cece8d24fe06460535367da353d5857 100644

--- a/media/video/capture/mac/video_capture_device_qtkit_mac.h

+++ b/media/video/capture/mac/video_capture_device_qtkit_mac.h

@@ -39,7 +39,13 @@ class VideoCaptureDeviceMac;

std::vector<UInt8> adjustedFrame_;

}

-// Returns a dictionary of capture devices with friendly name and unique id.

+// Fills up the |deviceNames| dictionary of capture devices with friendly name

+// and unique id. No thread assumptions, but this method should run in UI

+// thread, see http://crbug.com/139164

++ (void)getDeviceNames:(NSMutableDictionary*)deviceNames;

+// Returns a dictionary of capture devices with friendly name and unique id, via

+// runing +getDeviceNames: on Main Thread.

+ (NSDictionary*)deviceNames;

// Initializes the instance and registers the frame receiver.