renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 04:34:11 +08:00
Code

media: rcar-vin: Rename wrongly named rectangle

Browse Source 
After recent refactoring the rectangle named crop no longer reflects it
usage, to contain the source rectangle. Fix this by renaming it. There
is no functional change.

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Niklas Söderlund 2019-10-08 20:22:00 -03:00 committed by Mauro Carvalho Chehab
parent 1edfa9b168
commit aacbd4ff3a
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/media/platform/rcar-vin/rcar-v4l2.c
View File

@ -181,7 +181,8 @@ static int rvin_reset_format(struct rvin_dev *vin)
static int rvin_try_format(struct rvin_dev *vin, u32 which,
struct v4l2_pix_format *pix,
struct v4l2_rect *crop, struct v4l2_rect *compose)
struct v4l2_rect *src_rect,
struct v4l2_rect *compose)
{
struct v4l2_subdev *sd = vin_to_source(vin);
struct v4l2_subdev_pad_config *pad_cfg;
@ -214,11 +215,11 @@ static int rvin_try_format(struct rvin_dev *vin, u32 which,
v4l2_fill_pix_format(pix, &format.format);
if (crop) {
crop->top = 0;
crop->left = 0;
crop->width = pix->width;
crop->height = pix->height;
if (src_rect) {
src_rect->top = 0;
src_rect->left = 0;
src_rect->width = pix->width;
src_rect->height = pix->height;
}
if (field != V4L2_FIELD_ANY)
@ -266,21 +267,21 @@ static int rvin_s_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f)
{
struct rvin_dev *vin = video_drvdata(file);
struct v4l2_rect crop, compose;
struct v4l2_rect src_rect, compose;
int ret;
if (vb2_is_busy(&vin->queue))
return -EBUSY;
ret = rvin_try_format(vin, V4L2_SUBDEV_FORMAT_ACTIVE, &f->fmt.pix,
&crop, &compose);
&src_rect, &compose);
if (ret)
return ret;
vin->format = f->fmt.pix;
v4l2_rect_map_inside(&vin->crop, &crop);
v4l2_rect_map_inside(&vin->crop, &src_rect);
v4l2_rect_map_inside(&vin->compose, &compose);
vin->src_rect = crop;
vin->src_rect = src_rect;
return 0;
}