From 32df2c1c856ce55a1c08f2cd44617f30da30db2f Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Tue, 11 Feb 2014 08:24:17 +0100 Subject: [PATCH] v4l2-compliance: add bytesperline sanity check for multiplanar formats. Signed-off-by: Hans Verkuil --- utils/v4l2-compliance/v4l2-test-formats.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/utils/v4l2-compliance/v4l2-test-formats.cpp b/utils/v4l2-compliance/v4l2-test-formats.cpp index 9ae2df3..db023f3 100644 --- a/utils/v4l2-compliance/v4l2-test-formats.cpp +++ b/utils/v4l2-compliance/v4l2-test-formats.cpp @@ -379,6 +379,7 @@ static int testFormatsType(struct node *node, int ret, unsigned type, struct v4 unsigned min_sampling_rate; v4l2_std_id std; __u32 service_set = 0; + unsigned tot_bytesperline = 0; unsigned cnt = 0; if (ret == ENOTTY) @@ -424,8 +425,9 @@ static int testFormatsType(struct node *node, int ret, unsigned type, struct v4 if (ret) return fail("pix_mp.plane_fmt[%d].reserved not zeroed\n", i); fail_on_test(!pfmt.sizeimage); - fail_on_test(pfmt.bytesperline && pfmt.bytesperline < pix_mp.width); + tot_bytesperline += pfmt.bytesperline; } + fail_on_test(tot_bytesperline && tot_bytesperline < pix_mp.width); break; case V4L2_BUF_TYPE_VBI_CAPTURE: case V4L2_BUF_TYPE_VBI_OUTPUT: -- 2.7.4