From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yoshihiro Kaneko Date: Wed, 29 Apr 2015 17:05:33 +0000 Subject: [PATCH/RFC] v4l: vsp1: Align crop rectangle to even boundary for YUV formats Message-Id: <1430327133-8461-1-git-send-email-ykaneko0929@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-media@vger.kernel.org Cc: Mauro Carvalho Chehab , Laurent Pinchart , Simon Horman , Magnus Damm , linux-sh@vger.kernel.org From: Damian Hobson-Garcia 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 Signed-off-by: Yoshihiro Kaneko --- 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