kernel/linux.git/include/media/v4l2-rect.h, branch linux-7.0.yLinux kernel stable tree (mirror)https://git.radix-linux.su/kernel/linux.git/atom?h=linux-7.0.y2020-07-04T10:29:38+00:00media: v4l2-rect.h: add enclosed rectangle helper2020-07-04T10:29:38+00:00Benoit Parrotbparrot@ti.com2020-05-28T13:26:04+00:00urn:sha1:d3246337d00fcb635e4ade45f748f155e4056b28
Add a helper function to check if one rectangle is enclosed inside
another.
Signed-off-by: Benoit Parrot <bparrot@ti.com>
Acked-by: Andrzej Pietrasiewicz <andrzejtp2010@gmail.com>
Reviewed-by: Lad Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
media: v4l2-rect.h: fix v4l2_rect_map_inside() top/left adjustments2020-01-08T13:34:14+00:00Helen Koikehelen.koike@collabora.com2019-12-17T20:00:22+00:00urn:sha1:f51e50db4c20d46930b33be3f208851265694f3e
boundary->width and boundary->height are sizes relative to
boundary->left and boundary->top coordinates, but they were not being
taken into consideration to adjust r->left and r->top, leading to the
following error:
Consider the follow as initial values for boundary and r:
struct v4l2_rect boundary = {
.left = 100,
.top = 100,
.width = 800,
.height = 600,
}
struct v4l2_rect r = {
.left = 0,
.top = 0,
.width = 1920,
.height = 960,
}
calling v4l2_rect_map_inside(&r, &boundary) was modifying r to:
r = {
.left = 0,
.top = 0,
.width = 800,
.height = 600,
}
Which is wrongly outside the boundary rectangle, because:
v4l2_rect_set_max_size(r, boundary); // r->width = 800, r->height = 600
...
if (r->left + r->width > boundary->width) // true
r->left = boundary->width - r->width; // r->left = 800 - 800
if (r->top + r->height > boundary->height) // true
r->top = boundary->height - r->height; // r->height = 600 - 600
Fix this by considering top/left coordinates from boundary.
Fixes: ac49de8c49d7 ("[media] v4l2-rect.h: new header with struct v4l2_rect helper functions")
Signed-off-by: Helen Koike <helen.koike@collabora.com>
Cc: <stable@vger.kernel.org> # for v4.7 and up
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
media: v4l2-rect.h: add position and equal helpers2018-09-17T17:25:41+00:00Marco Felschm.felsch@pengutronix.de2018-06-28T16:20:37+00:00urn:sha1:e62fdbb24c342f78e431e05925097165cc0e05e9
Add two helper functions to check if two rectangles have the same
position (top/left) and if two rectangles equals (same size and
same position).
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
media: include/(uapi/)media: add SPDX license info2018-02-14T18:23:51+00:00Hans Verkuilhansverk@cisco.com2018-02-07T14:05:46+00:00urn:sha1:ab15d248cc96d12c928a69d3485a98d223c607ae
Replace the old license information with the corresponding SPDX
license for those headers that I authored.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
[media] v4l2-rect.h: new header with struct v4l2_rect helper functions2016-04-20T19:11:33+00:00Hans Verkuilhans.verkuil@cisco.com2016-04-03T19:42:42+00:00urn:sha1:ac49de8c49d770b5ded5c717c1eaf339d7649da1
This makes it easier to share this code with any driver that needs to
manipulate the v4l2_rect datastructure.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>