UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: rcar-vin: Create compose rectangle where it is used 

The rectangle used to correct the compose settings when changing the
format was created inside a helper function and not where it was used.
This is confusing and makes the code harder to read, fix this.

This cleanup is made possible due to refactoring elsewhere and 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:01 -03:00 committed by Mauro Carvalho Chehab
parent aacbd4ff3a
commit dbb8d05a9d
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,8 +181,7 @@ static int rvin_reset_format(struct rvin_dev *vin)
static int rvin_try_format(struct rvin_dev *vin, u32 which, static int rvin_try_format(struct rvin_dev *vin, u32 which,
struct v4l2_pix_format *pix, struct v4l2_pix_format *pix,
struct v4l2_rect *src_rect, struct v4l2_rect *src_rect)
struct v4l2_rect *compose)
{ {
struct v4l2_subdev *sd = vin_to_source(vin); struct v4l2_subdev *sd = vin_to_source(vin);
struct v4l2_subdev_pad_config *pad_cfg; struct v4l2_subdev_pad_config *pad_cfg;
@ -229,13 +228,6 @@ static int rvin_try_format(struct rvin_dev *vin, u32 which,
pix->height = height; pix->height = height;
rvin_format_align(vin, pix); rvin_format_align(vin, pix);
if (compose) {
compose->top = 0;
compose->left = 0;
compose->width = pix->width;
compose->height = pix->height;
}
done: done:
v4l2_subdev_free_pad_config(pad_cfg); v4l2_subdev_free_pad_config(pad_cfg);
@ -259,28 +251,33 @@ static int rvin_try_fmt_vid_cap(struct file *file, void *priv,
{ {
struct rvin_dev *vin = video_drvdata(file); struct rvin_dev *vin = video_drvdata(file);
return rvin_try_format(vin, V4L2_SUBDEV_FORMAT_TRY, &f->fmt.pix, NULL, return rvin_try_format(vin, V4L2_SUBDEV_FORMAT_TRY, &f->fmt.pix, NULL);
NULL);
} }
static int rvin_s_fmt_vid_cap(struct file *file, void *priv, static int rvin_s_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct rvin_dev *vin = video_drvdata(file); struct rvin_dev *vin = video_drvdata(file);
struct v4l2_rect src_rect, compose; struct v4l2_rect fmt_rect, src_rect;
int ret; int ret;
if (vb2_is_busy(&vin->queue)) if (vb2_is_busy(&vin->queue))
return -EBUSY; return -EBUSY;
ret = rvin_try_format(vin, V4L2_SUBDEV_FORMAT_ACTIVE, &f->fmt.pix, ret = rvin_try_format(vin, V4L2_SUBDEV_FORMAT_ACTIVE, &f->fmt.pix,
&src_rect, &compose); &src_rect);
if (ret) if (ret)
return ret; return ret;
vin->format = f->fmt.pix; vin->format = f->fmt.pix;
fmt_rect.top = 0;
fmt_rect.left = 0;
fmt_rect.width = vin->format.width;
fmt_rect.height = vin->format.height;
v4l2_rect_map_inside(&vin->crop, &src_rect); v4l2_rect_map_inside(&vin->crop, &src_rect);
v4l2_rect_map_inside(&vin->compose, &compose); v4l2_rect_map_inside(&vin->compose, &fmt_rect);
vin->src_rect = src_rect; vin->src_rect = src_rect;
return 0; return 0;