lkml.org 
[lkml]   [2017]   [Jun]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 16/19] camss: vfe: Add interface for cropping
    Date
    Extend selection ioctls to handle cropping configuration.

    Signed-off-by: Todor Tomov <todor.tomov@linaro.org>
    ---
    drivers/media/platform/qcom/camss-8x16/vfe.c | 191 +++++++++++++++++++++------
    drivers/media/platform/qcom/camss-8x16/vfe.h | 1 +
    2 files changed, 150 insertions(+), 42 deletions(-)

    diff --git a/drivers/media/platform/qcom/camss-8x16/vfe.c b/drivers/media/platform/qcom/camss-8x16/vfe.c
    index a64f158..b97aefa 100644
    --- a/drivers/media/platform/qcom/camss-8x16/vfe.c
    +++ b/drivers/media/platform/qcom/camss-8x16/vfe.c
    @@ -1960,6 +1960,26 @@ static int vfe_set_stream(struct v4l2_subdev *sd, int enable)
    }

    /*
    + * __vfe_get_crop - Get pointer to crop selection structure
    + * @line: VFE line
    + * @cfg: V4L2 subdev pad configuration
    + * @which: TRY or ACTIVE format
    + *
    + * Return pointer to TRY or ACTIVE crop rectangle structure
    + */
    +static struct v4l2_rect *
    +__vfe_get_crop(struct vfe_line *line,
    + struct v4l2_subdev_pad_config *cfg,
    + enum v4l2_subdev_format_whence which)
    +{
    + if (which == V4L2_SUBDEV_FORMAT_TRY)
    + return v4l2_subdev_get_try_crop(&line->subdev, cfg,
    + MSM_VFE_PAD_SRC);
    +
    + return &line->crop;
    +}
    +
    +/*
    * vfe_try_format - Handle try format by pad subdev method
    * @line: VFE line
    * @cfg: V4L2 subdev pad configuration
    @@ -2007,7 +2027,7 @@ static void vfe_try_format(struct vfe_line *line,
    if (line->id == VFE_LINE_PIX) {
    struct v4l2_rect *rect;

    - rect = __vfe_get_compose(line, cfg, which);
    + rect = __vfe_get_crop(line, cfg, which);

    fmt->width = rect->width;
    fmt->height = rect->height;
    @@ -2092,6 +2112,49 @@ static void vfe_try_compose(struct vfe_line *line,
    }

    /*
    + * vfe_try_crop - Handle try crop selection by pad subdev method
    + * @line: VFE line
    + * @cfg: V4L2 subdev pad configuration
    + * @rect: pointer to v4l2 rect structure
    + * @which: wanted subdev format
    + */
    +static void vfe_try_crop(struct vfe_line *line,
    + struct v4l2_subdev_pad_config *cfg,
    + struct v4l2_rect *rect,
    + enum v4l2_subdev_format_whence which)
    +{
    + struct v4l2_rect *compose;
    +
    + compose = __vfe_get_compose(line, cfg, which);
    +
    + if (rect->width > compose->width)
    + rect->width = compose->width;
    +
    + if (rect->width + rect->left > compose->width)
    + rect->left = compose->width - rect->width;
    +
    + if (rect->height > compose->height)
    + rect->height = compose->height;
    +
    + if (rect->height + rect->top > compose->height)
    + rect->top = compose->height - rect->height;
    +
    + /* wm in line based mode writes multiple of 16 horizontally */
    + rect->left += (rect->width & 0xf) >> 1;
    + rect->width &= ~0xf;
    +
    + if (rect->width < 16) {
    + rect->left = 0;
    + rect->width = 16;
    + }
    +
    + if (rect->height < 4) {
    + rect->top = 0;
    + rect->height = 4;
    + }
    +}
    +
    +/*
    * vfe_enum_mbus_code - Handle pixel format enumeration
    * @sd: VFE V4L2 subdevice
    * @cfg: V4L2 subdev pad configuration
    @@ -2255,34 +2318,58 @@ static int vfe_get_selection(struct v4l2_subdev *sd,
    {
    struct vfe_line *line = v4l2_get_subdevdata(sd);
    struct v4l2_subdev_format fmt = { 0 };
    - struct v4l2_rect *compose;
    + struct v4l2_rect *rect;
    int ret;

    - if (line->id != VFE_LINE_PIX || sel->pad != MSM_VFE_PAD_SINK)
    + if (line->id != VFE_LINE_PIX)
    return -EINVAL;

    - switch (sel->target) {
    - case V4L2_SEL_TGT_COMPOSE_BOUNDS:
    - fmt.pad = sel->pad;
    - fmt.which = sel->which;
    - ret = vfe_get_format(sd, cfg, &fmt);
    - if (ret < 0)
    - return ret;
    - sel->r.left = 0;
    - sel->r.top = 0;
    - sel->r.width = fmt.format.width;
    - sel->r.height = fmt.format.height;
    - break;
    - case V4L2_SEL_TGT_COMPOSE:
    - compose = __vfe_get_compose(line, cfg, sel->which);
    - if (compose == NULL)
    + if (sel->pad == MSM_VFE_PAD_SINK)
    + switch (sel->target) {
    + case V4L2_SEL_TGT_COMPOSE_BOUNDS:
    + fmt.pad = sel->pad;
    + fmt.which = sel->which;
    + ret = vfe_get_format(sd, cfg, &fmt);
    + if (ret < 0)
    + return ret;
    +
    + sel->r.left = 0;
    + sel->r.top = 0;
    + sel->r.width = fmt.format.width;
    + sel->r.height = fmt.format.height;
    + break;
    + case V4L2_SEL_TGT_COMPOSE:
    + rect = __vfe_get_compose(line, cfg, sel->which);
    + if (rect == NULL)
    + return -EINVAL;
    +
    + sel->r = *rect;
    + break;
    + default:
    return -EINVAL;
    + }
    + else if (sel->pad == MSM_VFE_PAD_SRC)
    + switch (sel->target) {
    + case V4L2_SEL_TGT_CROP_BOUNDS:
    + rect = __vfe_get_compose(line, cfg, sel->which);
    + if (rect == NULL)
    + return -EINVAL;

    - sel->r = *compose;
    - break;
    - default:
    - return -EINVAL;
    - }
    + sel->r.left = rect->left;
    + sel->r.top = rect->top;
    + sel->r.width = rect->width;
    + sel->r.height = rect->height;
    + break;
    + case V4L2_SEL_TGT_CROP:
    + rect = __vfe_get_crop(line, cfg, sel->which);
    + if (rect == NULL)
    + return -EINVAL;
    +
    + sel->r = *rect;
    + break;
    + default:
    + return -EINVAL;
    + }

    return 0;
    }
    @@ -2300,33 +2387,53 @@ int vfe_set_selection(struct v4l2_subdev *sd,
    struct v4l2_subdev_selection *sel)
    {
    struct vfe_line *line = v4l2_get_subdevdata(sd);
    - struct v4l2_rect *compose;
    - struct v4l2_subdev_format fmt = { 0 };
    + struct v4l2_rect *rect;
    int ret;

    - if (line->id != VFE_LINE_PIX || sel->pad != MSM_VFE_PAD_SINK)
    + if (line->id != VFE_LINE_PIX)
    return -EINVAL;

    - if (sel->target != V4L2_SEL_TGT_COMPOSE)
    - return -EINVAL;
    + if (sel->target == V4L2_SEL_TGT_COMPOSE &&
    + sel->pad == MSM_VFE_PAD_SINK) {
    + struct v4l2_subdev_selection crop = { 0 };

    - compose = __vfe_get_compose(line, cfg, sel->which);
    - if (compose == NULL)
    - return -EINVAL;
    + rect = __vfe_get_compose(line, cfg, sel->which);
    + if (rect == NULL)
    + return -EINVAL;
    +
    + vfe_try_compose(line, cfg, &sel->r, sel->which);
    + *rect = sel->r;
    +
    + /* Reset source crop selection */
    + crop.which = sel->which;
    + crop.pad = MSM_VFE_PAD_SRC;
    + crop.target = V4L2_SEL_TGT_CROP;
    + crop.r = *rect;
    + ret = vfe_set_selection(sd, cfg, &crop);
    + } else if (sel->target == V4L2_SEL_TGT_CROP &&
    + sel->pad == MSM_VFE_PAD_SRC) {
    + struct v4l2_subdev_format fmt = { 0 };
    +
    + rect = __vfe_get_crop(line, cfg, sel->which);
    + if (rect == NULL)
    + return -EINVAL;

    - vfe_try_compose(line, cfg, &sel->r, sel->which);
    - *compose = sel->r;
    + vfe_try_crop(line, cfg, &sel->r, sel->which);
    + *rect = sel->r;

    - /* Reset source pad format width and height */
    - fmt.which = sel->which;
    - fmt.pad = MSM_VFE_PAD_SRC;
    - ret = vfe_get_format(sd, cfg, &fmt);
    - if (ret < 0)
    - return ret;
    + /* Reset source pad format width and height */
    + fmt.which = sel->which;
    + fmt.pad = MSM_VFE_PAD_SRC;
    + ret = vfe_get_format(sd, cfg, &fmt);
    + if (ret < 0)
    + return ret;

    - fmt.format.width = compose->width;
    - fmt.format.height = compose->height;
    - ret = vfe_set_format(sd, cfg, &fmt);
    + fmt.format.width = rect->width;
    + fmt.format.height = rect->height;
    + ret = vfe_set_format(sd, cfg, &fmt);
    + } else {
    + ret = -EINVAL;
    + }

    return ret;
    }
    diff --git a/drivers/media/platform/qcom/camss-8x16/vfe.h b/drivers/media/platform/qcom/camss-8x16/vfe.h
    index 1a0dc19..002e289c 100644
    --- a/drivers/media/platform/qcom/camss-8x16/vfe.h
    +++ b/drivers/media/platform/qcom/camss-8x16/vfe.h
    @@ -81,6 +81,7 @@ struct vfe_line {
    struct media_pad pads[MSM_VFE_PADS_NUM];
    struct v4l2_mbus_framefmt fmt[MSM_VFE_PADS_NUM];
    struct v4l2_rect compose;
    + struct v4l2_rect crop;
    struct camss_video video_out;
    struct vfe_output output;
    };
    --
    1.9.1
    \
     
     \ /
      Last update: 2017-06-19 17:04    [W:4.095 / U:0.488 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site