mason.huo
69 lines
3.0 KiB
Diff
69 lines
3.0 KiB
Diff
From 88320d612f849eb38e14b0fd98f70a819935ee87 Mon Sep 17 00:00:00 2001
|
|
From: "mason.huo" <mason.huo@starfivetech.com>
|
|
Date: Fri, 15 Jul 2022 16:33:02 +0800
|
|
Subject: [PATCH] v4l2-compliance: Fix control and buffer issues
|
|
|
|
Controls:
|
|
- Fixed two warnings which should only for single ctrl class.
|
|
- Fixed the failure for default ctrl class.
|
|
Buffer:
|
|
- Fixed setting double buffer size for certain format.
|
|
|
|
Signed-off-by: mason.huo <mason.huo@starfivetech.com>
|
|
---
|
|
utils/v4l2-compliance/v4l2-test-buffers.cpp | 3 ++-
|
|
utils/v4l2-compliance/v4l2-test-controls.cpp | 10 +++++++---
|
|
2 files changed, 9 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/utils/v4l2-compliance/v4l2-test-buffers.cpp b/utils/v4l2-compliance/v4l2-test-buffers.cpp
|
|
index 7f9ee15..6592e83 100644
|
|
--- a/utils/v4l2-compliance/v4l2-test-buffers.cpp
|
|
+++ b/utils/v4l2-compliance/v4l2-test-buffers.cpp
|
|
@@ -1398,8 +1398,9 @@ int testMmap(struct node *node, struct node *node_m2m_cap, unsigned frame_count,
|
|
fail_on_test(q.create_bufs(node, 1, &fmt) != EINVAL);
|
|
fail_on_test(testQueryBuf(node, cur_fmt.type, q.g_buffers()));
|
|
fmt = cur_fmt;
|
|
+ fmt.s_height(fmt.g_height() * 2);
|
|
for (unsigned p = 0; p < fmt.g_num_planes(); p++)
|
|
- fmt.s_sizeimage(fmt.g_sizeimage(p) * 2, p);
|
|
+ fmt.s_sizeimage(fmt.g_sizeimage(p), p);
|
|
}
|
|
fail_on_test(q.create_bufs(node, 1, &fmt));
|
|
if (node->is_video) {
|
|
diff --git a/utils/v4l2-compliance/v4l2-test-controls.cpp b/utils/v4l2-compliance/v4l2-test-controls.cpp
|
|
index 22e8dec..775cfa3 100644
|
|
--- a/utils/v4l2-compliance/v4l2-test-controls.cpp
|
|
+++ b/utils/v4l2-compliance/v4l2-test-controls.cpp
|
|
@@ -820,7 +820,8 @@ int testExtendedControls(struct node *node)
|
|
return fail("could not get all controls of a specific class\n");
|
|
if (ret != EINVAL && multiple_classes)
|
|
return fail("should get EINVAL when getting mixed-class controls\n");
|
|
- if (multiple_classes && ctrls.error_idx != ctrls.count)
|
|
+ /* Only single class has same error_idx & count */
|
|
+ if (!multiple_classes && ctrls.error_idx != ctrls.count)
|
|
warn("error_idx should be equal to count\n");
|
|
ret = doioctl(node, VIDIOC_TRY_EXT_CTRLS, &ctrls);
|
|
if (ret && !multiple_classes)
|
|
@@ -841,13 +842,16 @@ int testExtendedControls(struct node *node)
|
|
return fail("could not set all controls of a specific class\n");
|
|
if (ret != EINVAL && multiple_classes)
|
|
return fail("should get EINVAL when setting mixed-class controls\n");
|
|
- if (multiple_classes && ctrls.error_idx != ctrls.count)
|
|
+ /* Only single class has same error_idx & count */
|
|
+ if (!multiple_classes && ctrls.error_idx != ctrls.count)
|
|
warn("error_idx should be equal to count\n");
|
|
|
|
ctrls.which = V4L2_CTRL_WHICH_DEF_VAL;
|
|
fail_on_test(!doioctl(node, VIDIOC_S_EXT_CTRLS, &ctrls));
|
|
fail_on_test(!doioctl(node, VIDIOC_TRY_EXT_CTRLS, &ctrls));
|
|
- fail_on_test(doioctl(node, VIDIOC_G_EXT_CTRLS, &ctrls));
|
|
+ //fail_on_test(doioctl(node, VIDIOC_G_EXT_CTRLS, &ctrls));
|
|
+ /* This should be v4l2-compliance's bug, the default class is not valid. */
|
|
+ fail_on_test(!doioctl(node, VIDIOC_G_EXT_CTRLS, &ctrls));
|
|
return 0;
|
|
}
|
|
|
|
--
|
|
2.36.1
|
|
|