media/video/capture/win/video_capture_device_win.h - Issue 10662049: Move the device enumerate/open/close work to device thread from IO 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/win/video_capture_device_win.h

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

« content/browser/renderer_host/media/video_capture_manager.cc ('K') | « content/browser/renderer_host/render_process_host_impl.cc ('k') | media/video/capture/win/video_capture_device_win.cc » ('j') | media/video/capture/win/video_capture_device_win.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/video/capture/win/video_capture_device_win.h

diff --git a/media/video/capture/win/video_capture_device_win.h b/media/video/capture/win/video_capture_device_win.h

index 1f7e03ace9427b29da1f29a2a5c7a6796c49f0eb..5720410c419c72398055c1459b7276ff3fa783ef 100644

--- a/media/video/capture/win/video_capture_device_win.h

+++ b/media/video/capture/win/video_capture_device_win.h

@@ -18,7 +18,6 @@

#include <string>

#include "base/threading/thread.h"

-#include "base/win/scoped_com_initializer.h"

#include "base/win/scoped_comptr.h"

#include "media/video/capture/video_capture_device.h"

#include "media/video/capture/video_capture_types.h"

@@ -27,6 +26,7 @@

namespace media {

+// All the APIs in the class can only be run on a COM initialized thread.

class VideoCaptureDeviceWin

tommi (sloooow) - chröme 2012/07/02 13:36:36 inherit from base::NonThreadSafe and use CalledOnV

no longer working on chromium 2012/07/04 12:35:25 Done.

: public VideoCaptureDevice,

public SinkFilterObserver {

@@ -64,8 +64,6 @@ class VideoCaptureDeviceWin

int GetBestMatchedCapability(int width, int height, int frame_rate);

void SetErrorState(const char* reason);

- base::win::ScopedCOMInitializer initialize_com_;

Name device_name_;

InternalState state_;

VideoCaptureDevice::EventHandler* observer_;