vivid: report only one frameinterval

PATCH New Hans Verkuil 1 participant 1 message Mar 13, 2015 Media (V4L/DVB)

Share & tools

Hans Verkuil

author

2015-03-13 16:22 UTC #0 lore raw

PATCH 1/1 vivid: report only one frameinterval

The vivid driver reports a range of frame intervals for non-webcams, when in fact the frame interval is fixed for those inputs as it depends on the DV timings or standard. Just report the single discrete frame interval instead.

Caught by v4l2-compliance.

Signed-off-by Hans Verkuil <[email protected]>

drivers/media/platform/vivid/vivid-vid-cap.c +2 -6

index 1d9ea2d..5ed44f2 100644
@@ -1689,18 +1689,14 @@ int vidioc_enum_frameintervals(struct file *file, void *priv,
 		return -EINVAL;
 
 	if (!vivid_is_webcam(dev)) {
-		static const struct v4l2_fract step = { 1, 1 };
-
 		if (fival->index)
 			return -EINVAL;
 		if (fival->width < MIN_WIDTH || fival->width > MAX_WIDTH * MAX_ZOOM)
 			return -EINVAL;
 		if (fival->height < MIN_HEIGHT || fival->height > MAX_HEIGHT * MAX_ZOOM)
 			return -EINVAL;
-		fival->type = V4L2_FRMIVAL_TYPE_CONTINUOUS;
-		fival->stepwise.min = tpf_min;
-		fival->stepwise.max = tpf_max;
-		fival->stepwise.step = step;
+		fival->type = V4L2_FRMIVAL_TYPE_DISCRETE;
+		fival->discrete = dev->timeperframe_vid_cap;
 		return 0;
 	}