chrome://media-internals: update MediaInternals when devices capabilities are enumerated.

content/browser/renderer_host/media/video_capture_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.
 
 // VideoCaptureManager is used to open/close, start/stop, enumerate available
 // video capture devices, and manage VideoCaptureController's.
 // All functions are expected to be called from Browser::IO thread. Some helper
 // functions (*OnDeviceThread) will dispatch operations to the device thread.
 // VideoCaptureManager will open OS dependent instances of VideoCaptureDevice.
 // A device can only be opened once.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_MANAGER_H_
 #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_MANAGER_H_
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/process/process_handle.h"
 #include "base/timer/elapsed_timer.h"
 #include "content/browser/renderer_host/media/media_stream_provider.h"
 #include "content/browser/renderer_host/media/video_capture_controller_event_handler.h"
 #include "content/common/content_export.h"
 #include "content/common/media/media_stream_options.h"
 #include "media/video/capture/video_capture_device.h"
 #include "media/video/capture/video_capture_device_factory.h"
+#include "media/video/capture/video_capture_device_info.h"
 #include "media/video/capture/video_capture_types.h"
 
 namespace content {
 class VideoCaptureController;
 class VideoCaptureControllerEventHandler;
 
 // VideoCaptureManager opens/closes and start/stops video capture devices.
 class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
  public:
   // Callback used to signal the completion of a controller lookup.
@@ skipping 87 matching lines @@
 
   // Gets a weak reference to the device factory, used for tests.
   media::VideoCaptureDeviceFactory* video_capture_device_factory() const {
     return video_capture_device_factory_.get();
   }
 
  private:
   virtual ~VideoCaptureManager();
   struct DeviceEntry;
 
-  // This data structure is a convenient wrap of a devices' name and associated
-  // video capture supported formats.
-  struct DeviceInfo {
-    DeviceInfo();
-    DeviceInfo(const media::VideoCaptureDevice::Name& name,
-               const media::VideoCaptureFormats& supported_formats);
-    ~DeviceInfo();
-
-    media::VideoCaptureDevice::Name name;
-    media::VideoCaptureFormats supported_formats;
-  };
-  typedef std::vector<DeviceInfo> DeviceInfos;
-
   // Checks to see if |entry| has no clients left on its controller. If so,
   // remove it from the list of devices, and delete it asynchronously. |entry|
   // may be freed by this function.
   void DestroyDeviceEntryIfNoClients(DeviceEntry* entry);
 
   // Helpers to report an event to our Listener.
   void OnOpened(MediaStreamType type,
                 media::VideoCaptureSessionId capture_session_id);
   void OnClosed(MediaStreamType type,
                 media::VideoCaptureSessionId capture_session_id);
-  void OnDevicesInfoEnumerated(MediaStreamType stream_type,
-                               base::ElapsedTimer* timer,
-                               const DeviceInfos& new_devices_info_cache);
+  void OnDevicesInfoEnumerated(
+      MediaStreamType stream_type,
+      base::ElapsedTimer* timer,
+      const media::VideoCaptureDeviceInfos& new_devices_info_cache);
 
   // Finds a DeviceEntry by its device ID and type, if it is already opened.
   DeviceEntry* GetDeviceEntryForMediaStreamDevice(
       const MediaStreamDevice& device_info);
 
   // Finds a DeviceEntry entry for the indicated session, creating a fresh one
   // if necessary. Returns NULL if the session id is invalid.
   DeviceEntry* GetOrCreateDeviceEntry(
       media::VideoCaptureSessionId capture_session_id);
 
   // Finds the DeviceEntry that owns a particular controller pointer.
   DeviceEntry* GetDeviceEntryForController(
       const VideoCaptureController* controller) const;
 
   bool IsOnDeviceThread() const;
 
   // Consolidates the cached devices list with the list of currently connected
   // devices in the system |names_snapshot|. Retrieves the supported formats of
   // the new devices and sends the new cache to OnDevicesInfoEnumerated().
   void ConsolidateDevicesInfoOnDeviceThread(
-      base::Callback<void(const DeviceInfos&)> on_devices_enumerated_callback,
+      base::Callback<void(const media::VideoCaptureDeviceInfos&)>
+          on_devices_enumerated_callback,
       MediaStreamType stream_type,
-      const DeviceInfos& old_device_info_cache,
+      const media::VideoCaptureDeviceInfos& old_device_info_cache,
       scoped_ptr<media::VideoCaptureDevice::Names> names_snapshot);
 
   // Creates and Starts a new VideoCaptureDevice, storing the result in
   // |entry->video_capture_device|. Ownership of |client| passes to
   // the device.
   void DoStartDeviceOnDeviceThread(
       media::VideoCaptureSessionId session_id,
       DeviceEntry* entry,
       const media::VideoCaptureParams& params,
       scoped_ptr<media::VideoCaptureDevice::Client> client);
 
   // Stops and destroys the VideoCaptureDevice held in
   // |entry->video_capture_device|.
   void DoStopDeviceOnDeviceThread(DeviceEntry* entry);
 
-  DeviceInfo* FindDeviceInfoById(const std::string& id,
-                                 DeviceInfos& device_vector);
+  media::VideoCaptureDeviceInfo* FindDeviceInfoById(
+      const std::string& id,
+      media::VideoCaptureDeviceInfos& device_vector);
 
   void SetDesktopCaptureWindowIdOnDeviceThread(DeviceEntry* entry,
                                                gfx::NativeViewId window_id);
 
   void SaveDesktopCaptureWindowIdOnDeviceThread(
       media::VideoCaptureSessionId session_id,
       gfx::NativeViewId window_id);
 
   // The message loop of media stream device thread, where VCD's live.
   scoped_refptr<base::SingleThreadTaskRunner> device_task_runner_;
@@ skipping 40 matching lines @@
   // from the test harness.
   scoped_ptr<media::VideoCaptureDeviceFactory> video_capture_device_factory_;
 
   // Local cache of the enumerated video capture devices' names and capture
   // supported formats. A snapshot of the current devices and their capabilities
   // is composed in VideoCaptureDeviceFactory::EnumerateDeviceNames() and
   // ConsolidateDevicesInfoOnDeviceThread(), and this snapshot is used to update
   // this list in OnDevicesInfoEnumerated(). GetDeviceSupportedFormats() will
   // use this list if the device is not started, otherwise it will retrieve the
   // active device capture format from the VideoCaptureController associated.
-  DeviceInfos devices_info_cache_;
+  media::VideoCaptureDeviceInfos devices_info_cache_;
 
   // Accessed on the device thread only.
   std::map<media::VideoCaptureSessionId, gfx::NativeViewId>
       notification_window_ids_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_MANAGER_H_