| Message ID | 20190109110831.23395-2-p.zabel@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,1/3] media: imx: add capture compose rectangle | expand |
Reviewed-by: Steve Longerbeam <slongerbeam@gmail.com> On 1/9/19 3:08 AM, Philipp Zabel wrote: > Prepare for mbus format being smaller than the written rectangle > due to burst size. > > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> > --- > Changes since v1: > - Typo fixups, this time applied to the correct patch. > --- > drivers/staging/media/imx/imx-media-capture.c | 56 +++++++++++++------ > 1 file changed, 38 insertions(+), 18 deletions(-) > > diff --git a/drivers/staging/media/imx/imx-media-capture.c b/drivers/staging/media/imx/imx-media-capture.c > index fb985e68f9ab..614e335fb61c 100644 > --- a/drivers/staging/media/imx/imx-media-capture.c > +++ b/drivers/staging/media/imx/imx-media-capture.c > @@ -203,21 +203,13 @@ static int capture_g_fmt_vid_cap(struct file *file, void *fh, > return 0; > } > > -static int capture_try_fmt_vid_cap(struct file *file, void *fh, > - struct v4l2_format *f) > +static int __capture_try_fmt_vid_cap(struct capture_priv *priv, > + struct v4l2_subdev_format *fmt_src, > + struct v4l2_format *f) > { > - struct capture_priv *priv = video_drvdata(file); > - struct v4l2_subdev_format fmt_src; > const struct imx_media_pixfmt *cc, *cc_src; > - int ret; > > - fmt_src.pad = priv->src_sd_pad; > - fmt_src.which = V4L2_SUBDEV_FORMAT_ACTIVE; > - ret = v4l2_subdev_call(priv->src_sd, pad, get_fmt, NULL, &fmt_src); > - if (ret) > - return ret; > - > - cc_src = imx_media_find_ipu_format(fmt_src.format.code, CS_SEL_ANY); > + cc_src = imx_media_find_ipu_format(fmt_src->format.code, CS_SEL_ANY); > if (cc_src) { > u32 fourcc, cs_sel; > > @@ -231,7 +223,7 @@ static int capture_try_fmt_vid_cap(struct file *file, void *fh, > cc = imx_media_find_format(fourcc, cs_sel, false); > } > } else { > - cc_src = imx_media_find_mbus_format(fmt_src.format.code, > + cc_src = imx_media_find_mbus_format(fmt_src->format.code, > CS_SEL_ANY, true); > if (WARN_ON(!cc_src)) > return -EINVAL; > @@ -239,15 +231,32 @@ static int capture_try_fmt_vid_cap(struct file *file, void *fh, > cc = cc_src; > } > > - imx_media_mbus_fmt_to_pix_fmt(&f->fmt.pix, &fmt_src.format, cc); > + imx_media_mbus_fmt_to_pix_fmt(&f->fmt.pix, &fmt_src->format, cc); > > return 0; > } > > +static int capture_try_fmt_vid_cap(struct file *file, void *fh, > + struct v4l2_format *f) > +{ > + struct capture_priv *priv = video_drvdata(file); > + struct v4l2_subdev_format fmt_src; > + int ret; > + > + fmt_src.pad = priv->src_sd_pad; > + fmt_src.which = V4L2_SUBDEV_FORMAT_ACTIVE; > + ret = v4l2_subdev_call(priv->src_sd, pad, get_fmt, NULL, &fmt_src); > + if (ret) > + return ret; > + > + return __capture_try_fmt_vid_cap(priv, &fmt_src, f); > +} > + > static int capture_s_fmt_vid_cap(struct file *file, void *fh, > struct v4l2_format *f) > { > struct capture_priv *priv = video_drvdata(file); > + struct v4l2_subdev_format fmt_src; > int ret; > > if (vb2_is_busy(&priv->q)) { > @@ -255,7 +264,13 @@ static int capture_s_fmt_vid_cap(struct file *file, void *fh, > return -EBUSY; > } > > - ret = capture_try_fmt_vid_cap(file, priv, f); > + fmt_src.pad = priv->src_sd_pad; > + fmt_src.which = V4L2_SUBDEV_FORMAT_ACTIVE; > + ret = v4l2_subdev_call(priv->src_sd, pad, get_fmt, NULL, &fmt_src); > + if (ret) > + return ret; > + > + ret = __capture_try_fmt_vid_cap(priv, &fmt_src, f); > if (ret) > return ret; > > @@ -264,8 +279,8 @@ static int capture_s_fmt_vid_cap(struct file *file, void *fh, > CS_SEL_ANY, true); > priv->vdev.compose.left = 0; > priv->vdev.compose.top = 0; > - priv->vdev.compose.width = f->fmt.pix.width; > - priv->vdev.compose.height = f->fmt.pix.height; > + priv->vdev.compose.width = fmt_src.format.width; > + priv->vdev.compose.height = fmt_src.format.height; > > return 0; > } > @@ -306,9 +321,14 @@ static int capture_g_selection(struct file *file, void *fh, > 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; > + case V4L2_SEL_TGT_COMPOSE_PADDED: > + s->r.left = 0; > + s->r.top = 0; > + s->r.width = priv->vdev.fmt.fmt.pix.width; > + s->r.height = priv->vdev.fmt.fmt.pix.height; > + break; > default: > return -EINVAL; > }
diff --git a/drivers/staging/media/imx/imx-media-capture.c b/drivers/staging/media/imx/imx-media-capture.c index fb985e68f9ab..614e335fb61c 100644 --- a/drivers/staging/media/imx/imx-media-capture.c +++ b/drivers/staging/media/imx/imx-media-capture.c @@ -203,21 +203,13 @@ static int capture_g_fmt_vid_cap(struct file *file, void *fh, return 0; } -static int capture_try_fmt_vid_cap(struct file *file, void *fh, - struct v4l2_format *f) +static int __capture_try_fmt_vid_cap(struct capture_priv *priv, + struct v4l2_subdev_format *fmt_src, + struct v4l2_format *f) { - struct capture_priv *priv = video_drvdata(file); - struct v4l2_subdev_format fmt_src; const struct imx_media_pixfmt *cc, *cc_src; - int ret; - fmt_src.pad = priv->src_sd_pad; - fmt_src.which = V4L2_SUBDEV_FORMAT_ACTIVE; - ret = v4l2_subdev_call(priv->src_sd, pad, get_fmt, NULL, &fmt_src); - if (ret) - return ret; - - cc_src = imx_media_find_ipu_format(fmt_src.format.code, CS_SEL_ANY); + cc_src = imx_media_find_ipu_format(fmt_src->format.code, CS_SEL_ANY); if (cc_src) { u32 fourcc, cs_sel; @@ -231,7 +223,7 @@ static int capture_try_fmt_vid_cap(struct file *file, void *fh, cc = imx_media_find_format(fourcc, cs_sel, false); } } else { - cc_src = imx_media_find_mbus_format(fmt_src.format.code, + cc_src = imx_media_find_mbus_format(fmt_src->format.code, CS_SEL_ANY, true); if (WARN_ON(!cc_src)) return -EINVAL; @@ -239,15 +231,32 @@ static int capture_try_fmt_vid_cap(struct file *file, void *fh, cc = cc_src; } - imx_media_mbus_fmt_to_pix_fmt(&f->fmt.pix, &fmt_src.format, cc); + imx_media_mbus_fmt_to_pix_fmt(&f->fmt.pix, &fmt_src->format, cc); return 0; } +static int capture_try_fmt_vid_cap(struct file *file, void *fh, + struct v4l2_format *f) +{ + struct capture_priv *priv = video_drvdata(file); + struct v4l2_subdev_format fmt_src; + int ret; + + fmt_src.pad = priv->src_sd_pad; + fmt_src.which = V4L2_SUBDEV_FORMAT_ACTIVE; + ret = v4l2_subdev_call(priv->src_sd, pad, get_fmt, NULL, &fmt_src); + if (ret) + return ret; + + return __capture_try_fmt_vid_cap(priv, &fmt_src, f); +} + static int capture_s_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f) { struct capture_priv *priv = video_drvdata(file); + struct v4l2_subdev_format fmt_src; int ret; if (vb2_is_busy(&priv->q)) { @@ -255,7 +264,13 @@ static int capture_s_fmt_vid_cap(struct file *file, void *fh, return -EBUSY; } - ret = capture_try_fmt_vid_cap(file, priv, f); + fmt_src.pad = priv->src_sd_pad; + fmt_src.which = V4L2_SUBDEV_FORMAT_ACTIVE; + ret = v4l2_subdev_call(priv->src_sd, pad, get_fmt, NULL, &fmt_src); + if (ret) + return ret; + + ret = __capture_try_fmt_vid_cap(priv, &fmt_src, f); if (ret) return ret; @@ -264,8 +279,8 @@ static int capture_s_fmt_vid_cap(struct file *file, void *fh, CS_SEL_ANY, true); priv->vdev.compose.left = 0; priv->vdev.compose.top = 0; - priv->vdev.compose.width = f->fmt.pix.width; - priv->vdev.compose.height = f->fmt.pix.height; + priv->vdev.compose.width = fmt_src.format.width; + priv->vdev.compose.height = fmt_src.format.height; return 0; } @@ -306,9 +321,14 @@ static int capture_g_selection(struct file *file, void *fh, 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; + case V4L2_SEL_TGT_COMPOSE_PADDED: + s->r.left = 0; + s->r.top = 0; + s->r.width = priv->vdev.fmt.fmt.pix.width; + s->r.height = priv->vdev.fmt.fmt.pix.height; + break; default: return -EINVAL; }
Prepare for mbus format being smaller than the written rectangle due to burst size. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> --- Changes since v1: - Typo fixups, this time applied to the correct patch. --- drivers/staging/media/imx/imx-media-capture.c | 56 +++++++++++++------ 1 file changed, 38 insertions(+), 18 deletions(-)