Move the device enumerate/open/close work to device thread from IO thread

content/browser/renderer_host/media/media_stream_manager.h

 // 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.
 
 // MediaStreamManager is used to open/enumerate media capture devices (video
 // supported now). Call flow:
 // 1. GenerateStream is called when a render process wants to use a capture
 //    device.
 // 2. MediaStreamManager will ask MediaStreamDeviceSettings for permission to
 //    use devices and for which device to use.
@@ skipping 12 matching lines @@
 #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_MANAGER_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/supports_user_data.h"
+#include "base/synchronization/waitable_event.h"

[scherkus (not reviewing), 2012/06/27 00:52:31]

not seeing this used -- remove?

[no longer working on chromium, 2012/06/27 14:07:16]

Sorry, uncleaned code from debugging.

+#include "base/threading/thread.h"
 #include "content/browser/renderer_host/media/media_stream_provider.h"
 #include "content/browser/renderer_host/media/media_stream_settings_requester.h"
 #include "content/common/media/media_stream_options.h"
 #include "content/common/content_export.h"
+#include "content/public/browser/browser_thread.h"
 
 namespace content {
 class ResourceContext;
 }
 
-namespace media {
-class AudioManager;
-}
-
 namespace media_stream {
 
 class AudioInputDeviceManager;
 class MediaStreamDeviceSettings;
 class MediaStreamRequester;
 class VideoCaptureManager;
 
 // MediaStreamManager is used to generate and close new media devices, not to
 // start the media flow.
 // The classes requesting new media streams are answered using
 // MediaStreamManager::Listener.
 class CONTENT_EXPORT MediaStreamManager
     : public MediaStreamProviderListener,
       public SettingsRequester,
       public base::SupportsUserData::Data {
  public:
   // Returns the MediaStreamManager for the given ResourceContext. If it hasn't
   // been created yet, it will be constructed with the given AudioManager.
   static MediaStreamManager* GetForResourceContext(
-      content::ResourceContext* resource_context,
-      media::AudioManager* audio_manager);
+      content::ResourceContext* resource_context);
 
-  explicit MediaStreamManager(media::AudioManager* audio_manager);
+  MediaStreamManager();
+
   virtual ~MediaStreamManager();
 
   // Used to access VideoCaptureManager.
   VideoCaptureManager* video_capture_manager();
 
   // Used to access AudioInputDeviceManager.
   AudioInputDeviceManager* audio_input_device_manager();
 
   // GenerateStream opens new media devices according to |components|. The
   // request is identified using |label|, which is pointing to an already
@@ skipping 46 matching lines @@
 
   // Implements SettingsRequester.
   virtual void DevicesAccepted(const std::string& label,
                                const StreamDeviceInfoArray& devices) OVERRIDE;
   virtual void SettingsError(const std::string& label) OVERRIDE;
 
   // Used by unit test to make sure fake devices are used instead of a real
   // devices, which is needed for server based testing.
   void UseFakeDevice();
 
+  scoped_refptr<base::MessageLoopProxy> GetMessageLoop();
+
  private:
   // Contains all data needed to keep track of requests.
   struct DeviceRequest;
 
   // Helpers for signaling the media observer that new capture devices are
   // opened/closed.
   void NotifyObserverDevicesOpened(DeviceRequest* request);
   void NotifyObserverDevicesClosed(DeviceRequest* request);
   void DevicesFromRequest(DeviceRequest* request,
                           content::MediaStreamDevices* devices);
 
   // Helpers.
   bool RequestDone(const MediaStreamManager::DeviceRequest& request) const;
   MediaStreamProvider* GetDeviceManager(MediaStreamType stream_type);
   void StartEnumeration(DeviceRequest* new_request,
                         std::string* label);
 
+  // Helper to ensure the device thread before passing to device managers.
+  void EnsureDeviceThread();
+
+  // Device thread shared by VideoCaptureManager and AudioInputDeviceManager.
+  scoped_ptr<base::Thread> device_thread_;
+
   scoped_ptr<MediaStreamDeviceSettings> device_settings_;
   scoped_refptr<VideoCaptureManager> video_capture_manager_;
   scoped_refptr<AudioInputDeviceManager> audio_input_device_manager_;
 
   // Keeps track of device types currently being enumerated to not enumerate
   // when not necessary.
   std::vector<bool> enumeration_in_progress_;
 
   // All non-closed request.
   typedef std::map<std::string, DeviceRequest> DeviceRequests;
   DeviceRequests requests_;
-  media::AudioManager* audio_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaStreamManager);
 };
 
 }  // namespace media_stream
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_MANAGER_H_