linux-media.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Hans Verkuil <hverkuil@xs4all.nl>
To: Vandana BN <bnvandana@gmail.com>,
	linux-media@vger.kernel.org,
	linux-kernel-mentees@lists.linuxfoundation.org
Subject: Re: [PATCH] v4l2-compliance: Verify metadata formats
Date: Tue, 24 Sep 2019 14:01:54 +0200	[thread overview]
Message-ID: <49ffdb33-39a7-aa44-fb0c-302e963972b1@xs4all.nl> (raw)
In-Reply-To: <20190924092530.17749-1-bnvandana@gmail.com>

On 9/24/19 11:25 AM, Vandana BN wrote:
> changes to testEnumFormats() and testGetFormats() to verify METADATA type.
> G_FMT sets node->valid_buftypes, so TRY/S_FMT does not get called for
> other input types, hence did not modify them.

This is a very confusing commit log.

The core problem is that for a given input or output there may not be any
metadata formats defined. And that is what is fixed here.

> 
> Signed-off-by: Vandana BN <bnvandana@gmail.com>
> ---
>  utils/v4l2-compliance/v4l2-test-formats.cpp | 17 +++++++++++++----
>  1 file changed, 13 insertions(+), 4 deletions(-)
> 
> diff --git a/utils/v4l2-compliance/v4l2-test-formats.cpp b/utils/v4l2-compliance/v4l2-test-formats.cpp
> index 525dfafa..604ea921 100644
> --- a/utils/v4l2-compliance/v4l2-test-formats.cpp
> +++ b/utils/v4l2-compliance/v4l2-test-formats.cpp
> @@ -305,8 +305,6 @@ int testEnumFormats(struct node *node)
>  		case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
>  		case V4L2_BUF_TYPE_SDR_CAPTURE:
>  		case V4L2_BUF_TYPE_SDR_OUTPUT:
> -		case V4L2_BUF_TYPE_META_CAPTURE:
> -		case V4L2_BUF_TYPE_META_OUTPUT:
>  			if (ret && (node->g_caps() & buftype2cap[type]))
>  				return fail("%s cap set, but no %s formats defined\n",
>  						buftype2s(type).c_str(), buftype2s(type).c_str());
> @@ -314,6 +312,10 @@ int testEnumFormats(struct node *node)
>  				return fail("%s cap not set, but %s formats defined\n",
>  						buftype2s(type).c_str(), buftype2s(type).c_str());
>  			break;
> +		case V4L2_BUF_TYPE_META_CAPTURE:
> +		case V4L2_BUF_TYPE_META_OUTPUT:
> +			/* Metadata formats need not be present for all input types */

for all input types -> for the current input/output

> +			break;
>  		default:
>  			if (!ret)
>  				return fail("Buffer type %s not allowed!\n", buftype2s(type).c_str());
> @@ -599,8 +601,6 @@ int testGetFormats(struct node *node)
>  		case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
>  		case V4L2_BUF_TYPE_SDR_CAPTURE:
>  		case V4L2_BUF_TYPE_SDR_OUTPUT:
> -		case V4L2_BUF_TYPE_META_CAPTURE:
> -		case V4L2_BUF_TYPE_META_OUTPUT:
>  			if (ret && (node->g_caps() & buftype2cap[type]))
>  				return fail("%s cap set, but no %s formats defined\n",
>  					buftype2s(type).c_str(), buftype2s(type).c_str());
> @@ -608,6 +608,15 @@ int testGetFormats(struct node *node)
>  				return fail("%s cap not set, but %s formats defined\n",
>  					buftype2s(type).c_str(), buftype2s(type).c_str());
>  			break;
> +		case V4L2_BUF_TYPE_META_CAPTURE:
> +		case V4L2_BUF_TYPE_META_OUTPUT:
> +			if(ret && !node->buftype_pixfmts[type].empty())

Space after 'if'.

> +				return fail("%s Get_format failed, but %s formats defined\n",

Get_format -> G_FMT

> +					buftype2s(type).c_str(), buftype2s(type).c_str());
> +			if(!ret && node->buftype_pixfmts[type].empty())

Space after 'if'.

> +				return fail("%s Get_format success, but no  %s formats defined\n",

G_FMT, 'no  %s' -> 'no %s' (space too many.

> +					buftype2s(type).c_str(), buftype2s(type).c_str());
> +			break;
>  		default:
>  			/* ENUMFMT doesn't support other buftypes */
>  			break;
> 

Regards,

	Hans

  reply	other threads:[~2019-09-24 12:02 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-24  9:25 [PATCH] v4l2-compliance: Verify metadata formats Vandana BN
2019-09-24 12:01 ` Hans Verkuil [this message]
2019-09-25  9:14   ` [PATCH v2] " Vandana BN

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=49ffdb33-39a7-aa44-fb0c-302e963972b1@xs4all.nl \
    --to=hverkuil@xs4all.nl \
    --cc=bnvandana@gmail.com \
    --cc=linux-kernel-mentees@lists.linuxfoundation.org \
    --cc=linux-media@vger.kernel.org \
    /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;
as well as URLs for NNTP newsgroup(s).