Consolidate duplicated frame / capability structures in video_capture_types.h

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 @@
 static const int32 kV4l2RawFmts[] = {
   V4L2_PIX_FMT_YUV420,
   V4L2_PIX_FMT_YUYV
 };
 
 // Linux USB camera devices have names like "UVC Camera (1234:fdcb)"
 static const char kUsbSuffixStart[] = " (";
 static const size_t kUsbModelSize = 9;
 static const char kUsbSuffixEnd[] = ")";
 
-static VideoCaptureCapability::Format V4l2ColorToVideoCaptureColorFormat(
+static VideoPixelFormat V4l2ColorToVideoCaptureColorFormat(
     int32 v4l2_fourcc) {
-  VideoCaptureCapability::Format result = VideoCaptureCapability::kColorUnknown;
+  VideoPixelFormat result = PIXEL_FORMAT_UNKNOWN;
   switch (v4l2_fourcc) {
     case V4L2_PIX_FMT_YUV420:
-      result = VideoCaptureCapability::kI420;
+      result = PIXEL_FORMAT_I420;
       break;
     case V4L2_PIX_FMT_YUYV:
-      result = VideoCaptureCapability::kYUY2;
+      result = PIXEL_FORMAT_YUY2;
       break;
     case V4L2_PIX_FMT_MJPEG:
     case V4L2_PIX_FMT_JPEG:
-      result = VideoCaptureCapability::kMJPEG;
+      result = PIXEL_FORMAT_MJPEG;
       break;
   }
-  DCHECK_NE(result, VideoCaptureCapability::kColorUnknown);
+  DCHECK_NE(result, PIXEL_FORMAT_UNKNOWN);
   return result;
 }
 
 static void GetListOfUsableFourCCs(bool favour_mjpeg, std::list<int>* fourccs) {
   for (size_t i = 0; i < arraysize(kV4l2RawFmts); ++i)
     fourccs->push_back(kV4l2RawFmts[i]);
   if (favour_mjpeg)
     fourccs->push_front(V4L2_PIX_FMT_MJPEG);
   else
     fourccs->push_back(V4L2_PIX_FMT_MJPEG);
@@ skipping 481 matching lines @@
   buffer_pool_size_ = 0;
 }
 
 void VideoCaptureDeviceLinux::SetErrorState(const std::string& reason) {
   DVLOG(1) << reason;
   state_ = kError;
   observer_->OnError();
 }
 
 }  // namespace media