[media] v4l2-ioctl: call g_selection before calling cropcap

If the vidioc_cropcap op is implemented by the driver then the v4l2
core will call that directly.

If g_selection is available, then the core cropcap implementation
uses g_selection to fill in the bounds and defrect and it sets the
pixelaspect to 1x1.

But if both are available, then I would like to use g_selection to
fill in defrect and bounds before calling cropcap. That way the
driver's cropcap implementation doesn't have to set defrect or
bounds.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index dca8ca9ad48ede65f4b23cf41fca02f977b15f36..46f45f087a836dc1b57fe2cf73357a35aad3f003 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1842,37 +1842,41 @@ static int v4l_cropcap(const struct v4l2_ioctl_ops *ops,
                                struct file *file, void *fh, void *arg)
 {
        struct v4l2_cropcap *p = arg;
-       struct v4l2_selection s = { .type = p->type };
-       int ret;
 
-       if (ops->vidioc_cropcap)
-               return ops->vidioc_cropcap(file, fh, p);
+       if (ops->vidioc_g_selection) {
+               struct v4l2_selection s = { .type = p->type };
+               int ret;
 
-       /* obtaining bounds */
-       if (V4L2_TYPE_IS_OUTPUT(p->type))
-               s.target = V4L2_SEL_TGT_COMPOSE_BOUNDS;
-       else
-               s.target = V4L2_SEL_TGT_CROP_BOUNDS;
+               /* obtaining bounds */
+               if (V4L2_TYPE_IS_OUTPUT(p->type))
+                       s.target = V4L2_SEL_TGT_COMPOSE_BOUNDS;
+               else
+                       s.target = V4L2_SEL_TGT_CROP_BOUNDS;
 
-       ret = ops->vidioc_g_selection(file, fh, &s);
-       if (ret)
-               return ret;
-       p->bounds = s.r;
+               ret = ops->vidioc_g_selection(file, fh, &s);
+               if (ret)
+                       return ret;
+               p->bounds = s.r;
 
-       /* obtaining defrect */
-       if (V4L2_TYPE_IS_OUTPUT(p->type))
-               s.target = V4L2_SEL_TGT_COMPOSE_DEFAULT;
-       else
-               s.target = V4L2_SEL_TGT_CROP_DEFAULT;
+               /* obtaining defrect */
+               if (V4L2_TYPE_IS_OUTPUT(p->type))
+                       s.target = V4L2_SEL_TGT_COMPOSE_DEFAULT;
+               else
+                       s.target = V4L2_SEL_TGT_CROP_DEFAULT;
 
-       ret = ops->vidioc_g_selection(file, fh, &s);
-       if (ret)
-               return ret;
-       p->defrect = s.r;
+               ret = ops->vidioc_g_selection(file, fh, &s);
+               if (ret)
+                       return ret;
+               p->defrect = s.r;
+       }
 
        /* setting trivial pixelaspect */
        p->pixelaspect.numerator = 1;
        p->pixelaspect.denominator = 1;
+
+       if (ops->vidioc_cropcap)
+               return ops->vidioc_cropcap(file, fh, p);
+
        return 0;
 }