From patchwork Wed Mar 25 21:43:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dafna Hirschfeld X-Patchwork-Id: 210437 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, UNPARSEABLE_RELAY,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E98F3C43331 for ; Wed, 25 Mar 2020 21:44:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BD3002070A for ; Wed, 25 Mar 2020 21:44:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727357AbgCYVoH (ORCPT ); Wed, 25 Mar 2020 17:44:07 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:40030 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726081AbgCYVoH (ORCPT ); Wed, 25 Mar 2020 17:44:07 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: dafna) with ESMTPSA id 5013B2931C5 From: Dafna Hirschfeld To: linux-media@vger.kernel.org, dafna.hirschfeld@collabora.com, helen.koike@collabora.com, ezequiel@collabora.com, hverkuil@xs4all.nl, kernel@collabora.com, dafna3@gmail.com, sakari.ailus@linux.intel.com, linux-rockchip@lists.infradead.org, mchehab@kernel.org, laurent.pinchart@ideasonboard.com Subject: [PATCH v4l-utils] v4l2-compliance: don't test pad's dimensions if it's MEDIA_PAD_FL_METADATA Date: Wed, 25 Mar 2020 22:43:57 +0100 Message-Id: <20200325214357.30722-1-dafna.hirschfeld@collabora.com> X-Mailer: git-send-email 2.17.1 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Pads with the flag MEDIA_PAD_FL_METADATA transmit metadata which has no dimension, so don't test the width and hight returned by S/G_FMT for that pads. Signed-off-by: Dafna Hirschfeld --- This patch completes the patchset sent to linux-media: "media: staging: rkisp1: Fix formats for metadata pads" https://patchwork.kernel.org/project/linux-media/list/?series=261673 It compiles only when the media.h file is synced with this patchset so that the flag MEDIA_PAD_FL_METADATA is added. utils/v4l2-compliance/v4l2-test-subdevs.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/utils/v4l2-compliance/v4l2-test-subdevs.cpp b/utils/v4l2-compliance/v4l2-test-subdevs.cpp index 489639fb..ca527529 100644 --- a/utils/v4l2-compliance/v4l2-test-subdevs.cpp +++ b/utils/v4l2-compliance/v4l2-test-subdevs.cpp @@ -305,11 +305,13 @@ int testSubDevFrameInterval(struct node *node, unsigned pad) return 0; } -static int checkMBusFrameFmt(struct node *node, struct v4l2_mbus_framefmt &fmt) +static int checkMBusFrameFmt(struct node *node, struct v4l2_mbus_framefmt &fmt, unsigned pad) { fail_on_test(check_0(fmt.reserved, sizeof(fmt.reserved))); - fail_on_test(fmt.width == 0 || fmt.width > 65536); - fail_on_test(fmt.height == 0 || fmt.height > 65536); + if (!(node->pads[pad].flags & MEDIA_PAD_FL_METADATA)) { + fail_on_test(fmt.width == 0 || fmt.width > 65536); + fail_on_test(fmt.height == 0 || fmt.height > 65536); + } fail_on_test(fmt.code == 0 || fmt.code == ~0U); fail_on_test(fmt.field == ~0U); if (!node->is_passthrough_subdev) { @@ -353,7 +355,7 @@ int testSubDevFormat(struct node *node, unsigned which, unsigned pad) fail_on_test(check_0(fmt.reserved, sizeof(fmt.reserved))); fail_on_test(fmt.which != which); fail_on_test(fmt.pad != pad); - fail_on_test(checkMBusFrameFmt(node, fmt.format)); + fail_on_test(checkMBusFrameFmt(node, fmt.format, pad)); s_fmt = fmt; memset(s_fmt.reserved, 0xff, sizeof(s_fmt.reserved)); memset(s_fmt.format.reserved, 0xff, sizeof(s_fmt.format.reserved)); @@ -366,7 +368,7 @@ int testSubDevFormat(struct node *node, unsigned which, unsigned pad) return 0; } fail_on_test(check_0(s_fmt.reserved, sizeof(s_fmt.reserved))); - fail_on_test(checkMBusFrameFmt(node, s_fmt.format)); + fail_on_test(checkMBusFrameFmt(node, s_fmt.format, pad)); fail_on_test(s_fmt.format.width != fmt.format.width); fail_on_test(s_fmt.format.height != fmt.format.height); fail_on_test(s_fmt.format.code != fmt.format.code);