Move VideoCapture::VideoCaptureCapability to video_capture_types.h

This is a first patch of merge VideoCaptureDevice::Capability with VideoCaptureCapability, just for the convenience of review.

BUG=123738
TEST=media_unittests


Review URL: http://codereview.chromium.org/10108009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132742 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 14 insertions, 13 deletions

diff --git a/media/video/capture/video_capture.h b/media/video/capture/video_capture.h
index 0af1abf..4f583b3 100644
--- a/media/video/capture/video_capture.h
+++ b/media/video/capture/video_capture.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 //
@@ -70,17 +70,6 @@ class MEDIA_EXPORT VideoCapture {
         const VideoCaptureParams& device_info) = 0;
   };
 
-  // TODO(wjia): merge with similar struct in browser process and move it to
-  // video_capture_types.h.
-  struct VideoCaptureCapability {
-    int width;  // desired width.
-    int height;  // desired height.
-    int max_fps;  // desired maximum frame rate.
-    int expected_capture_delay;  // expected delay in millisecond.
-    media::VideoFrame::Format raw_type;  // desired video type.
-    bool interlaced;  // need interlace format.
-  };
-
   VideoCapture() {}
   virtual ~VideoCapture() {}
 
diff --git a/media/video/capture/video_capture_types.h b/media/video/capture/video_capture_types.h
index 724f243..d5f3fdf 100644
--- a/media/video/capture/video_capture_types.h
+++ b/media/video/capture/video_capture_types.h
@@ -1,10 +1,12 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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_VIDEO_CAPTURE_VIDEO_CAPTURE_TYPES_H_
 #define MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURE_TYPES_H_
 
+#include "media/base/video_frame.h"
+
 namespace media {
 
 // TODO(wjia): this type should be defined in a common place and
@@ -19,6 +21,16 @@ struct VideoCaptureParams {
   VideoCaptureSessionId session_id;
 };
 
+// Capabilities describe the format a camera capture video in.
+struct VideoCaptureCapability {
+  int width;  // Desired width.
+  int height;  // Desired height.
+  int frame_rate;  // Desired frame rate.
+  media::VideoFrame::Format color;  // Desired video type.
+  int expected_capture_delay;  // Expected delay in millisecond.
+  bool interlaced;  // Need interlace format.
+};
+
 }  // namespace media
 
 #endif  // MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURE_TYPES_H_