Commit 030b161c authored by Benoit Parrot's avatar Benoit Parrot Committed by Mauro Carvalho Chehab
Browse files

media: use v4l2_rect_enclosed helper 



Several drivers implement the same enclosed_rectangle() function to
check if a rectangle is enclosed into another. Replace this with the
newly added v4l2_rect_enclosed() helper function.

Signed-off-by: default avatarBenoit Parrot <bparrot@ti.com>
Acked-by: default avatarAndrzej Pietrasiewicz <andrzejtp2010@gmail.com>
Reviewed-by: default avatarLad Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent d3246337

drivers/media/platform/am437x/am437x-vpfe.c

+3 −16
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <media/v4l2-ctrls.h>

#include <media/v4l2-event.h>

#include <media/v4l2-fwnode.h>

#include <media/v4l2-rect.h>



#include "am437x-vpfe.h"
@@ -1987,20 +1988,6 @@ vpfe_g_selection(struct file *file, void *fh, struct v4l2_selection *s) 
	return 0;

}



static int enclosed_rectangle(struct v4l2_rect *a, struct v4l2_rect *b)

{

	if (a->left < b->left || a->top < b->top)

		return 0;



	if (a->left + a->width > b->left + b->width)

		return 0;



	if (a->top + a->height > b->top + b->height)

		return 0;



	return 1;

}



static int

vpfe_s_selection(struct file *file, void *fh, struct v4l2_selection *s)

{
@@ -2025,10 +2012,10 @@ vpfe_s_selection(struct file *file, void *fh, struct v4l2_selection *s) 
	r.left = clamp_t(unsigned int, r.left, 0, cr.width - r.width);

	r.top  = clamp_t(unsigned int, r.top, 0, cr.height - r.height);



	if (s->flags & V4L2_SEL_FLAG_LE && !enclosed_rectangle(&r, &s->r))

	if (s->flags & V4L2_SEL_FLAG_LE && !v4l2_rect_enclosed(&r, &s->r))

		return -ERANGE;



	if (s->flags & V4L2_SEL_FLAG_GE && !enclosed_rectangle(&s->r, &r))

	if (s->flags & V4L2_SEL_FLAG_GE && !v4l2_rect_enclosed(&s->r, &r))

		return -ERANGE;



	s->r = vpfe->crop = r;

drivers/media/platform/exynos4-is/fimc-capture.c

+3 −15
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <media/v4l2-device.h>

#include <media/v4l2-ioctl.h>

#include <media/v4l2-mem2mem.h>

#include <media/v4l2-rect.h>

#include <media/videobuf2-v4l2.h>

#include <media/videobuf2-dma-contig.h>
@@ -1301,19 +1302,6 @@ static int fimc_cap_g_selection(struct file *file, void *fh, 
	return -EINVAL;

}



/* Return 1 if rectangle a is enclosed in rectangle b, or 0 otherwise. */

static int enclosed_rectangle(struct v4l2_rect *a, struct v4l2_rect *b)

{

	if (a->left < b->left || a->top < b->top)

		return 0;

	if (a->left + a->width > b->left + b->width)

		return 0;

	if (a->top + a->height > b->top + b->height)

		return 0;



	return 1;

}



static int fimc_cap_s_selection(struct file *file, void *fh,

				struct v4l2_selection *s)

{
@@ -1336,11 +1324,11 @@ static int fimc_cap_s_selection(struct file *file, void *fh, 
	fimc_capture_try_selection(ctx, &rect, s->target);



	if (s->flags & V4L2_SEL_FLAG_LE &&

	    !enclosed_rectangle(&rect, &s->r))

	    !v4l2_rect_enclosed(&rect, &s->r))

		return -ERANGE;



	if (s->flags & V4L2_SEL_FLAG_GE &&

	    !enclosed_rectangle(&s->r, &rect))

	    !v4l2_rect_enclosed(&s->r, &rect))

		return -ERANGE;



	s->r = rect;

drivers/media/platform/exynos4-is/fimc-lite.c

+3 −15
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <media/v4l2-device.h>

#include <media/v4l2-ioctl.h>

#include <media/v4l2-mem2mem.h>

#include <media/v4l2-rect.h>

#include <media/videobuf2-v4l2.h>

#include <media/videobuf2-dma-contig.h>

#include <media/drv-intf/exynos-fimc.h>
@@ -868,19 +869,6 @@ static int fimc_lite_reqbufs(struct file *file, void *priv, 
	return ret;

}



/* Return 1 if rectangle a is enclosed in rectangle b, or 0 otherwise. */

static int enclosed_rectangle(struct v4l2_rect *a, struct v4l2_rect *b)

{

	if (a->left < b->left || a->top < b->top)

		return 0;

	if (a->left + a->width > b->left + b->width)

		return 0;

	if (a->top + a->height > b->top + b->height)

		return 0;



	return 1;

}



static int fimc_lite_g_selection(struct file *file, void *fh,

				 struct v4l2_selection *sel)

{
@@ -922,11 +910,11 @@ static int fimc_lite_s_selection(struct file *file, void *fh, 
	fimc_lite_try_compose(fimc, &rect);



	if ((sel->flags & V4L2_SEL_FLAG_LE) &&

	    !enclosed_rectangle(&rect, &sel->r))

	    !v4l2_rect_enclosed(&rect, &sel->r))

		return -ERANGE;



	if ((sel->flags & V4L2_SEL_FLAG_GE) &&

	    !enclosed_rectangle(&sel->r, &rect))

	    !v4l2_rect_enclosed(&sel->r, &rect))

		return -ERANGE;



	sel->r = rect;

drivers/media/platform/s5p-jpeg/jpeg-core.c

+2 −14
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <media/v4l2-event.h>

#include <media/v4l2-mem2mem.h>

#include <media/v4l2-ioctl.h>

#include <media/v4l2-rect.h>

#include <media/videobuf2-v4l2.h>

#include <media/videobuf2-dma-contig.h>
@@ -1735,19 +1736,6 @@ static int exynos3250_jpeg_try_downscale(struct s5p_jpeg_ctx *ctx, 
	return 0;

}



/* Return 1 if rectangle a is enclosed in rectangle b, or 0 otherwise. */

static int enclosed_rectangle(struct v4l2_rect *a, struct v4l2_rect *b)

{

	if (a->left < b->left || a->top < b->top)

		return 0;

	if (a->left + a->width > b->left + b->width)

		return 0;

	if (a->top + a->height > b->top + b->height)

		return 0;



	return 1;

}



static int exynos3250_jpeg_try_crop(struct s5p_jpeg_ctx *ctx,

				   struct v4l2_rect *r)

{
@@ -1780,7 +1768,7 @@ static int exynos3250_jpeg_try_crop(struct s5p_jpeg_ctx *ctx, 
	r->left = round_down(r->left, 2);

	r->top = round_down(r->top, 2);



	if (!enclosed_rectangle(r, &base_rect))

	if (!v4l2_rect_enclosed(r, &base_rect))

		return -EINVAL;



	ctx->crop_rect.left = r->left;