VideoCaptureDeviceWin: Extract class-static method into a Factory (both MF/DS)

media/video/capture/win/video_capture_device_mf_win.h

Index: media/video/capture/win/video_capture_device_mf_win.h
diff --git a/media/video/capture/win/video_capture_device_mf_win.h b/media/video/capture/win/video_capture_device_mf_win.h
index a1bda9f288c589f738582daedf02ccb00b59f00c..4a0d7793609124216d2cb4593dde13ffad5183f0 100644
--- a/media/video/capture/win/video_capture_device_mf_win.h
+++ b/media/video/capture/win/video_capture_device_mf_win.h
@@ -22,6 +22,8 @@
 
 interface IMFSourceReader;
 
+using base::win::ScopedComPtr;

[tommi (sloooow) - chröme, 2014/05/15 15:18:33]

nit: I *think* we try to avoid using "using" in header files.

[mcasas, 2014/05/15 16:03:23]

I wasn't sure of this but now I am. Removing.

+
 namespace media {
 
 class MFReaderCallback;
@@ -30,12 +32,13 @@ class MEDIA_EXPORT VideoCaptureDeviceMFWin
     : public base::NonThreadSafe,
       public VideoCaptureDevice {
  public:
+  static bool FormatFromGuid(const GUID& guid, VideoPixelFormat* format);
+
   explicit VideoCaptureDeviceMFWin(const Name& device_name);
   virtual ~VideoCaptureDeviceMFWin();
 
   // Opens the device driver for this device.
-  // This function is used by the static VideoCaptureDevice::Create function.
-  bool Init();
+  bool Init(ScopedComPtr<IMFMediaSource> source);

[tommi (sloooow) - chröme, 2014/05/15 15:18:33]

const &

[mcasas, 2014/05/15 16:03:23]

Done.

 
   // VideoCaptureDevice implementation.
   virtual void AllocateAndStart(const VideoCaptureParams& params,
@@ -43,18 +46,6 @@ class MEDIA_EXPORT VideoCaptureDeviceMFWin
       OVERRIDE;
   virtual void StopAndDeAllocate() OVERRIDE;
 
-  // Returns true iff the current platform supports the Media Foundation API
-  // and that the DLLs are available.  On Vista this API is an optional download
-  // but the API is advertised as a part of Windows 7 and onwards.  However,
-  // we've seen that the required DLLs are not available in some Win7
-  // distributions such as Windows 7 N and Windows 7 KN.
-  static bool PlatformSupported();
-
-  static void GetDeviceNames(Names* device_names);
-
-  static void GetDeviceSupportedFormats(const Name& device,
-                                        VideoCaptureFormats* formats);
-
   // Captured new video data.
   void OnIncomingCapturedData(const uint8* data,
                               int length,