Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor

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 <list>
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/macros.h"
 #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/threading/thread_checker.h"
 #include "base/timer/elapsed_timer.h"
 #include "build/build_config.h"
+#include "content/browser/media/video_capture_device_info.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/base/video_capture_types.h"
 #include "media/capture/video/video_capture_device.h"
 #include "media/capture/video/video_capture_device_factory.h"
-#include "media/capture/video/video_capture_device_info.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/application_status_listener.h"
 #endif
 
 namespace content {
 class VideoCaptureController;
 class VideoCaptureControllerEventHandler;
 
 // VideoCaptureManager opens/closes and start/stops video capture devices.
@@ skipping 127 matching lines @@
   void OnApplicationStateChange(base::android::ApplicationState state);
 #endif
 
  private:
   class CaptureDeviceStartRequest;
   class DeviceEntry;
 
   using SessionMap = std::map<media::VideoCaptureSessionId, MediaStreamDevice>;
   using DeviceEntries = std::vector<std::unique_ptr<DeviceEntry>>;
   using DeviceStartQueue = std::list<CaptureDeviceStartRequest>;
+  using VideoCaptureDeviceDescriptor = media::VideoCaptureDeviceDescriptor;
+  using VideoCaptureDeviceDescriptors = media::VideoCaptureDeviceDescriptors;
 
   ~VideoCaptureManager() override;
 
   // 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 media::VideoCaptureDeviceInfos& new_devices_info_cache);
+      const VideoCaptureDeviceInfos& new_devices_info_cache);
 
   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 media::VideoCaptureDeviceInfos&)>
+      base::Callback<void(const VideoCaptureDeviceInfos&)>
           on_devices_enumerated_callback,
       MediaStreamType stream_type,
-      const media::VideoCaptureDeviceInfos& old_device_info_cache,
-      std::unique_ptr<VideoCaptureDevice::Names> names_snapshot);
+      const VideoCaptureDeviceInfos& old_device_info_cache,
+      std::unique_ptr<VideoCaptureDeviceDescriptors> descriptors_snapshot);
 
   // 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);
 
   // Retrieve the VideoCaptureDevice associated to |session_id|, or nullptr
   // if not found.
   VideoCaptureDevice* GetVideoCaptureDeviceBySessionId(int session_id);
 
   // Finds a DeviceEntry in different ways: by its |device_id| and |type| (if it
   // is already opened), by its |controller| or by its |serial_id|. In all
   // cases, if not found, nullptr is returned.
   DeviceEntry* GetDeviceEntryByTypeAndId(MediaStreamType type,
                                          const std::string& device_id) const;
   DeviceEntry* GetDeviceEntryByController(
       const VideoCaptureController* controller) const;
   DeviceEntry* GetDeviceEntryBySerialId(int serial_id) const;
 
   // Finds the device info by |id| in |devices_info_cache_|, or nullptr.
-  media::VideoCaptureDeviceInfo* GetDeviceInfoById(const std::string& id);
+  VideoCaptureDeviceInfo* GetDeviceInfoById(const std::string& id);
 
   // Finds a DeviceEntry entry for the indicated |capture_session_id|, creating
   // a fresh one if necessary. Returns nullptr if said |capture_session_id| is
   // invalid.
   DeviceEntry* GetOrCreateDeviceEntry(
       media::VideoCaptureSessionId capture_session_id,
       const media::VideoCaptureParams& params);
 
   // Starting a capture device can take 1-2 seconds.
   // To avoid multiple unnecessary start/stop commands to the OS, each start
   // request is queued in |device_start_queue_|.
   // QueueStartDevice creates a new entry in |device_start_queue_| and posts a
   // request to start the device on the device thread unless there is
   // another request pending start.
   void QueueStartDevice(media::VideoCaptureSessionId session_id,
                         DeviceEntry* entry,
                         const media::VideoCaptureParams& params);
   void OnDeviceStarted(int serial_id,
                        std::unique_ptr<VideoCaptureDevice> device);
   void DoStopDevice(DeviceEntry* entry);
   void HandleQueuedStartRequest();
 
   // Creates and Starts a new VideoCaptureDevice. The resulting
   // VideoCaptureDevice is returned to the IO-thread and stored in
   // a DeviceEntry in |devices_|. Ownership of |client| passes to
   // the device.
   std::unique_ptr<VideoCaptureDevice> DoStartDeviceCaptureOnDeviceThread(
-      const VideoCaptureDevice::Name& name,
+      const VideoCaptureDeviceDescriptor& descriptor,
       const media::VideoCaptureParams& params,
       std::unique_ptr<VideoCaptureDevice::Client> client);
 
   std::unique_ptr<VideoCaptureDevice> DoStartTabCaptureOnDeviceThread(
       const std::string& device_id,
       const media::VideoCaptureParams& params,
       std::unique_ptr<VideoCaptureDevice::Client> client);
 
   std::unique_ptr<VideoCaptureDevice> DoStartDesktopCaptureOnDeviceThread(
       const std::string& device_id,
@@ skipping 62 matching lines @@
   std::unique_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.
-  media::VideoCaptureDeviceInfos devices_info_cache_;
+  VideoCaptureDeviceInfos devices_info_cache_;
 
   // Map used by DesktopCapture.
   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_