content/browser/renderer_host/media/media_stream_manager.cc - 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: content/browser/renderer_host/media/media_stream_manager.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

« no previous file with comments | « no previous file | content/browser/renderer_host/media/video_capture_manager.h » ('j') | media/video/capture/mac/video_capture_device_factory_mac.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/media_stream_manager.cc

diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc

index fe537d9751a7e439b15497e1b913c7449a45a907..8feb361e7bddc93530c40c8deaeb67d71e93572b 100644

--- a/content/browser/renderer_host/media/media_stream_manager.cc

+++ b/content/browser/renderer_host/media/media_stream_manager.cc

@@ -1442,8 +1442,9 @@ void MediaStreamManager::InitializeDeviceManagersOnIOThread() {

audio_input_device_manager()->UseFakeDevice();

}

- video_capture_manager_ = new VideoCaptureManager(

- media::VideoCaptureDeviceFactory::CreateFactory());

+ video_capture_manager_ =

+ new VideoCaptureManager(media::VideoCaptureDeviceFactory::CreateFactory(

+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)));

video_capture_manager_->Register(this, device_task_runner_);

}

« no previous file with comments | « no previous file | content/browser/renderer_host/media/video_capture_manager.h » ('j') | media/video/capture/mac/video_capture_device_factory_mac.mm » ('J')