From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-pl1-f195.google.com ([209.85.214.195]:41924 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727087AbeKIPMB (ORCPT ); Fri, 9 Nov 2018 10:12:01 -0500 Received: by mail-pl1-f195.google.com with SMTP id p16-v6so406658plr.8 for ; Thu, 08 Nov 2018 21:33:06 -0800 (PST) Subject: Re: [PATCH 1/3] media: imx: add capture compose rectangle To: Philipp Zabel , linux-media@vger.kernel.org Cc: Hans Verkuil References: <20181105152055.31254-1-p.zabel@pengutronix.de> From: Steve Longerbeam Message-ID: <67e65cb6-d963-f53d-88e6-a28349477183@gmail.com> Date: Thu, 8 Nov 2018 21:33:00 -0800 MIME-Version: 1.0 In-Reply-To: <20181105152055.31254-1-p.zabel@pengutronix.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Sender: linux-media-owner@vger.kernel.org List-ID: Hi Philipp, On 11/5/18 7:20 AM, Philipp Zabel wrote: > Allowing to compose captured images into larger memory buffers > will let us lift alignment restrictions on CSI crop width. > > Signed-off-by: Philipp Zabel > --- > drivers/staging/media/imx/imx-ic-prpencvf.c | 3 +- > drivers/staging/media/imx/imx-media-capture.c | 38 +++++++++++++++++++ > drivers/staging/media/imx/imx-media-csi.c | 3 +- > drivers/staging/media/imx/imx-media-vdic.c | 4 +- > drivers/staging/media/imx/imx-media.h | 2 + > 5 files changed, 44 insertions(+), 6 deletions(-) > > diff --git a/drivers/staging/media/imx/imx-ic-prpencvf.c b/drivers/staging/media/imx/imx-ic-prpencvf.c > index 28f41caba05d..fe5a77baa592 100644 > --- a/drivers/staging/media/imx/imx-ic-prpencvf.c > +++ b/drivers/staging/media/imx/imx-ic-prpencvf.c > @@ -366,8 +366,7 @@ static int prp_setup_channel(struct prp_priv *priv, > > memset(&image, 0, sizeof(image)); > image.pix = vdev->fmt.fmt.pix; > - image.rect.width = image.pix.width; > - image.rect.height = image.pix.height; > + image.rect = vdev->compose; > > if (rot_swap_width_height) { > swap(image.pix.width, image.pix.height); > diff --git a/drivers/staging/media/imx/imx-media-capture.c b/drivers/staging/media/imx/imx-media-capture.c > index b37e1186eb2f..cace8a51aca8 100644 > --- a/drivers/staging/media/imx/imx-media-capture.c > +++ b/drivers/staging/media/imx/imx-media-capture.c > @@ -262,6 +262,10 @@ static int capture_s_fmt_vid_cap(struct file *file, void *fh, > priv->vdev.fmt.fmt.pix = f->fmt.pix; > priv->vdev.cc = imx_media_find_format(f->fmt.pix.pixelformat, > CS_SEL_ANY, true); > + priv->vdev.compose.left = 0; > + priv->vdev.compose.top = 0; > + priv->vdev.compose.width = f->fmt.fmt.pix.width; > + priv->vdev.compose.height = f->fmt.fmt.pix.height; this should be: priv->vdev.compose.width = fmt_src.format.width; priv->vdev.compose.height = fmt_src.format.height; (corrected in the next patches but needs to be corrected here). > > return 0; > } > @@ -290,6 +294,35 @@ static int capture_s_std(struct file *file, void *fh, v4l2_std_id std) > return v4l2_subdev_call(priv->src_sd, video, s_std, std); > } > > +static int capture_g_selection(struct file *file, void *fh, > + struct v4l2_selection *s) > +{ > + struct capture_priv *priv = video_drvdata(file); > + > + switch (s->target) { > + case V4L2_SEL_TGT_CROP: > + case V4L2_SEL_TGT_CROP_DEFAULT: > + case V4L2_SEL_TGT_CROP_BOUNDS: > + case V4L2_SEL_TGT_NATIVE_SIZE: > + case V4L2_SEL_TGT_COMPOSE: > + case V4L2_SEL_TGT_COMPOSE_DEFAULT: > + case V4L2_SEL_TGT_COMPOSE_BOUNDS: > + case V4L2_SEL_TGT_COMPOSE_PADDED: > + s->r = priv->vdev.compose; > + break; > + default: > + return -EINVAL; > + } > + > + return 0; > +} > + > +static int capture_s_selection(struct file *file, void *fh, > + struct v4l2_selection *s) > +{ > + return capture_g_selection(file, fh, s); > +} > + > static int capture_g_parm(struct file *file, void *fh, > struct v4l2_streamparm *a) > { > @@ -350,6 +383,9 @@ static const struct v4l2_ioctl_ops capture_ioctl_ops = { > .vidioc_g_std = capture_g_std, > .vidioc_s_std = capture_s_std, > > + .vidioc_g_selection = capture_g_selection, > + .vidioc_s_selection = capture_s_selection, > + > .vidioc_g_parm = capture_g_parm, > .vidioc_s_parm = capture_s_parm, > > @@ -687,6 +723,8 @@ int imx_media_capture_device_register(struct imx_media_video_dev *vdev) > vdev->fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; > imx_media_mbus_fmt_to_pix_fmt(&vdev->fmt.fmt.pix, > &fmt_src.format, NULL); > + vdev->compose.width = fmt_src.format.width; > + vdev->compose.height = fmt_src.format.height; > vdev->cc = imx_media_find_format(vdev->fmt.fmt.pix.pixelformat, > CS_SEL_ANY, false); > > diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c > index 4223f8d418ae..c4523afe7b48 100644 > --- a/drivers/staging/media/imx/imx-media-csi.c > +++ b/drivers/staging/media/imx/imx-media-csi.c > @@ -413,8 +413,7 @@ static int csi_idmac_setup_channel(struct csi_priv *priv) > > memset(&image, 0, sizeof(image)); > image.pix = vdev->fmt.fmt.pix; > - image.rect.width = image.pix.width; > - image.rect.height = image.pix.height; > + image.rect = vdev->compose; > > csi_idmac_setup_vb2_buf(priv, phys); > > diff --git a/drivers/staging/media/imx/imx-media-vdic.c b/drivers/staging/media/imx/imx-media-vdic.c > index 482250d47e7c..e08d296cf4eb 100644 > --- a/drivers/staging/media/imx/imx-media-vdic.c > +++ b/drivers/staging/media/imx/imx-media-vdic.c > @@ -263,10 +263,10 @@ static int setup_vdi_channel(struct vdic_priv *priv, > > memset(&image, 0, sizeof(image)); > image.pix = vdev->fmt.fmt.pix; > + image.rect = vdev->compose; > /* one field to VDIC channels */ > image.pix.height /= 2; > - image.rect.width = image.pix.width; > - image.rect.height = image.pix.height; > + image.rect.height /= 2; > image.phys0 = phys0; > image.phys1 = phys1; > > diff --git a/drivers/staging/media/imx/imx-media.h b/drivers/staging/media/imx/imx-media.h > index bc7feb81937c..7a0e658753f0 100644 > --- a/drivers/staging/media/imx/imx-media.h > +++ b/drivers/staging/media/imx/imx-media.h > @@ -80,6 +80,8 @@ struct imx_media_video_dev { > > /* the user format */ > struct v4l2_format fmt; > + /* the compose rectangle */ > + struct v4l2_rect compose; > const struct imx_media_pixfmt *cc; > > /* links this vdev to master list */