Reland: Reorganize media::VideoCapture* types

media/video/capture/win/video_capture_device_win.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.
 
 // Windows specific implementation of VideoCaptureDevice.
 // DirectShow is used for capturing. DirectShow provide its own threads
 // for capturing.
 
 #ifndef MEDIA_VIDEO_CAPTURE_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_
 #define MEDIA_VIDEO_CAPTURE_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_
@@ skipping 22 matching lines @@
       public VideoCaptureDevice,
       public SinkFilterObserver {
  public:
   explicit VideoCaptureDeviceWin(const Name& device_name);
   virtual ~VideoCaptureDeviceWin();
   // Opens the device driver for this device.
   // This function is used by the static VideoCaptureDevice::Create function.
   bool Init();
 
   // VideoCaptureDevice implementation.
-  virtual void AllocateAndStart(
-      const VideoCaptureCapability& capture_format,
-      scoped_ptr<VideoCaptureDevice::Client> client) OVERRIDE;
+  virtual void AllocateAndStart(const VideoCaptureParams& params,
+                                scoped_ptr<VideoCaptureDevice::Client> client)
+      OVERRIDE;
   virtual void StopAndDeAllocate() OVERRIDE;
 
   static void GetDeviceNames(Names* device_names);
 
  private:
   enum InternalState {
     kIdle,  // The device driver is opened but camera is not in use.
     kCapturing,  // Video is being captured.
     kError  // Error accessing HW functions.
             // User needs to recover by destroying the object.
@@ skipping 16 matching lines @@
   base::win::ScopedComPtr<IPin> output_capture_pin_;
   // Used when using a MJPEG decoder.
   base::win::ScopedComPtr<IBaseFilter> mjpg_filter_;
   base::win::ScopedComPtr<IPin> input_mjpg_pin_;
   base::win::ScopedComPtr<IPin> output_mjpg_pin_;
 
   scoped_refptr<SinkFilter> sink_filter_;
 
   // Map of all capabilities this device support.
   CapabilityList capabilities_;
-  VideoCaptureCapability current_setting_;
+  VideoCaptureFormat capture_format_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceWin);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_VIDEO_CAPTURE_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_