OSDN Git Service

media: cobalt: Use v4l2_calc_timeperframe helper
authorJose Abreu <Jose.Abreu@synopsys.com>
Tue, 21 Mar 2017 11:49:18 +0000 (07:49 -0400)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Fri, 31 Aug 2018 14:03:21 +0000 (10:03 -0400)
Currently, cobalt driver always returns 60fps in g_parm.
This patch uses the new v4l2_calc_timeperframe helper to
calculate the time per frame value.

Signed-off-by: Jose Abreu <joabreu@synopsys.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/pci/cobalt/cobalt-v4l2.c

index e2a4c70..c8fd2d0 100644 (file)
@@ -1064,10 +1064,15 @@ static int cobalt_subscribe_event(struct v4l2_fh *fh,
 
 static int cobalt_g_parm(struct file *file, void *fh, struct v4l2_streamparm *a)
 {
+       struct cobalt_stream *s = video_drvdata(file);
+       struct v4l2_fract fps;
+
        if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
                return -EINVAL;
-       a->parm.capture.timeperframe.numerator = 1;
-       a->parm.capture.timeperframe.denominator = 60;
+
+       fps = v4l2_calc_timeperframe(&s->timings);
+       a->parm.capture.timeperframe.numerator = fps.numerator;
+       a->parm.capture.timeperframe.denominator = fps.denominator;
        a->parm.capture.readbuffers = 3;
        return 0;
 }