Added supported formats caching to VideoCaptureManager.

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 128 matching lines @@
       } else {
         DVLOG(1) << "No usable formats reported by " << info.GetName().value();
       }
     }
     close(fd);
   }
 }
 
 void VideoCaptureDevice::GetDeviceSupportedFormats(
     const Name& device,
-    VideoCaptureCapabilities* formats) {
+    VideoCaptureFormats* supported_formats) {
 

[scherkus (not reviewing), 2013/12/03 22:04:48]

nit: remove extra blank line

[mcasas, 2013/12/04 15:23:32]

Done.

   if (device.id().empty())
     return;
   int fd;

[scherkus (not reviewing), 2013/12/03 22:04:48]

it would be nice to use ScopedFD from base/

[mcasas, 2013/12/04 15:23:32]

Same as below, http://crbug.com/324428 for this file's
cleanup and chromium-magic use.

-  VideoCaptureCapabilities capture_formats;
-  if ((fd = open(device.id().c_str(), O_RDONLY)) < 0) {
-    // Failed to open this device.
+  if ((fd = open(device.id().c_str(), O_RDONLY)) < 0)

[scherkus (not reviewing), 2013/12/03 22:04:48]

shouldn't these calls be using HANDLE_EINTR()?

can you file a bug and add a TODO to audit this whole file for proper
HANDLE_EINTR() and other POSIX open/ioctl/close/etc... usage?

[mcasas, 2013/12/04 15:23:32]

I reused http://crbug.com/324428 which already points out that the
|v4l2_thread_| might be not needed, to add this point, thanks!

     return;
-  }
 
-  formats->clear();
-
-  VideoCaptureCapability capture_capability;
-  // Retrieve the caps one by one, first get colorspace, then sizes, then
-  // framerates. See http://linuxtv.org/downloads/v4l-dvb-apis for reference.
+  supported_formats->clear();
+  // Retrieve the caps one by one, first get pixel format, then sizes, then
+  // frame rates. See http://linuxtv.org/downloads/v4l-dvb-apis for reference.
   v4l2_fmtdesc pixel_format = {};
   pixel_format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
   while (ioctl(fd, VIDIOC_ENUM_FMT, &pixel_format) == 0) {
-    capture_capability.supported_format.pixel_format =
+    VideoCaptureFormat supported_format;
+    supported_format.pixel_format =
         V4l2ColorToVideoCaptureColorFormat((int32)pixel_format.pixelformat);
-    if (capture_capability.supported_format.pixel_format ==
-        PIXEL_FORMAT_UNKNOWN) {
+    if (supported_format.pixel_format == PIXEL_FORMAT_UNKNOWN) {
       continue;
     }
 
     v4l2_frmsizeenum frame_size = {};
     frame_size.pixel_format = pixel_format.pixelformat;
     while (ioctl(fd, VIDIOC_ENUM_FRAMESIZES, &frame_size) == 0) {
       if (frame_size.type == V4L2_FRMSIZE_TYPE_DISCRETE) {
-        capture_capability.supported_format.frame_size.SetSize(
-            frame_size.discrete.width, frame_size.discrete.height);
+        supported_format.frame_size.SetSize(frame_size.discrete.width,
+                                            frame_size.discrete.height);
       } else if (frame_size.type == V4L2_FRMSIZE_TYPE_STEPWISE) {
         // TODO(mcasas): see http://crbug.com/249953, support these devices.
         NOTIMPLEMENTED();
       } else if (frame_size.type == V4L2_FRMSIZE_TYPE_CONTINUOUS) {
         // TODO(mcasas): see http://crbug.com/249953, support these devices.
         NOTIMPLEMENTED();
       }
       v4l2_frmivalenum frame_interval = {};
       frame_interval.pixel_format = pixel_format.pixelformat;
       frame_interval.width = frame_size.discrete.width;
       frame_interval.height = frame_size.discrete.height;
       while (ioctl(fd, VIDIOC_ENUM_FRAMEINTERVALS, &frame_interval) == 0) {
         if (frame_interval.type == V4L2_FRMIVAL_TYPE_DISCRETE) {
           if (frame_interval.discrete.numerator != 0) {
-            capture_capability.supported_format.frame_rate =
+            supported_format.frame_rate =
                 static_cast<float>(frame_interval.discrete.denominator) /
                 static_cast<float>(frame_interval.discrete.numerator);
           } else {
-            capture_capability.supported_format.frame_rate = 0;
+            supported_format.frame_rate = 0;
           }
         } else if (frame_interval.type == V4L2_FRMIVAL_TYPE_CONTINUOUS) {
           // TODO(mcasas): see http://crbug.com/249953, support these devices.
           NOTIMPLEMENTED();
           break;
         } else if (frame_interval.type == V4L2_FRMIVAL_TYPE_STEPWISE) {
           // TODO(mcasas): see http://crbug.com/249953, support these devices.
           NOTIMPLEMENTED();
           break;
         }
-        formats->push_back(capture_capability);
+        supported_formats->push_back(supported_format);
         ++frame_interval.index;
       }
       ++frame_size.index;
     }
     ++pixel_format.index;
   }
 
   close(fd);
   return;
 }
@@ skipping 392 matching lines @@
 
 void VideoCaptureDeviceLinux::SetErrorState(const std::string& reason) {
   DCHECK(!v4l2_thread_.IsRunning() ||
          v4l2_thread_.message_loop() == base::MessageLoop::current());
   DVLOG(1) << reason;
   state_ = kError;
   client_->OnError();
 }
 
 }  // namespace media