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@xxxxxxxxxxxxxxxx>
> Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@xxxxxxxxxxxx>
> ---
> 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;
> };
>
>
