From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
To: "Niklas Söderlund" <niklas.soderlund+renesas@ragnatech.se>,
"Laurent Pinchart" <laurent.pinchart@ideasonboard.com>,
linux-media@vger.kernel.org
Cc: linux-renesas-soc@vger.kernel.org
Subject: Re: [PATCH 1/4] rcar-vin: Rename rectangle holding holding the video source information
Date: Tue, 16 Jul 2019 15:40:06 +0100 [thread overview]
Message-ID: <b4ea4f7a-1a35-b514-3068-a790f7d7c541@ideasonboard.com> (raw)
In-Reply-To: <20190705045557.25463-2-niklas.soderlund+renesas@ragnatech.se>
Hi Niklas,
On 05/07/2019 05:55, Niklas Söderlund wrote:
> The variable to hold the video source information dimensions was poorly
> named 'source'. This is confusing as a lot of other members of struts
s/struts/structs/
> share the same name with different purposes, rename it src_rect in
> preparation of refactoring code.
>
Sounds reasonable to me, and matches the other _rect instances in the
code base.
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
> Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
> ---
> drivers/media/platform/rcar-vin/rcar-v4l2.c | 33 +++++++++++----------
> drivers/media/platform/rcar-vin/rcar-vin.h | 4 +--
> 2 files changed, 19 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c
> index 04d798d8070f912c..2d94e700a473572c 100644
> --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c
> +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c
> @@ -155,13 +155,13 @@ static int rvin_reset_format(struct rvin_dev *vin)
>
> rvin_format_align(vin, &vin->format);
>
> - vin->source.top = 0;
> - vin->source.left = 0;
> - vin->source.width = vin->format.width;
> - vin->source.height = vin->format.height;
> + vin->src_rect.top = 0;
> + vin->src_rect.left = 0;
> + vin->src_rect.width = vin->format.width;
> + vin->src_rect.height = vin->format.height;
>
> - vin->crop = vin->source;
> - vin->compose = vin->source;
> + vin->crop = vin->src_rect;
> + vin->compose = vin->src_rect;
>
> return 0;
> }
> @@ -273,7 +273,7 @@ static int rvin_s_fmt_vid_cap(struct file *file, void *priv,
> vin->format = f->fmt.pix;
> vin->crop = crop;
> vin->compose = compose;
> - vin->source = crop;
> + vin->src_rect = crop;
>
> return 0;
> }
> @@ -311,8 +311,8 @@ static int rvin_g_selection(struct file *file, void *fh,
> case V4L2_SEL_TGT_CROP_BOUNDS:
> case V4L2_SEL_TGT_CROP_DEFAULT:
> s->r.left = s->r.top = 0;
> - s->r.width = vin->source.width;
> - s->r.height = vin->source.height;
> + s->r.width = vin->src_rect.width;
> + s->r.height = vin->src_rect.height;
> break;
> case V4L2_SEL_TGT_CROP:
> s->r = vin->crop;
> @@ -354,21 +354,22 @@ static int rvin_s_selection(struct file *file, void *fh,
> case V4L2_SEL_TGT_CROP:
> /* Can't crop outside of source input */
> max_rect.top = max_rect.left = 0;
> - max_rect.width = vin->source.width;
> - max_rect.height = vin->source.height;
> + max_rect.width = vin->src_rect.width;
> + max_rect.height = vin->src_rect.height;
> v4l2_rect_map_inside(&r, &max_rect);
>
> - v4l_bound_align_image(&r.width, 6, vin->source.width, 0,
> - &r.height, 2, vin->source.height, 0, 0);
> + v4l_bound_align_image(&r.width, 6, vin->src_rect.width, 0,
> + &r.height, 2, vin->src_rect.height, 0, 0);
>
> - r.top = clamp_t(s32, r.top, 0, vin->source.height - r.height);
> - r.left = clamp_t(s32, r.left, 0, vin->source.width - r.width);
> + r.top = clamp_t(s32, r.top, 0,
> + vin->src_rect.height - r.height);
> + r.left = clamp_t(s32, r.left, 0, vin->src_rect.width - r.width);
>
> vin->crop = s->r = r;
>
> vin_dbg(vin, "Cropped %dx%d@%d:%d of %dx%d\n",
> r.width, r.height, r.left, r.top,
> - vin->source.width, vin->source.height);
> + vin->src_rect.width, vin->src_rect.height);
> break;
> case V4L2_SEL_TGT_COMPOSE:
> /* Make sure compose rect fits inside output format */
> diff --git a/drivers/media/platform/rcar-vin/rcar-vin.h b/drivers/media/platform/rcar-vin/rcar-vin.h
> index ac1a6fe90015ed69..f91cf1f26afe7a52 100644
> --- a/drivers/media/platform/rcar-vin/rcar-vin.h
> +++ b/drivers/media/platform/rcar-vin/rcar-vin.h
> @@ -176,7 +176,7 @@ struct rvin_info {
> *
> * @crop: active cropping
> * @compose: active composing
> - * @source: active size of the video source
> + * @src_rect: active size of the video source
> * @std: active video standard of the video source
> */
> struct rvin_dev {
> @@ -213,7 +213,7 @@ struct rvin_dev {
>
> struct v4l2_rect crop;
> struct v4l2_rect compose;
> - struct v4l2_rect source;
> + struct v4l2_rect src_rect;
> v4l2_std_id std;
> };
>
>
next prev parent reply other threads:[~2019-07-16 14:40 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-05 4:55 [PATCH 0/4] rcar-vin: Add support for V4L2_FIELD_ALTERNATE Niklas Söderlund
2019-07-05 4:55 ` [PATCH 1/4] rcar-vin: Rename rectangle holding holding the video source information Niklas Söderlund
2019-07-05 9:11 ` Geert Uytterhoeven
2019-07-16 14:40 ` Kieran Bingham [this message]
2019-07-05 4:55 ` [PATCH 2/4] rcar-vin: Do not reset the crop and compose rectangles in s_fmt Niklas Söderlund
2019-07-05 8:36 ` Sergei Shtylyov
2019-07-16 14:51 ` Kieran Bingham
2019-07-05 4:55 ` [PATCH 3/4] rcar-vin: Add support for V4L2_FIELD_ALTERNATE Niklas Söderlund
2019-07-19 11:13 ` Kieran Bingham
2019-08-08 0:39 ` Niklas Söderlund
2019-07-05 4:55 ` [PATCH 4/4] rcar-vin: Clean up how format is set on subdevice Niklas Söderlund
2019-07-16 14:56 ` Kieran Bingham
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b4ea4f7a-1a35-b514-3068-a790f7d7c541@ideasonboard.com \
--to=kieran.bingham+renesas@ideasonboard.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=niklas.soderlund+renesas@ragnatech.se \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).