RELAND 29423003: Added video capture capabilities retrieval and caching to VideoCaptureManager

content/browser/renderer_host/media/video_capture_manager.h

Index: content/browser/renderer_host/media/video_capture_manager.h
diff --git a/content/browser/renderer_host/media/video_capture_manager.h b/content/browser/renderer_host/media/video_capture_manager.h
index 6f0b0ec4702dedd2e9e2f43caecee942542ec5e8..c1e616f51fd74b50e57b89781c60738f57f86b48 100644
--- a/content/browser/renderer_host/media/video_capture_manager.h
+++ b/content/browser/renderer_host/media/video_capture_manager.h
@@ -59,7 +59,8 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
   // Called by VideoCaptureHost to locate a capture device for |capture_params|,
   // adding the Host as a client of the device's controller if successful. The
   // value of |capture_params.session_id| controls which device is selected;
-  // this value should be a session id previously returned by Open().
+  // this value should be a session id previously returned by Open(). The device
+  // capabilities are reduced to |capture_params|.
   //
   // If the device is not already started (i.e., no other client is currently
   // capturing from this device), this call will cause a VideoCaptureController
@@ -82,10 +83,28 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
                             VideoCaptureControllerID client_id,
                             VideoCaptureControllerEventHandler* client_handler);
 
+  // Retrieves the available capture capabilities for a particular device. The
+  // capabilities are cached during device(s) enumeration.
+  void GetDeviceCapabilities(int capture_session_id,
+                             media::VideoCaptureCapabilities* capabilities);
+
  private:
   virtual ~VideoCaptureManager();
   struct DeviceEntry;
 
+  // This data structure is a convenient wrap of a devices' name and associated
+  // video capture capabilities, and a flag that indicates if in use.
+  struct DeviceInfo {
+    DeviceInfo();
+    DeviceInfo(const media::VideoCaptureDevice::Name& name,
+               const media::VideoCaptureCapabilities& capabilities);
+    ~DeviceInfo();
+
+    media::VideoCaptureDevice::Name name;
+    media::VideoCaptureCapabilities capabilities;
+  };
+  typedef std::vector<DeviceInfo> DevicesInfo;

[tommi (sloooow) - chröme, 2013/11/18 09:38:18]

nit: This should be DeviceInfos since the plural is applied to the whole name.
As is it reads as singular.
https://code.google.com/p/chromium/codesearch#search/&q=Infos
Alternatively it could be named DeviceInfoCache.

+
   // Check 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.
@@ -94,8 +113,9 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
   // Helpers to report an event to our Listener.
   void OnOpened(MediaStreamType type, int capture_session_id);
   void OnClosed(MediaStreamType type, int capture_session_id);
-  void OnDevicesEnumerated(MediaStreamType stream_type,
-                           const media::VideoCaptureDevice::Names& names);
+  void OnDeviceNamesAndCapabilitiesEnumerated(
+      MediaStreamType stream_type,
+      const DevicesInfo& new_devices_info_cache);
 
   // Find a DeviceEntry by its device ID and type, if it is already opened.
   DeviceEntry* GetDeviceEntryForMediaStreamDevice(
@@ -111,9 +131,13 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
 
   bool IsOnDeviceThread() const;
 
-  // Queries and returns the available device IDs.
-  media::VideoCaptureDevice::Names GetAvailableDevicesOnDeviceThread(
-      MediaStreamType stream_type);
+  // Queries the Names of the devices in the system; the capabilities of the new
+  // devices are also queried, and consolidated with the copy of the local
+  // device info cache passed. The consolidated list of devices+capabilities is
+  // returned.
+  DevicesInfo GetAvailableDevicesAndCapabilitiesOnDeviceThread(
+      MediaStreamType stream_type,
+      const DevicesInfo& old_device_info_cache);
 
   // Create and Start a new VideoCaptureDevice, storing the result in
   // |entry->video_capture_device|. Ownership of |client| passes to
@@ -127,6 +151,9 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
   // |entry->video_capture_device|.
   void DoStopDeviceOnDeviceThread(DeviceEntry* entry);
 
+  DeviceInfo* FindDeviceInfoById(const std::string& id,
+                                 DevicesInfo& device_vector);
+
   // The message loop of media stream device thread, where VCD's live.
   scoped_refptr<base::MessageLoopProxy> device_loop_;
 
@@ -167,16 +194,19 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
   typedef std::set<DeviceEntry*> DeviceEntries;
   DeviceEntries devices_;
 
+  // Local cache of the enumerated video capture devices' names and capture
+  // capabilities. A snapshot of the current devices and their capabilities is
+  // composed in GetAvailableDevicesAndCapabilitiesOnDeviceThread() --coming
+  // from EnumerateDevices()--, and this snapshot is used to update this list in
+  // OnDeviceNamesAndCapabilitiesEnumerated(). GetDeviceCapabilities() will
+  // use this list if the device is not started, otherwise it will retrieve the
+  // active device capture format from the VideoCaptureController associated.
+  DevicesInfo devices_info_cache_;
+
   // Set to true if using fake video capture devices for testing, false by
   // default. This is only used for the MEDIA_DEVICE_VIDEO_CAPTURE device type.
   bool use_fake_device_;
 
-  // We cache the enumerated video capture devices in
-  // GetAvailableDevicesOnDeviceThread() and then later look up the requested ID
-  // when a device is created in DoStartDeviceOnDeviceThread(). Used only on the
-  // device thread.
-  media::VideoCaptureDevice::Names video_capture_devices_;
-
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureManager);
 };