[media] v4l: add support for selection api

This patch introduces new api for a precise control of cropping and composing
features for video devices. The new ioctls are VIDIOC_S_SELECTION and
VIDIOC_G_SELECTION.

Signed-off-by: Tomasz Stanislawski <t.stanislaws@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 36 insertions, 0 deletions

diff --git a/drivers/media/video/v4l2-compat-ioctl32.c b/drivers/media/video/v4l2-compat-ioctl32.c
index c68531b88279..af4419e6c658 100644
--- a/drivers/media/video/v4l2-compat-ioctl32.c
+++ b/drivers/media/video/v4l2-compat-ioctl32.c
@@ -985,6 +985,8 @@ long v4l2_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)
         case VIDIOC_CROPCAP:
         case VIDIOC_G_CROP:
         case VIDIOC_S_CROP:
+        case VIDIOC_G_SELECTION:
+        case VIDIOC_S_SELECTION:
         case VIDIOC_G_JPEGCOMP:
         case VIDIOC_S_JPEGCOMP:
         case VIDIOC_QUERYSTD:
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
index 639abeee3392..072cfc1a166f 100644
--- a/drivers/media/video/v4l2-ioctl.c
+++ b/drivers/media/video/v4l2-ioctl.c
@@ -238,6 +238,8 @@ static const char *v4l2_ioctls[] = {
         [_IOC_NR(VIDIOC_CROPCAP)]          = "VIDIOC_CROPCAP",
         [_IOC_NR(VIDIOC_G_CROP)]           = "VIDIOC_G_CROP",
         [_IOC_NR(VIDIOC_S_CROP)]           = "VIDIOC_S_CROP",
+        [_IOC_NR(VIDIOC_G_SELECTION)]      = "VIDIOC_G_SELECTION",
+        [_IOC_NR(VIDIOC_S_SELECTION)]      = "VIDIOC_S_SELECTION",
         [_IOC_NR(VIDIOC_G_JPEGCOMP)]       = "VIDIOC_G_JPEGCOMP",
         [_IOC_NR(VIDIOC_S_JPEGCOMP)]       = "VIDIOC_S_JPEGCOMP",
         [_IOC_NR(VIDIOC_QUERYSTD)]         = "VIDIOC_QUERYSTD",
@@ -1571,6 +1573,38 @@ static long __video_do_ioctl(struct file *file,
                 ret = ops->vidioc_s_crop(file, fh, p);
                 break;
         }
+        case VIDIOC_G_SELECTION:
+        {
+                struct v4l2_selection *p = arg;
+
+                if (!ops->vidioc_g_selection)
+                        break;
+
+                dbgarg(cmd, "type=%s\n", prt_names(p->type, v4l2_type_names));
+
+                ret = ops->vidioc_g_selection(file, fh, p);
+                if (!ret)
+                        dbgrect(vfd, "", &p->r);
+                break;
+        }
+        case VIDIOC_S_SELECTION:
+        {
+                struct v4l2_selection *p = arg;
+
+                if (!ops->vidioc_s_selection)
+                        break;
+
+                if (ret_prio) {
+                        ret = ret_prio;
+                        break;
+                }
+
+                dbgarg(cmd, "type=%s\n", prt_names(p->type, v4l2_type_names));
+                dbgrect(vfd, "", &p->r);
+
+                ret = ops->vidioc_s_selection(file, fh, p);
+                break;
+        }
         case VIDIOC_CROPCAP:
         {
                 struct v4l2_cropcap *p = arg;