Skip to contentSkip to conversation

media: v4l2-rect.h: add enclosed rectangle helper

PATCH In review Benoit Parrot 3 participants 7 messages May 28, 2020 – May 30, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover media: v4l2-rect.h: add enclosed rectangle helper

This series introduces a new v4l2_rect_enclosed helper function which already exist in some form in several drivers. It then proceed to update those drivers to use the new helper function.

Benoit Parrot (2):
media: v4l2-rect.h: add enclosed rectangle helper
media: use v4l2_rect_enclosed helper

 drivers/media/platform/am437x/am437x-vpfe.c   | 19 +++---------------
 .../media/platform/exynos4-is/fimc-capture.c  | 18 +++--------------
 drivers/media/platform/exynos4-is/fimc-lite.c | 18 +++--------------
 drivers/media/platform/s5p-jpeg/jpeg-core.c   | 16 ++-------------
 include/media/v4l2-rect.h                     | 20 +++++++++++++++++++
 5 files changed, 31 insertions(+), 60 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/2 media: v4l2-rect.h: add enclosed rectangle helper

Add a helper function to check if one rectangle is enclosed inside another.

---
 include/media/v4l2-rect.h | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
include/media/v4l2-rect.h +20 -0
index 8800a640c224..bd587d0c0dc3 100644
@@ -184,4 +184,24 @@ static inline bool v4l2_rect_overlap(const struct v4l2_rect *r1,
 	return true;
 }
 
+/**
+ * v4l2_rect_enclosed() - is r1 enclosed in r2?
+ * @r1: rectangle.
+ * @r2: rectangle.
+ *
+ * Returns true if @r1 is enclosed in @r2.
+ */
+static inline bool v4l2_rect_enclosed(struct v4l2_rect *r1,
+				      struct v4l2_rect *r2)
+{
+	if (r1->left < r2->left || r1->top < r2->top)
+		return false;
+	if (r1->left + r1->width > r2->left + r2->width)
+		return false;
+	if (r1->top + r1->height > r2->top + r2->height)
+		return false;
+
+	return true;
+}
+
 #endif
Signature · 1 line
2.17.1
Acked-by on v1 1/2
#2 lore raw

Hi Benoit,

Thank you for the patch,

W dniu 28.05.2020 o 15:26, Benoit Parrot pisze:

Quoted 4 lines

Add a helper function to check if one rectangle is enclosed inside another.

Quoted 34 lines
---
  include/media/v4l2-rect.h | 20 ++++++++++++++++++++
  1 file changed, 20 insertions(+)
include/media/v4l2-rect.h +20 -0
index 8800a640c224..bd587d0c0dc3 100644
@@ -184,4 +184,24 @@ static inline bool v4l2_rect_overlap(const struct v4l2_rect *r1,
  	return true;
  }
 
+/**
+ * v4l2_rect_enclosed() - is r1 enclosed in r2?
+ * @r1: rectangle.
+ * @r2: rectangle.
+ *
+ * Returns true if @r1 is enclosed in @r2.
+ */
+static inline bool v4l2_rect_enclosed(struct v4l2_rect *r1,
+				      struct v4l2_rect *r2)
+{
+	if (r1->left < r2->left || r1->top < r2->top)
+		return false;
+	if (r1->left + r1->width > r2->left + r2->width)
+		return false;
+	if (r1->top + r1->height > r2->top + r2->height)
+		return false;
+
+	return true;
+}
+
  #endif
Reviewed-by on v1 1/2
#3 lore raw
In reply to Benoit Parrot

Hi Benoit,

Thank you for the patch.

Quoted 9 lines · Benoit Parrot

Add a helper function to check if one rectangle is enclosed inside another.

---
 include/media/v4l2-rect.h | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

Cheers,
--Prabhakar

Quoted 32 lines
include/media/v4l2-rect.h +20 -1
index 8800a640c224..bd587d0c0dc3 100644
@@ -184,4 +184,24 @@ static inline bool v4l2_rect_overlap(const struct v4l2_rect *r1,
        return true;
 }
 
+/**
+ * v4l2_rect_enclosed() - is r1 enclosed in r2?
+ * @r1: rectangle.
+ * @r2: rectangle.
+ *
+ * Returns true if @r1 is enclosed in @r2.
+ */
+static inline bool v4l2_rect_enclosed(struct v4l2_rect *r1,
+                                     struct v4l2_rect *r2)
+{
+       if (r1->left < r2->left || r1->top < r2->top)
+               return false;
+       if (r1->left + r1->width > r2->left + r2->width)
+               return false;
+       if (r1->top + r1->height > r2->top + r2->height)
+               return false;
+
+       return true;
+}
+
 #endif
--

2.17.1

#4 lore raw

PATCH 2/2 media: use v4l2_rect_enclosed helper

In reply to Benoit Parrot

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.

---
 drivers/media/platform/am437x/am437x-vpfe.c   | 19 +++----------------
 .../media/platform/exynos4-is/fimc-capture.c  | 18 +++---------------
 drivers/media/platform/exynos4-is/fimc-lite.c | 18 +++---------------
 drivers/media/platform/s5p-jpeg/jpeg-core.c   | 16 ++--------------
 4 files changed, 11 insertions(+), 60 deletions(-)
drivers/media/platform/am437x/am437x-vpfe.c +3 -16
index 66079cc41f38..0fb9f9ba1219 100644
@@ -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
index 705f182330ca..8b10741a847a 100644
@@ -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>
 
@@ -1299,19 +1300,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)
 {
@@ -1334,11 +1322,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
index 394e0818f2d5..9c666f663ab4 100644
@@ -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
index 86bda3947110..9b22dd8e34f4 100644
@@ -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;
Signature · 1 line
2.17.1
Acked-by on v1 2/2
#5 lore raw

Re: [Patch 2/2] media: use v4l2_rect_enclosed helper

Hi Benoit,

Thank you for the patch.

W dniu 28.05.2020 o 15:26, Benoit Parrot pisze:

Quoted 5 lines

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.

for the s5p-jpeg part:

Quoted 187 lines
---
  drivers/media/platform/am437x/am437x-vpfe.c   | 19 +++----------------
  .../media/platform/exynos4-is/fimc-capture.c  | 18 +++---------------
  drivers/media/platform/exynos4-is/fimc-lite.c | 18 +++---------------
  drivers/media/platform/s5p-jpeg/jpeg-core.c   | 16 ++--------------
  4 files changed, 11 insertions(+), 60 deletions(-)
drivers/media/platform/am437x/am437x-vpfe.c +3 -16
index 66079cc41f38..0fb9f9ba1219 100644
@@ -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
index 705f182330ca..8b10741a847a 100644
@@ -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>
 
@@ -1299,19 +1300,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)
  {
@@ -1334,11 +1322,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
index 394e0818f2d5..9c666f663ab4 100644
@@ -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
index 86bda3947110..9b22dd8e34f4 100644
@@ -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;
Reviewed-by on v1 2/2
#6 lore raw

Re: [Patch 2/2] media: use v4l2_rect_enclosed helper

In reply to Benoit Parrot

Hi Benoit,

Thank you for the patch.

Quoted 8 lines · Benoit Parrot

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.

---
 drivers/media/platform/am437x/am437x-vpfe.c   | 19 +++----------------

For the above:

Cheers,
--Prabhakar

Quoted 187 lines
 .../media/platform/exynos4-is/fimc-capture.c  | 18 +++---------------
 drivers/media/platform/exynos4-is/fimc-lite.c | 18 +++---------------
 drivers/media/platform/s5p-jpeg/jpeg-core.c   | 16 ++--------------
 4 files changed, 11 insertions(+), 60 deletions(-)
drivers/media/platform/am437x/am437x-vpfe.c +3 -16
index 66079cc41f38..0fb9f9ba1219 100644
@@ -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
index 705f182330ca..8b10741a847a 100644
@@ -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>
 
@@ -1299,19 +1300,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)
 {
@@ -1334,11 +1322,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
index 394e0818f2d5..9c666f663ab4 100644
@@ -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 -15
index 86bda3947110..9b22dd8e34f4 100644
@@ -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;
--

2.17.1