@@ -388,20 +388,19 @@ int testSubDevFormat(struct node *node, unsigned which, unsigned pad)
struct target_info {
__u32 target;
- bool allowed;
bool readonly;
bool found;
};
static target_info targets[] = {
- { V4L2_SEL_TGT_CROP, true },
- { V4L2_SEL_TGT_CROP_DEFAULT, false, true },
- { V4L2_SEL_TGT_CROP_BOUNDS, true, true },
- { V4L2_SEL_TGT_NATIVE_SIZE, true },
- { V4L2_SEL_TGT_COMPOSE, true },
- { V4L2_SEL_TGT_COMPOSE_DEFAULT, false, true },
- { V4L2_SEL_TGT_COMPOSE_BOUNDS, true, true },
- { V4L2_SEL_TGT_COMPOSE_PADDED, false, true },
+ { V4L2_SEL_TGT_CROP },
+ { V4L2_SEL_TGT_CROP_DEFAULT, true },
+ { V4L2_SEL_TGT_CROP_BOUNDS, true },
+ { V4L2_SEL_TGT_NATIVE_SIZE },
+ { V4L2_SEL_TGT_COMPOSE },
+ { V4L2_SEL_TGT_COMPOSE_DEFAULT, true },
+ { V4L2_SEL_TGT_COMPOSE_BOUNDS, true },
+ { V4L2_SEL_TGT_COMPOSE_PADDED, true },
{ ~0U },
};
@@ -447,7 +446,6 @@ int testSubDevSelection(struct node *node, unsigned which, unsigned pad)
if (ret)
continue;
have_sel = true;
- fail_on_test(!targets[tgt].allowed);
fail_on_test(check_0(sel.reserved, sizeof(sel.reserved)));
fail_on_test(sel.which != which);
fail_on_test(sel.pad != pad);
Subdev can also have non-active pixels, and using the _DEFAULT targets we can capture only the active pixels. Signed-off-by: Ricardo Ribalda Delgado <ribalda@kernel.org> --- utils/v4l2-compliance/v4l2-test-subdevs.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)