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 1ae9fe52e5ea6f0a60f057bc4fc73f9d9895e26c..f4b07b27692052ad67216d491485097efd2aecc5 100644 |
--- a/content/browser/renderer_host/media/media_stream_manager.cc |
+++ b/content/browser/renderer_host/media/media_stream_manager.cc |
@@ -387,9 +387,6 @@ MediaStreamManager::EnumerationCache::~EnumerationCache() { |
MediaStreamManager::MediaStreamManager() |
: audio_manager_(NULL), |
-#if defined(OS_WIN) |
- video_capture_thread_("VideoCaptureThread"), |
-#endif |
monitoring_started_(false), |
#if defined(OS_CHROMEOS) |
has_checked_keyboard_mic_(false), |
@@ -399,9 +396,6 @@ MediaStreamManager::MediaStreamManager() |
MediaStreamManager::MediaStreamManager(media::AudioManager* audio_manager) |
: audio_manager_(audio_manager), |
-#if defined(OS_WIN) |
- video_capture_thread_("VideoCaptureThread"), |
-#endif |
monitoring_started_(false), |
#if defined(OS_CHROMEOS) |
has_checked_keyboard_mic_(false), |
@@ -1665,16 +1659,7 @@ void MediaStreamManager::InitializeDeviceManagersOnIOThread() { |
video_capture_manager_ = |
new VideoCaptureManager(media::VideoCaptureDeviceFactory::CreateFactory( |
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI))); |
-#if defined(OS_WIN) |
- // Use an STA Video Capture Thread to try to avoid crashes on enumeration of |
- // buggy third party Direct Show modules, http://crbug.com/428958. |
mcasas
2015/04/17 17:15:56
I would like to keep this indication of "buggy thi
DaleCurtis
2015/04/17 17:58:32
Where would you prefer this text goes? I've added
mcasas
2015/04/17 20:23:31
Perhaps add them next to l.1676 of this side of th
DaleCurtis
2015/04/18 01:40:19
Didn't make sense here, so I put it up where devic
DaleCurtis
2015/04/18 02:36:48
Actually, I misread that, it looks like there's a
|
- video_capture_thread_.init_com_with_mta(false); |
- CHECK(video_capture_thread_.Start()); |
- video_capture_manager_->Register(this, |
- video_capture_thread_.message_loop_proxy()); |
-#else |
video_capture_manager_->Register(this, device_task_runner_); |
-#endif |
} |
void MediaStreamManager::Opened(MediaStreamType stream_type, |