$OpenBSD: patch-media_video_capture_linux_video_capture_device_linux_cc,v 1.7 2014/07/20 17:22:34 robert Exp $
--- media/video/capture/linux/video_capture_device_linux.cc.orig.port	Tue Jul 15 13:02:18 2014
+++ media/video/capture/linux/video_capture_device_linux.cc	Thu Jul 17 12:25:31 2014
@@ -174,10 +174,7 @@ void VideoCaptureDevice::GetDeviceSupportedFormats(
     frame_size.pixel_format = pixel_format.pixelformat;
     while (HANDLE_EINTR(ioctl(fd.get(), VIDIOC_ENUM_FRAMESIZES, &frame_size)) ==
            0) {
-      if (frame_size.type == V4L2_FRMSIZE_TYPE_DISCRETE) {
-        supported_format.frame_size.SetSize(
-            frame_size.discrete.width, frame_size.discrete.height);
-      } else if (frame_size.type == V4L2_FRMSIZE_TYPE_STEPWISE) {
+      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) {
@@ -186,19 +183,9 @@ void VideoCaptureDevice::GetDeviceSupportedFormats(
       }
       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 (HANDLE_EINTR(ioctl(
                  fd.get(), VIDIOC_ENUM_FRAMEINTERVALS, &frame_interval)) == 0) {
-        if (frame_interval.type == V4L2_FRMIVAL_TYPE_DISCRETE) {
-          if (frame_interval.discrete.numerator != 0) {
-            supported_format.frame_rate =
-                static_cast<float>(frame_interval.discrete.denominator) /
-                static_cast<float>(frame_interval.discrete.numerator);
-          } else {
-            supported_format.frame_rate = 0;
-          }
-        } else if (frame_interval.type == V4L2_FRMIVAL_TYPE_CONTINUOUS) {
+        if (frame_interval.type == V4L2_FRMIVAL_TYPE_CONTINUOUS) {
           // TODO(mcasas): see http://crbug.com/249953, support these devices.
           NOTIMPLEMENTED();
           break;
