Reconnect support for DirectShow video capture devices in parallel to MediaFoundation ones.

media/video/capture/video_capture_device.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.
 //
 // VideoCaptureDevice is the abstract base class for realizing video capture
 // device support in Chromium. It provides the interface for OS dependent
 // implementations.
 // The class is created and functions are invoked on a thread owned by
 // VideoCaptureManager. Capturing is done on other threads, depending on the OS
 // specific implementation.
 
 #ifndef MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURE_DEVICE_H_
 #define MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURE_DEVICE_H_
 
 #include <list>
 #include <string>
 
+#include "base/logging.h"
 #include "base/time/time.h"
 #include "media/base/media_export.h"
 #include "media/video/capture/video_capture_types.h"
 
 namespace media {
 
 class MEDIA_EXPORT VideoCaptureDevice {
  public:
   // Represents a capture device name and ID.
   // You should not create an instance of this class directly by e.g. setting
   // various properties directly.  Instead use
   // VideoCaptureDevice::GetDeviceNames to do this for you and if you need to
   // cache your own copy of a name, you can do so via the copy constructor.
   // The reason for this is that a device name might contain platform specific
   // settings that are relevant only to the platform specific implementation of
   // VideoCaptureDevice::Create.
   class Name {
    public:
     Name() {}
     Name(const std::string& name, const std::string& id)
         : device_name_(name), unique_id_(id) {}
+
+#if defined(OS_WIN)
+    // Windows targets Capture Api type: it can only be set on construction.
+    enum CaptureApiType {
+      MEDIA_FOUNDATION,
+      DIRECT_SHOW,
+      API_TYPE_UNKNOWN
+    };
+
+    Name(const std::string& name,
+         const std::string& id,
+         const CaptureApiType api_type)
+        : device_name_(name), unique_id_(id), capture_api_class_(api_type) {}
+#endif  // if defined(OS_WIN)
     ~Name() {}
 
     // Friendly name of a device
     const std::string& name() const { return device_name_; }
 
     // Unique name of a device. Even if there are multiple devices with the same
     // friendly name connected to the computer this will be unique.
     const std::string& id() const { return unique_id_; }
 
     // These operators are needed due to storing the name in an STL container.
     // In the shared build, all methods from the STL container will be exported
     // so even though they're not used, they're still depended upon.
     bool operator==(const Name& other) const {
       return other.id() == unique_id_ && other.name() == device_name_;
     }
     bool operator<(const Name& other) const {
       return unique_id_ < other.id();
     }
 
+#if defined(OS_WIN)
+    CaptureApiType capture_api_type() const {
+      return capture_api_class_.capture_api_type();
+    }
+#endif  // if defined(OS_WIN)
+
    private:
     std::string device_name_;
     std::string unique_id_;
+#if defined(OS_WIN)
+    // This class wraps the CaptureApiType, so it has a by default value if not
+    // inititalized, and I (mcasas) do a DCHECK on reading its value.
+    class CaptureApiClass{
+     public:
+      CaptureApiClass():  capture_api_type_(API_TYPE_UNKNOWN) {}
+      CaptureApiClass(const CaptureApiType api_type)
+          :  capture_api_type_(api_type) {}
+      CaptureApiType capture_api_type() const {
+        DCHECK(capture_api_type_ !=  API_TYPE_UNKNOWN);

[tommi (sloooow) - chröme, 2013/07/03 15:27:26]

nit: DCHECK_NE

[mcasas, 2013/07/04 10:40:42]

Done.

+        return capture_api_type_;
+      }
+     private:
+      CaptureApiType capture_api_type_;
+    };
+
+    CaptureApiClass capture_api_class_;
+#endif  // if defined(OS_WIN)
     // Allow generated copy constructor and assignment.
   };
 
   // Manages a list of Name entries.
   class MEDIA_EXPORT Names
       : public NON_EXPORTED_BASE(std::list<Name>) {
    public:
     // Returns NULL if no entry was found by that ID.
     Name* FindById(const std::string& id);
 
@@ skipping 99 matching lines @@
   // not permitted to make any additional calls to its EventHandler.
   virtual void DeAllocate() = 0;
 
   // Get the name of the capture device.
   virtual const Name& device_name() = 0;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURE_DEVICE_H_