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

Unified Diff: media/video/capture/win/video_capture_device_win.cc

Issue 10662049: Move the device enumerate/open/close work to device thread from IO thread (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed Magnus' comments. Created 8 years, 6 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/win/video_capture_device_win.cc
diff --git a/media/video/capture/win/video_capture_device_win.cc b/media/video/capture/win/video_capture_device_win.cc
index 55b5a16de823698b8bfe091b7b45f45bc2735e42..c941d5c08999499fa1f59361f552554229583b97 100644
--- a/media/video/capture/win/video_capture_device_win.cc
+++ b/media/video/capture/win/video_capture_device_win.cc
@@ -177,10 +177,10 @@ namespace media {
static const char kGoogleCameraAdapter[] = "google camera adapter";
// Gets the names of all video capture devices connected to this computer.
+// This API can only be run on a COM initialized thread.
void VideoCaptureDevice::GetDeviceNames(Names* device_names) {
DCHECK(device_names);
- base::win::ScopedCOMInitializer coinit;
ScopedComPtr<ICreateDevEnum> dev_enum;
tommi (sloooow) - chröme 2012/07/02 13:36:36 DCHECK(CalledOnValidThread()) first
HRESULT hr = dev_enum.CreateInstance(CLSID_SystemDeviceEnum, NULL,
CLSCTX_INPROC);

Powered by Google App Engine
This is Rietveld 408576698