From 493c69d0814670c1caa5cc3491a1078810b3f7b5 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Thu, 17 Jul 2014 23:37:53 +0200 Subject: [PATCH] v4l2-compliance: also check for V4L2_CAP_EXT_PIX_FORMAT in device_caps It must be present in both capability sets. Signed-off-by: Hans Verkuil --- utils/v4l2-compliance/v4l2-compliance.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/utils/v4l2-compliance/v4l2-compliance.cpp b/utils/v4l2-compliance/v4l2-compliance.cpp index 2aeb236..b8f828b 100644 --- a/utils/v4l2-compliance/v4l2-compliance.cpp +++ b/utils/v4l2-compliance/v4l2-compliance.cpp @@ -346,12 +346,13 @@ static int testCap(struct node *node) fail_on_test(caps == 0); fail_on_test(caps & V4L2_CAP_ASYNCIO); fail_on_test(!(caps & V4L2_CAP_DEVICE_CAPS)); - // set by the core, so this really should always be there - // for a modern driver. - fail_on_test(!(caps & V4L2_CAP_EXT_PIX_FORMAT)); fail_on_test(dcaps & V4L2_CAP_DEVICE_CAPS); fail_on_test(dcaps & ~caps); fail_on_test(!(dcaps & caps)); + // set by the core, so this really should always be there + // for a modern driver for both caps and dcaps + fail_on_test(!(caps & V4L2_CAP_EXT_PIX_FORMAT)); + fail_on_test(!(dcaps & V4L2_CAP_EXT_PIX_FORMAT)); fail_on_test(node->is_video && !(dcaps & video_caps)); fail_on_test(node->is_radio && !(dcaps & radio_caps)); // V4L2_CAP_AUDIO is invalid for radio and sdr -- 2.7.4