]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
[media] cobalt: add cropcap support
authorHans Verkuil <hans.verkuil@cisco.com>
Sun, 17 Jul 2016 08:42:07 +0000 (05:42 -0300)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Wed, 16 Nov 2016 17:20:49 +0000 (15:20 -0200)
Now that the timings contain picture aspect ratio information,
we can support cropcap to return the pixel aspect ratio.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/pci/cobalt/cobalt-v4l2.c

index 5c76637900d0be15330e920734f939a03b2820a0..3fea246130592c4e9c0a4890176f0f5a61ff23d6 100644 (file)
@@ -1084,12 +1084,33 @@ static int cobalt_g_parm(struct file *file, void *fh, struct v4l2_streamparm *a)
        return 0;
 }
 
+static int cobalt_cropcap(struct file *file, void *fh, struct v4l2_cropcap *cc)
+{
+       struct cobalt_stream *s = video_drvdata(file);
+       struct v4l2_dv_timings timings;
+       int err = 0;
+
+       if (cc->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+               return -EINVAL;
+       if (s->input == 1)
+               timings = cea1080p60;
+       else
+               err = v4l2_subdev_call(s->sd, video, g_dv_timings, &timings);
+       if (!err) {
+               cc->bounds.width = cc->defrect.width = timings.bt.width;
+               cc->bounds.height = cc->defrect.height = timings.bt.height;
+               cc->pixelaspect = v4l2_dv_timings_aspect_ratio(&timings);
+       }
+       return err;
+}
+
 static const struct v4l2_ioctl_ops cobalt_ioctl_ops = {
        .vidioc_querycap                = cobalt_querycap,
        .vidioc_g_parm                  = cobalt_g_parm,
        .vidioc_log_status              = cobalt_log_status,
        .vidioc_streamon                = vb2_ioctl_streamon,
        .vidioc_streamoff               = vb2_ioctl_streamoff,
+       .vidioc_cropcap                 = cobalt_cropcap,
        .vidioc_enum_input              = cobalt_enum_input,
        .vidioc_g_input                 = cobalt_g_input,
        .vidioc_s_input                 = cobalt_s_input,