[Linux-kernel-mentees] [PATCH] v4l2-compliance: Verify metadata formats

Hans Verkuil hverkuil at xs4all.nl
Tue Sep 24 12:01:54 UTC 2019


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 at 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


More information about the Linux-kernel-mentees mailing list