Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

media/base/video_frame.h

Index: media/base/video_frame.h
diff --git a/media/base/video_frame.h b/media/base/video_frame.h
index 42b627adb5b9a88a065a1a0c2d2c59b5ae6fb566..a62d3cd5593ce5f754cfc33550caa1d8ae371e54 100644
--- a/media/base/video_frame.h
+++ b/media/base/video_frame.h
@@ -35,6 +35,15 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> {
     EMPTY = 9,  // An empty frame.
     I420 = 11,  // 12bpp YVU planar 1x1 Y, 2x2 UV samples.
     NATIVE_TEXTURE = 12,  // Native texture.  Pixel-format agnostic.
+
+    // Color formats from camera.
+    kColorUnknown,  // Color format not set.

[scherkus (not reviewing), 2012/04/19 19:09:35]

does the capture code actually use VideoFrame or just the constants?

If the latter I'd prefer a separate enum for that is specific for capturing,
otherwise we give the false impression that VideoFrame (the class) supports
these formats

+    kI420,
+    kYUY2,
+    kUYVY,
+    kRGB24,
+    kARGB,
+    kMJPEG,  // Currently only supported on Windows.
   };
 
   // Creates a new frame in system memory with given parameters. Buffers for