Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

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 depended 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/time.h"
 #include "media/base/media_export.h"
+#include "media/video/capture/video_capture_types.h"
 
 namespace media {
 
 class MEDIA_EXPORT VideoCaptureDevice {
  public:
 
   struct Name {
     // Friendly name of a device
     std::string 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.
     std::string unique_id;
   };
   typedef std::list<Name> Names;
 
-  // Color formats from camera.
-  enum Format {
-    kColorUnknown,  // Color format not set.
-    kI420,
-    kYUY2,
-    kUYVY,
-    kRGB24,
-    kARGB,
-    kMJPEG,  // Currently only supported on Windows.
-    kNV21,
-    kYV12,
-  };
-
-  // Describes the format a camera capture video in.
-  struct Capability {
-    Capability()
-        : width(0),
-          height(0),
-          frame_rate(0),
-          color(kColorUnknown) {}
-    int width;
-    int height;
-    int frame_rate;
-    Format color;
-  };
-
   class EventHandler {
    public:
     // Captured a new video frame.
     virtual void OnIncomingCapturedFrame(const uint8* data,
                                          int length,
                                          base::Time timestamp) = 0;
     // An error has occurred that can not be handled
     // and VideoCaptureDevice must be DeAllocated.
     virtual void OnError() = 0;
     // Called when VideoCaptureDevice::Allocate has been called
     // to inform of the resulting frame size and color format.
-    virtual void OnFrameInfo(const Capability& info) = 0;
+    virtual void OnFrameInfo(const VideoCaptureCapability& info) = 0;
 
    protected:
     virtual ~EventHandler() {}
   };
   // Creates a VideoCaptureDevice object.
   // Return NULL if the hardware is not available.
   static VideoCaptureDevice* Create(const Name& device_name);
   virtual ~VideoCaptureDevice() {}
 
   // Gets the names of all video capture devices connected to this computer.
@@ skipping 20 matching lines @@
   // state it was when created.
   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_