UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] v4l: Support s_crop and g_crop through s/g_selection 

Fall back to s_selection if s_crop isn't implemented by a driver. Same for
g_selection / g_crop.

Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Sakari Ailus 2011-11-14 15:30:24 -03:00 committed by Mauro Carvalho Chehab
parent 5e6ff7c17b
commit 5b9d770fa3
1 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/media/video/v4l2-subdev.c
View File

@ -228,6 +228,8 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
case VIDIOC_SUBDEV_G_CROP: { case VIDIOC_SUBDEV_G_CROP: {
struct v4l2_subdev_crop *crop = arg; struct v4l2_subdev_crop *crop = arg;
struct v4l2_subdev_selection sel;
int rval;
if (crop->which != V4L2_SUBDEV_FORMAT_TRY && if (crop->which != V4L2_SUBDEV_FORMAT_TRY &&
crop->which != V4L2_SUBDEV_FORMAT_ACTIVE) crop->which != V4L2_SUBDEV_FORMAT_ACTIVE)
@ -236,11 +238,27 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
if (crop->pad >= sd->entity.num_pads) if (crop->pad >= sd->entity.num_pads)
return -EINVAL; return -EINVAL;
return v4l2_subdev_call(sd, pad, get_crop, subdev_fh, crop); rval = v4l2_subdev_call(sd, pad, get_crop, subdev_fh, crop);
if (rval != -ENOIOCTLCMD)
return rval;
memset(&sel, 0, sizeof(sel));
sel.which = crop->which;
sel.pad = crop->pad;
sel.target = V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL;
rval = v4l2_subdev_call(
sd, pad, get_selection, subdev_fh, &sel);
crop->rect = sel.r;
return rval;
} }
case VIDIOC_SUBDEV_S_CROP: { case VIDIOC_SUBDEV_S_CROP: {
struct v4l2_subdev_crop *crop = arg; struct v4l2_subdev_crop *crop = arg;
struct v4l2_subdev_selection sel;
int rval;
if (crop->which != V4L2_SUBDEV_FORMAT_TRY && if (crop->which != V4L2_SUBDEV_FORMAT_TRY &&
crop->which != V4L2_SUBDEV_FORMAT_ACTIVE) crop->which != V4L2_SUBDEV_FORMAT_ACTIVE)
@ -249,7 +267,22 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
if (crop->pad >= sd->entity.num_pads) if (crop->pad >= sd->entity.num_pads)
return -EINVAL; return -EINVAL;
return v4l2_subdev_call(sd, pad, set_crop, subdev_fh, crop); rval = v4l2_subdev_call(sd, pad, set_crop, subdev_fh, crop);
if (rval != -ENOIOCTLCMD)
return rval;
memset(&sel, 0, sizeof(sel));
sel.which = crop->which;
sel.pad = crop->pad;
sel.target = V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL;
sel.r = crop->rect;
rval = v4l2_subdev_call(
sd, pad, set_selection, subdev_fh, &sel);
crop->rect = sel.r;
return rval;
} }
case VIDIOC_SUBDEV_ENUM_MBUS_CODE: { case VIDIOC_SUBDEV_ENUM_MBUS_CODE: {