Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

media/video/capture/linux/video_capture_device_linux.cc

 // 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.
 
 #include "media/video/capture/linux/video_capture_device_linux.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #if defined(OS_OPENBSD)
 #include <sys/videoio.h>
@@ skipping 32 matching lines @@
 // Time to wait in milliseconds before v4l2_thread_ reschedules OnCaptureTask
 // if an event is triggered (select) but no video frame is read.
 enum { kCaptureSelectWaitMs = 10 };
 
 // V4L2 color formats VideoCaptureDeviceLinux support.
 static const int32 kV4l2Fmts[] = {
   V4L2_PIX_FMT_YUV420,
   V4L2_PIX_FMT_YUYV
 };
 
-static VideoCaptureDevice::Format V4l2ColorToVideoCaptureColorFormat(
+static VideoCaptureCapability::Format V4l2ColorToVideoCaptureColorFormat(
     int32 v4l2_fourcc) {
-  VideoCaptureDevice::Format result = VideoCaptureDevice::kColorUnknown;
+  VideoCaptureCapability::Format result = VideoCaptureCapability::kColorUnknown;
   switch (v4l2_fourcc) {
     case V4L2_PIX_FMT_YUV420:
-      result = VideoCaptureDevice::kI420;
+      result = VideoCaptureCapability::kI420;
       break;
     case V4L2_PIX_FMT_YUYV:
-      result = VideoCaptureDevice::kYUY2;
+      result = VideoCaptureCapability::kYUY2;
       break;
   }
-  DCHECK_NE(result, VideoCaptureDevice::kColorUnknown);
+  DCHECK_NE(result, VideoCaptureCapability::kColorUnknown);
   return result;
 }
 
 void VideoCaptureDevice::GetDeviceNames(Names* device_names) {
   int fd = -1;
 
   // Empty the name list.
   device_names->clear();
 
   FilePath path("/dev/");
@@ skipping 166 matching lines @@
     SetErrorState("Failed to find supported camera format.");
     return;
   }
   // Set format and frame size now.
   if (ioctl(device_fd_, VIDIOC_S_FMT, &video_fmt) < 0) {
     SetErrorState("Failed to set camera format");
     return;
   }
 
   // Store our current width and height.
-  Capability current_settings;
+  VideoCaptureCapability current_settings;
   current_settings.color = V4l2ColorToVideoCaptureColorFormat(
       video_fmt.fmt.pix.pixelformat);
   current_settings.width  = video_fmt.fmt.pix.width;
   current_settings.height = video_fmt.fmt.pix.height;
   current_settings.frame_rate = frame_rate;
+  current_settings.expected_capture_delay = 0;
+  current_settings.interlaced = false;
 
   state_ = kAllocated;
   // Report the resulting frame size to the observer.
   observer_->OnFrameInfo(current_settings);
 }
 
 void VideoCaptureDeviceLinux::OnDeAllocate() {
   DCHECK_EQ(v4l2_thread_.message_loop(), MessageLoop::current());
 
   // If we are in error state or capturing
@@ skipping 181 matching lines @@
   buffer_pool_size_ = 0;
 }
 
 void VideoCaptureDeviceLinux::SetErrorState(const std::string& reason) {
   DLOG(ERROR) << reason;
   state_ = kError;
   observer_->OnError();
 }
 
 }  // namespace media