[CC Mauro Carvalho Chehab]
On Tue, Oct 14, 2014 at 03:25:24PM +0900, Yoshihiro Kaneko wrote:
> From: Koji Matsuoka <koji.matsuoka.xm@xxxxxxxxxxx>
>
> This patch corrects the miscalculation of the capture buffer
> size and clipping data update in VIDIOC_S_CROP sequence.
>
> Signed-off-by: Koji Matsuoka <koji.matsuoka.xm@xxxxxxxxxxx>
> Signed-off-by: Yoshihiro Kaneko <ykaneko0929@xxxxxxxxx>
Acked-by: Simon Horman <horms+renesas@xxxxxxxxxxxx>
If the series needs reposting to a different CC list -
e.g. including Mauro - please let Kaneko-san or myself know.
> ---
>
> This patch is against master branch of linuxtv.org/media_tree.git.
>
> drivers/media/platform/soc_camera/rcar_vin.c | 5 -----
> drivers/media/platform/soc_camera/soc_scale_crop.c | 6 ++++--
> 2 files changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c
> index 61c36b0..5196c81 100644
> --- a/drivers/media/platform/soc_camera/rcar_vin.c
> +++ b/drivers/media/platform/soc_camera/rcar_vin.c
> @@ -1119,9 +1119,6 @@ static int rcar_vin_set_crop(struct soc_camera_device *icd,
> cam->width = mf.width;
> cam->height = mf.height;
>
> - icd->user_width = cam->width;
> - icd->user_height = cam->height;
> -
> cam->vin_left = rect->left & ~1;
> cam->vin_top = rect->top & ~1;
>
> @@ -1130,8 +1127,6 @@ static int rcar_vin_set_crop(struct soc_camera_device *icd,
> if (ret < 0)
> return ret;
>
> - cam->subrect = *rect;
> -
> dev_dbg(dev, "VIN cropped to %ux%u@%u:%u\n",
> icd->user_width, icd->user_height,
> cam->vin_left, cam->vin_top);
> diff --git a/drivers/media/platform/soc_camera/soc_scale_crop.c b/drivers/media/platform/soc_camera/soc_scale_crop.c
> index 8e74fb7..7a1951a 100644
> --- a/drivers/media/platform/soc_camera/soc_scale_crop.c
> +++ b/drivers/media/platform/soc_camera/soc_scale_crop.c
> @@ -74,14 +74,14 @@ static void update_subrect(struct v4l2_rect *rect, struct v4l2_rect *subrect)
>
> if (rect->left > subrect->left)
> subrect->left = rect->left;
> - else if (rect->left + rect->width >
> + else if (rect->left + rect->width <
> subrect->left + subrect->width)
> subrect->left = rect->left + rect->width -
> subrect->width;
>
> if (rect->top > subrect->top)
> subrect->top = rect->top;
> - else if (rect->top + rect->height >
> + else if (rect->top + rect->height <
> subrect->top + subrect->height)
> subrect->top = rect->top + rect->height -
> subrect->height;
> @@ -117,6 +117,7 @@ int soc_camera_client_s_crop(struct v4l2_subdev *sd,
> dev_dbg(dev, "Camera S_CROP successful for %dx%d@%d:%d\n",
> rect->width, rect->height, rect->left, rect->top);
> *target_rect = *cam_rect;
> + *subrect = *rect;
> return 0;
> }
>
> @@ -204,6 +205,7 @@ int soc_camera_client_s_crop(struct v4l2_subdev *sd,
>
> if (!ret) {
> *target_rect = *cam_rect;
> + *subrect = *rect;
> update_subrect(target_rect, subrect);
> }
>
> --
> 1.9.1
>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
