Add crop ioctl ops. For VPE, cropping only makes sense with the input to VPE, or
the V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE buffer type.
For the CAPTURE type, a S_CROP ioctl results in setting the crop region as the
whole image itself, hence making crop dimensions same as the pix dimensions.
Setting the crop successfully should result in re-configuration of those
registers which are affected when either source or destination dimensions
change, set_srcdst_params() is called for this purpose.
Some standard crop parameter checks are done in __vpe_try_crop().
Signed-off-by: Archit Taneja <archit@xxxxxx>
---
drivers/media/platform/ti-vpe/vpe.c | 96 +++++++++++++++++++++++++++++++++++++
1 file changed, 96 insertions(+)
diff --git a/drivers/media/platform/ti-vpe/vpe.c b/drivers/media/platform/ti-vpe/vpe.c
index 6acdcd8..c6778f4 100644
--- a/drivers/media/platform/ti-vpe/vpe.c
+++ b/drivers/media/platform/ti-vpe/vpe.c
@@ -1585,6 +1585,98 @@ static int vpe_s_fmt(struct file *file, void *priv, struct v4l2_format *f)
return set_srcdst_params(ctx);
}
+static int __vpe_try_crop(struct vpe_ctx *ctx, struct v4l2_crop *cr)
+{
+ struct vpe_q_data *q_data;
+
+ q_data = get_q_data(ctx, cr->type);
+ if (!q_data)
+ return -EINVAL;
+
+ /* we don't support crop on capture plane */
+ if (cr->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
+ cr->c.top = cr->c.left = 0;
+ cr->c.width = q_data->width;
+ cr->c.height = q_data->height;
+ return 0;
+ }
+
+ if (cr->c.top < 0 || cr->c.left < 0) {
+ vpe_err(ctx->dev, "negative values for top and left\n");
+ cr->c.top = cr->c.left = 0;
+ }
+
+ v4l_bound_align_image(&cr->c.width, MIN_W, q_data->width, 1,
+ &cr->c.height, MIN_H, q_data->height, H_ALIGN, S_ALIGN);
+
+ /* adjust left/top if cropping rectangle is out of bounds */
+ if (cr->c.left + cr->c.width > q_data->width)
+ cr->c.left = q_data->width - cr->c.width;
+ if (cr->c.top + cr->c.height > q_data->height)
+ cr->c.top = q_data->height - cr->c.height;
+
+ return 0;
+}
+
+static int vpe_cropcap(struct file *file, void *priv, struct v4l2_cropcap *cr)
+{
+ struct vpe_ctx *ctx = file2ctx(file);
+ struct vpe_q_data *q_data;
+
+ q_data = get_q_data(ctx, cr->type);
+ if (!q_data)
+ return -EINVAL;
+
+ cr->bounds.left = 0;
+ cr->bounds.top = 0;
+ cr->bounds.width = q_data->width;
+ cr->bounds.height = q_data->height;
+ cr->defrect = cr->bounds;
+
+ return 0;
+}
+
+static int vpe_g_crop(struct file *file, void *fh, struct v4l2_crop *cr)
+{
+ struct vpe_ctx *ctx = file2ctx(file);
+ struct vpe_q_data *q_data;
+
+ q_data = get_q_data(ctx, cr->type);
+ if (!q_data)
+ return -EINVAL;
+
+ cr->c = q_data->c_rect;
+
+ return 0;
+}
+
+static int vpe_s_crop(struct file *file, void *priv,
+ const struct v4l2_crop *crop)
+{
+ struct vpe_ctx *ctx = file2ctx(file);
+ struct vpe_q_data *q_data;
+ struct v4l2_crop cr = *crop;
+ int ret;
+
+ ret = __vpe_try_crop(ctx, &cr);
+ if (ret)
+ return ret;
+
+ q_data = get_q_data(ctx, cr.type);
+
+ if ((q_data->c_rect.left == cr.c.left) &&
+ (q_data->c_rect.top == cr.c.top) &&
+ (q_data->c_rect.width == cr.c.width) &&
+ (q_data->c_rect.height == cr.c.height)) {
+ vpe_dbg(ctx->dev, "requested crop values are already set\n");
+ return 0;
+ }
+
+ q_data->c_rect = cr.c;
+
+ return set_srcdst_params(ctx);
+}
+
static int vpe_reqbufs(struct file *file, void *priv,
struct v4l2_requestbuffers *reqbufs)
{
@@ -1672,6 +1764,10 @@ static const struct v4l2_ioctl_ops vpe_ioctl_ops = {
.vidioc_try_fmt_vid_out_mplane = vpe_try_fmt,
.vidioc_s_fmt_vid_out_mplane = vpe_s_fmt,
+ .vidioc_cropcap = vpe_cropcap,
+ .vidioc_g_crop = vpe_g_crop,
+ .vidioc_s_crop = vpe_s_crop,
+
.vidioc_reqbufs = vpe_reqbufs,
.vidioc_querybuf = vpe_querybuf,
--
1.8.3.2
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
