Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

media/base/video_frame.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.
 
 #ifndef MEDIA_BASE_VIDEO_FRAME_H_
 #define MEDIA_BASE_VIDEO_FRAME_H_
 
 #include "base/callback.h"
 #include "base/md5.h"
 #include "media/base/buffers.h"
@@ skipping 17 matching lines @@
   // http://www.fourcc.org/yuv.php
   // Keep in sync with WebKit::WebVideoFrame!
   enum Format {
     INVALID = 0,  // Invalid format value.  Used for error reporting.
     RGB32 = 4,  // 32bpp RGB packed with extra byte 8:8:8
     YV12 = 6,  // 12bpp YVU planar 1x1 Y, 2x2 VU samples
     YV16 = 7,  // 16bpp YVU planar 1x1 Y, 2x1 VU samples
     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
   // the frame are allocated but not initialized.
   static scoped_refptr<VideoFrame> CreateFrame(
       Format format,
       size_t width,
       size_t height,
       base::TimeDelta timestamp,
       base::TimeDelta duration);
@@ skipping 110 matching lines @@
 
   base::TimeDelta timestamp_;
   base::TimeDelta duration_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(VideoFrame);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_VIDEO_FRAME_H_