From: Yoshihiro Kaneko <ykaneko0929@gmail.com>
To: linux-media@vger.kernel.org
Cc: Mauro Carvalho Chehab <m.chehab@samsung.com>,
Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>,
Simon Horman <horms@verge.net.au>,
Magnus Damm <magnus.damm@gmail.com>,
linux-sh@vger.kernel.org
Subject: [PATCH/RFC] v4l: vsp1: Align crop rectangle to even boundary for YUV formats
Date: Wed, 29 Apr 2015 17:05:33 +0000 [thread overview]
Message-ID: <1430327133-8461-1-git-send-email-ykaneko0929@gmail.com> (raw)
From: Damian Hobson-Garcia <dhobsong@igel.co.jp>
Make sure that there are valid values in the crop rectangle to ensure
that the color plane doesn't get shifted when cropping.
Since there is no distintion between 12bit and 16bit YUV formats in
at the subdev level, use the more restrictive 12bit limits for all YUV
formats.
Signed-off-by: Damian Hobson-Garcia <dhobsong@igel.co.jp>
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
---
This patch is based on the master branch of linuxtv.org/media_tree.git.
drivers/media/platform/vsp1/vsp1_rwpf.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/vsp1/vsp1_rwpf.c b/drivers/media/platform/vsp1/vsp1_rwpf.c
index fa71f46..9fed0b2 100644
--- a/drivers/media/platform/vsp1/vsp1_rwpf.c
+++ b/drivers/media/platform/vsp1/vsp1_rwpf.c
@@ -197,11 +197,21 @@ int vsp1_rwpf_set_selection(struct v4l2_subdev *subdev,
*/
format = vsp1_entity_get_pad_format(&rwpf->entity, cfg, RWPF_PAD_SINK,
sel->which);
+
+ if (format->code = MEDIA_BUS_FMT_AYUV8_1X32) {
+ sel->r.left = (sel->r.left + 1) & ~1;
+ sel->r.top = (sel->r.top + 1) & ~1;
+ sel->r.width = (sel->r.width) & ~1;
+ sel->r.height = (sel->r.height) & ~1;
+ }
+
sel->r.left = min_t(unsigned int, sel->r.left, format->width - 2);
sel->r.top = min_t(unsigned int, sel->r.top, format->height - 2);
if (rwpf->entity.type = VSP1_ENTITY_WPF) {
- sel->r.left = min_t(unsigned int, sel->r.left, 255);
- sel->r.top = min_t(unsigned int, sel->r.top, 255);
+ int maxcrop + format->code = MEDIA_BUS_FMT_AYUV8_1X32 ? 254 : 255;
+ sel->r.left = min_t(unsigned int, sel->r.left, maxcrop);
+ sel->r.top = min_t(unsigned int, sel->r.top, maxcrop);
}
sel->r.width = min_t(unsigned int, sel->r.width,
format->width - sel->r.left);
--
1.9.1
next reply other threads:[~2015-04-29 17:05 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-29 17:05 Yoshihiro Kaneko [this message]
2015-04-30 11:22 ` [PATCH/RFC] v4l: vsp1: Align crop rectangle to even boundary for YUV formats Sergei Shtylyov
2015-04-30 11:44 ` Geert Uytterhoeven
2015-04-30 12:00 ` Sergei Shtylyov
2015-05-03 22:13 ` Laurent Pinchart
2015-05-18 8:17 ` Damian Hobson-Garcia
2015-06-18 20:18 ` Laurent Pinchart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1430327133-8461-1-git-send-email-ykaneko0929@gmail.com \
--to=ykaneko0929@gmail.com \
--cc=horms@verge.net.au \
--cc=laurent.pinchart+renesas@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=m.chehab@samsung.com \
--cc=magnus.damm@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox