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

media/video/capture/video_capture_device.h

Index: media/video/capture/video_capture_device.h
diff --git a/media/video/capture/video_capture_device.h b/media/video/capture/video_capture_device.h
index e5be4139e7056256a478a9be1169ed44229aa2dd..c1148b438017e1db5b68f863502315c58a602976 100644
--- a/media/video/capture/video_capture_device.h
+++ b/media/video/capture/video_capture_device.h
@@ -55,9 +55,24 @@ class MEDIA_EXPORT VideoCaptureDevice {
       return unique_id_ < other.id();
     }
 
+#if defined(OS_WIN)
+    enum CaptureApiType {
+      MEDIA_FOUNDATION,
+      DIRECT_SHOW
+    };

[tommi (sloooow) - chröme, 2013/07/03 12:06:51]

nit: empty line after this one

[mcasas, 2013/07/03 12:41:10]

Done.

+    // Capture Api type is only for Windows targets.
+    const CaptureApiType& capture_api_type() const { return capture_api_type_; }

[tommi (sloooow) - chröme, 2013/07/03 12:06:51]

return by value

[mcasas, 2013/07/03 12:41:10]

Done.

+    void capture_api_type(const CaptureApiType & type) {

[tommi (sloooow) - chröme, 2013/07/03 12:06:51]

set_capture_api_type(CaptureApiType type)

note the "set_" prefix and we pass enum types by value like we do with ints.

[mcasas, 2013/07/03 12:41:10]

Done.

+      capture_api_type_ = type;
+    }
+#endif  // if defined(OS_WIN)
+
    private:
     std::string device_name_;
     std::string unique_id_;
+#if defined(OS_WIN)
+    CaptureApiType capture_api_type_;

[tommi (sloooow) - chröme, 2013/07/03 12:06:51]

right now this variable isn't initialized in the constructor.  Let's initialize
it to UNKNOWN_CAPTURE_API (or something like that) in both constructors and add
a DCHECK to capture_api_type():

CaptureApiType capture_api_type() const {
  DCHECK_NE(capture_api_type_, UNKNOWN_CAPTURE_API);
  return capture_api_type_;
}

Actually, what about removing the capture_api_type set method and instead add a
Windows-only constructor that accepts 3 arguments (adding the api selector)? 
The point is that we should be setting the API enum variable only when we first
construct the Name instance inside the respective implementation.

[mcasas, 2013/07/03 12:41:10]

The second sounds better to me.

+#endif  // if defined(OS_WIN)
     // Allow generated copy constructor and assignment.
   };