From: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
To: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-staging@lists.linux.dev
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Nicolas Dufresne <nicolas.dufresne@collabora.com>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Subject: [PATCH v2] v4l2-compliance: codecs: Add stateless (TRY_)DECODER_CMD tests
Date: Thu, 9 Nov 2023 21:27:45 +0100 [thread overview]
Message-ID: <20231109202745.342387-1-paul.kocialkowski@bootlin.com> (raw)
Stateless codecs that support holding the capture buffer should implement the
(TRY_)DECODER_CMD ioctls for the flush command (and only this command).
Add a conditional to separate the stateless case from stateful one and move
the existing tests there.
Add new tests for the stateless case which ensure that the flush command is
supported and that the other stateful commands are not.
An existing check will already return early (without error) when the ioctls
are not implemented at all. Note that there is no easy way to check for the
capture buffer holding buffer flag since it requires setting up a coded format
in particular to be visible, which is far from trivial to implement here.
As a result we just carry out the tests when the ioctls are available.
Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
---
Changes since v1:
- Fixed typos.
utils/v4l2-compliance/v4l2-test-codecs.cpp | 111 ++++++++++++++-------
1 file changed, 75 insertions(+), 36 deletions(-)
diff --git a/utils/v4l2-compliance/v4l2-test-codecs.cpp b/utils/v4l2-compliance/v4l2-test-codecs.cpp
index df25a1ddc358..8c3527359813 100644
--- a/utils/v4l2-compliance/v4l2-test-codecs.cpp
+++ b/utils/v4l2-compliance/v4l2-test-codecs.cpp
@@ -99,6 +99,7 @@ int testDecoder(struct node *node)
{
struct v4l2_decoder_cmd cmd;
bool is_decoder = node->codec_mask & (STATEFUL_DECODER | JPEG_DECODER);
+ bool is_stateless = node->codec_mask & STATELESS_DECODER;
int ret;
fail_on_test((node->codec_mask & STATELESS_DECODER) && !node->has_media);
@@ -118,42 +119,80 @@ int testDecoder(struct node *node)
fail_on_test(ret == ENOTTY);
fail_on_test(ret != EINVAL);
- cmd.cmd = V4L2_DEC_CMD_STOP;
- cmd.flags = ~0;
- ret = doioctl(node, VIDIOC_TRY_DECODER_CMD, &cmd);
- fail_on_test(ret != 0);
- fail_on_test(cmd.flags & ~(V4L2_DEC_CMD_STOP_TO_BLACK | V4L2_DEC_CMD_STOP_IMMEDIATELY));
- fail_on_test(is_decoder && cmd.flags);
- ret = doioctl(node, VIDIOC_DECODER_CMD, &cmd);
- fail_on_test(ret != 0);
-
- cmd.cmd = V4L2_DEC_CMD_START;
- cmd.flags = ~0;
- ret = doioctl(node, VIDIOC_TRY_DECODER_CMD, &cmd);
- fail_on_test(ret);
- fail_on_test(cmd.flags & ~V4L2_DEC_CMD_START_MUTE_AUDIO);
- fail_on_test(is_decoder && cmd.flags);
-
- cmd.cmd = V4L2_DEC_CMD_START;
- cmd.flags = 0;
- cmd.start.speed = ~0;
- cmd.start.format = ~0U;
- ret = doioctl(node, VIDIOC_TRY_DECODER_CMD, &cmd);
- fail_on_test(ret);
- fail_on_test(cmd.start.format == ~0U);
- fail_on_test(cmd.start.speed == ~0);
- fail_on_test(is_decoder && cmd.start.format);
- fail_on_test(is_decoder && cmd.start.speed);
-
- cmd.cmd = V4L2_DEC_CMD_PAUSE;
- cmd.flags = 0;
- ret = doioctl(node, VIDIOC_DECODER_CMD, &cmd);
- fail_on_test(ret != EPERM && ret != EINVAL);
- fail_on_test(is_decoder && ret != EINVAL);
+ if (is_stateless) {
+ cmd.cmd = V4L2_DEC_CMD_FLUSH;
+ cmd.flags = 0;
+ ret = doioctl(node, VIDIOC_TRY_DECODER_CMD, &cmd);
+ fail_on_test(ret);
+ ret = doioctl(node, VIDIOC_DECODER_CMD, &cmd);
+ fail_on_test(ret);
+
+ cmd.cmd = V4L2_DEC_CMD_STOP;
+ cmd.flags = 0;
+ ret = doioctl(node, VIDIOC_TRY_DECODER_CMD, &cmd);
+ fail_on_test(!ret);
+ ret = doioctl(node, VIDIOC_DECODER_CMD, &cmd);
+ fail_on_test(!ret);
+
+ cmd.cmd = V4L2_DEC_CMD_START;
+ cmd.flags = 0;
+ ret = doioctl(node, VIDIOC_TRY_DECODER_CMD, &cmd);
+ fail_on_test(!ret);
+ ret = doioctl(node, VIDIOC_DECODER_CMD, &cmd);
+ fail_on_test(!ret);
+
+ cmd.cmd = V4L2_DEC_CMD_PAUSE;
+ cmd.flags = 0;
+ ret = doioctl(node, VIDIOC_TRY_DECODER_CMD, &cmd);
+ fail_on_test(!ret);
+ ret = doioctl(node, VIDIOC_DECODER_CMD, &cmd);
+ fail_on_test(!ret);
+
+ cmd.cmd = V4L2_DEC_CMD_RESUME;
+ cmd.flags = 0;
+ ret = doioctl(node, VIDIOC_TRY_DECODER_CMD, &cmd);
+ fail_on_test(!ret);
+ ret = doioctl(node, VIDIOC_DECODER_CMD, &cmd);
+ fail_on_test(!ret);
+ } else {
+ cmd.cmd = V4L2_DEC_CMD_STOP;
+ cmd.flags = ~0;
+ ret = doioctl(node, VIDIOC_TRY_DECODER_CMD, &cmd);
+ fail_on_test(ret);
+ fail_on_test(cmd.flags & ~(V4L2_DEC_CMD_STOP_TO_BLACK | V4L2_DEC_CMD_STOP_IMMEDIATELY));
+ fail_on_test(is_decoder && cmd.flags);
+ ret = doioctl(node, VIDIOC_DECODER_CMD, &cmd);
+ fail_on_test(ret);
+
+ cmd.cmd = V4L2_DEC_CMD_START;
+ cmd.flags = ~0;
+ ret = doioctl(node, VIDIOC_TRY_DECODER_CMD, &cmd);
+ fail_on_test(ret);
+ fail_on_test(cmd.flags & ~V4L2_DEC_CMD_START_MUTE_AUDIO);
+ fail_on_test(is_decoder && cmd.flags);
+
+ cmd.cmd = V4L2_DEC_CMD_START;
+ cmd.flags = 0;
+ cmd.start.speed = ~0;
+ cmd.start.format = ~0U;
+ ret = doioctl(node, VIDIOC_TRY_DECODER_CMD, &cmd);
+ fail_on_test(ret);
+ fail_on_test(cmd.start.format == ~0U);
+ fail_on_test(cmd.start.speed == ~0);
+ fail_on_test(is_decoder && cmd.start.format);
+ fail_on_test(is_decoder && cmd.start.speed);
+
+ cmd.cmd = V4L2_DEC_CMD_PAUSE;
+ cmd.flags = 0;
+ ret = doioctl(node, VIDIOC_DECODER_CMD, &cmd);
+ fail_on_test(ret != EPERM && ret != EINVAL);
+ fail_on_test(is_decoder && ret != EINVAL);
+
+ cmd.cmd = V4L2_DEC_CMD_RESUME;
+ ret = doioctl(node, VIDIOC_DECODER_CMD, &cmd);
+ fail_on_test(ret != EPERM && ret != EINVAL);
+ fail_on_test(is_decoder && ret != EINVAL);
+ }
- cmd.cmd = V4L2_DEC_CMD_RESUME;
- ret = doioctl(node, VIDIOC_DECODER_CMD, &cmd);
- fail_on_test(ret != EPERM && ret != EINVAL);
- fail_on_test(is_decoder && ret != EINVAL);
return 0;
}
--
2.42.1
reply other threads:[~2023-11-09 20:28 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20231109202745.342387-1-paul.kocialkowski@bootlin.com \
--to=paul.kocialkowski@bootlin.com \
--cc=hverkuil-cisco@xs4all.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=mchehab@kernel.org \
--cc=nicolas.dufresne@collabora.com \
--cc=thomas.petazzoni@bootlin.com \
/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
all inboxes | Powered by JetHome®