Switch to STA mode for audio thread and WASAPI I/O streams.

content/browser/renderer_host/media/media_stream_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 
 #include <list>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 369 matching lines @@
 
 MediaStreamManager::EnumerationCache::EnumerationCache()
     : valid(false) {
 }
 
 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),
 #endif
       io_loop_(NULL),
       use_fake_ui_(false) {}
 
 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),
 #endif
       io_loop_(NULL),
       use_fake_ui_(false) {
   DCHECK(audio_manager_);
   memset(active_enumeration_ref_count_, 0,
          sizeof(active_enumeration_ref_count_));
 
@@ skipping 1243 matching lines @@
   }
 
   // TODO(dalecurtis): Remove ScopedTracker below once crbug.com/457525 is
   // fixed.
   tracked_objects::ScopedTracker tracking_profile4(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "457525 MediaStreamManager::InitializeDeviceManagersOnIOThread 4"));
   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 third party..."
and the bug, somehow. Other than that the change LGTM, 
the gist is to make the Capture Thread STA.

There's the situation that Video Capture hijacks the
Audio Capture thread, pretending it's Capture Thread.
Creation of this thread happens inside AudioManagerBase.
I'm not familiar with the arcanes of the audio side, but
I think it would be best created in MediaStreamManager, 
specially in the light of this thread getting more and more
workload in the near future. WDYT? 

[DaleCurtis, 2015/04/17 17:58:32]

Where would you prefer this text goes? I've added similar text in
AudioManagerBase when the audio thread is created.

Notably, the audio capture thread is just a control thread (start/stop/etc),
actual capture happens on another OS level thread.

[mcasas, 2015/04/17 20:23:31]

Perhaps add them next to l.1676 of this side of the diff?
Something explaining that |device_task_runner_| must be
STA in Win blabla. Maybe add a DCHECK for OS_WIN?
(don't know if that's possible)

[DaleCurtis, 2015/04/18 01:40:19]

Didn't make sense here, so I put it up where device_task_runner_ is set. It
looks like there's only a way to query the apartment type on Windows 7 or higher
unfortunately:

https://msdn.microsoft.com/en-us/library/windows/desktop/dd542641.aspx

[DaleCurtis, 2015/04/18 02:36:48]

Actually, I misread that, it looks like there's a multistep way to get that info
via casting IUnknown somehow. Not sure it's worth it.

-  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,
                                 int capture_session_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DVLOG(1) << "Opened({stream_type = " << stream_type <<  "} "
            << "{capture_session_id = " << capture_session_id << "})";
   // Find the request(s) containing this device and mark it as used.
   // It can be used in several requests since the same device can be
   // requested from the same web page.
@@ skipping 509 matching lines @@
   }
 }
 
 void MediaStreamManager::SetKeyboardMicOnDeviceThread() {
   DCHECK(device_task_runner_->BelongsToCurrentThread());
   audio_manager_->SetHasKeyboardMic();
 }
 #endif
 
 }  // namespace content