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

Unified Diff: content/browser/renderer_host/media/media_stream_manager.cc

Issue 702703002: Revert of Win Video Capture: Create an STA |video_capture_thread_| from MediaStreamManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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: 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 0124f21297f8b4a311d4e42bf88b1ee92fe53458..3d506f7303b44a7f7696ea3368cb1b71317a6f77 100644
--- a/content/browser/renderer_host/media/media_stream_manager.cc
+++ b/content/browser/renderer_host/media/media_stream_manager.cc
@@ -360,9 +360,6 @@
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),
@@ -372,9 +369,6 @@
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),
@@ -1601,16 +1595,7 @@
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.
- 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,

Powered by Google App Engine
This is Rietveld 408576698