From patchwork Thu May 28 12:59:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Kaneko X-Patchwork-Id: 6498301 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B854C9F1C1 for ; Thu, 28 May 2015 12:59:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C57952054B for ; Thu, 28 May 2015 12:59:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 894A220520 for ; Thu, 28 May 2015 12:59:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754098AbbE1M7y (ORCPT ); Thu, 28 May 2015 08:59:54 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:34073 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753221AbbE1M7x (ORCPT ); Thu, 28 May 2015 08:59:53 -0400 Received: by pabru16 with SMTP id ru16so23104886pab.1; Thu, 28 May 2015 05:59:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=TjP2ustXdulHcj31B9a5jExHLv476cXIN954LfTrxxg=; b=WeKO96/BJXkGE6Rdcdz54POysyersKawkP7sXRfWk0HBc8gYMFtG4W8JQGqzvCw9V/ N5g2wAypKEQUPKT5e6w96+HYzlFZset6vDIjEfzqwT0aGJqqR7FS/QdY4tKcSvn64BYl /lXbGwzeg8e2KtVVxWxAA2pgTvW00ffsX72XiHPYkrRxkhsjqRITFe6jUVo6wLEWQE2J 48G+vQYRvCydlKAr9IAZ04lT8UAg8YQp9AInebXAD9BcEzGiJpqjpz4NYi4Jw2a4uCyj DF188jHACpjNR2a2MVE3QvhMYeS6k4Did7UpwsvPdCFHS4QM5f6+B38YfekXl3ku2Xv5 218g== X-Received: by 10.70.65.10 with SMTP id t10mr5216056pds.151.1432817992433; Thu, 28 May 2015 05:59:52 -0700 (PDT) Received: from localhost.localdomain (KD118152108246.ppp-bb.dion.ne.jp. [118.152.108.246]) by mx.google.com with ESMTPSA id fd3sm2398430pdb.0.2015.05.28.05.59.49 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 May 2015 05:59:51 -0700 (PDT) From: Yoshihiro Kaneko To: linux-media@vger.kernel.org Cc: Mauro Carvalho Chehab , Laurent Pinchart , Simon Horman , Magnus Damm , linux-sh@vger.kernel.org Subject: [PATCH v2] v4l: vsp1: Align crop rectangle to even boundary for YUV formats Date: Thu, 28 May 2015 21:59:39 +0900 Message-Id: <1432817979-2929-1-git-send-email-ykaneko0929@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 distinction 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 Acked-by: Laurent Pinchart --- This patch is based on the master branch of linuxtv.org/media_tree.git. v2 [Yoshihiro Kaneko] * As suggested by Laurent Pinchart - remove the change to add a restriction to the left and top - use round_down() to align the width and height * As suggested by Sergei Shtylyov - use ALIGN() to align the left and top - correct a misspelling of the commit message * Compile tested only drivers/media/platform/vsp1/vsp1_rwpf.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/media/platform/vsp1/vsp1_rwpf.c b/drivers/media/platform/vsp1/vsp1_rwpf.c index fa71f46..32687c7 100644 --- a/drivers/media/platform/vsp1/vsp1_rwpf.c +++ b/drivers/media/platform/vsp1/vsp1_rwpf.c @@ -197,6 +197,14 @@ 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 = ALIGN(sel->r.left, 2); + sel->r.top = ALIGN(sel->r.top, 2); + sel->r.width = round_down(sel->r.width, 2); + sel->r.height = round_down(sel->r.height, 2); + } + 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) {