From patchwork Sat Mar 21 00:36:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3235 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 5161460417 for ; Sat, 21 Mar 2020 01:36:53 +0100 (CET) Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id E058813C2; Sat, 21 Mar 2020 01:36:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1584751013; bh=u6GRWgZptZJUm8GwP2bbv31pja9xaDi8JNeyq9Bohnc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o8trWShn7b5gXUUEbjwUU32cZxDh+zpZ1FxhH1+7ikTaBsLZ20UkV+aF4+AN6ivnV 7iPD8weptEPSMCJ06bzgh135/oOvf5I/Y3LyS5bj32+HbSe3ynN23modtLHI/ntNGB ZzD18RV//EoTL0ZBL7lW7XLJ7bohadD1vyiXEqyg= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Sat, 21 Mar 2020 02:36:40 +0200 Message-Id: <20200321003640.2156-8-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200321003640.2156-1-laurent.pinchart@ideasonboard.com> References: <20200321003640.2156-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 7/7] test: v4l2_videodevice: Test U8 array controls X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Mar 2020 00:36:53 -0000 From: Jacopo Mondi Test V4L2 array control using vivid control VIVID_CID_U8_4D_ARRAY. Signed-off-by: Jacopo Mondi Signed-off-by: Laurent Pinchart --- Changes since v1: - Add missing period in comment - Use - Don't set array value for VIVID_CID_U8_4D_ARRAY before getControls() --- test/v4l2_videodevice/controls.cpp | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/test/v4l2_videodevice/controls.cpp b/test/v4l2_videodevice/controls.cpp index 478de3707a3c..da9e0111e221 100644 --- a/test/v4l2_videodevice/controls.cpp +++ b/test/v4l2_videodevice/controls.cpp @@ -5,6 +5,8 @@ * controls.cpp - V4L2 device controls handling test */ +#include +#include #include #include @@ -12,6 +14,13 @@ #include "v4l2_videodevice_test.h" +/* These come from the vivid driver. */ +#define VIVID_CID_CUSTOM_BASE (V4L2_CID_USER_BASE | 0xf000) +#define VIVID_CID_U8_4D_ARRAY (VIVID_CID_CUSTOM_BASE + 10) + +/* Helper for VIVID_CID_U8_4D_ARRAY control array size: not from kernel. */ +#define VIVID_CID_U8_ARRAY_SIZE (2 * 3 * 4 * 5) + using namespace std; using namespace libcamera; @@ -36,7 +45,8 @@ protected: if (infoMap.find(V4L2_CID_BRIGHTNESS) == infoMap.end() || infoMap.find(V4L2_CID_CONTRAST) == infoMap.end() || - infoMap.find(V4L2_CID_SATURATION) == infoMap.end()) { + infoMap.find(V4L2_CID_SATURATION) == infoMap.end() || + infoMap.find(VIVID_CID_U8_4D_ARRAY) == infoMap.end()) { cerr << "Missing controls" << endl; return TestFail; } @@ -44,12 +54,14 @@ protected: const ControlInfo &brightness = infoMap.find(V4L2_CID_BRIGHTNESS)->second; const ControlInfo &contrast = infoMap.find(V4L2_CID_CONTRAST)->second; const ControlInfo &saturation = infoMap.find(V4L2_CID_SATURATION)->second; + const ControlInfo &u8 = infoMap.find(VIVID_CID_U8_4D_ARRAY)->second; /* Test getting controls. */ ControlList ctrls(infoMap); ctrls.set(V4L2_CID_BRIGHTNESS, -1); ctrls.set(V4L2_CID_CONTRAST, -1); ctrls.set(V4L2_CID_SATURATION, -1); + ctrls.set(VIVID_CID_U8_4D_ARRAY, 0); int ret = capture_->getControls(&ctrls); if (ret) { @@ -64,11 +76,27 @@ protected: return TestFail; } + uint8_t u8Min = u8.min().get(); + uint8_t u8Max = u8.max().get(); + + Span u8Span = ctrls.get(VIVID_CID_U8_4D_ARRAY).get>(); + bool valid = std::all_of(u8Span.begin(), u8Span.end(), + [&](uint8_t v) { return v >= u8Min && v <= u8Max; }); + if (!valid) { + cerr << "Incorrect value for retrieved array control" + << endl; + return TestFail; + } + /* Test setting controls. */ ctrls.set(V4L2_CID_BRIGHTNESS, brightness.min()); ctrls.set(V4L2_CID_CONTRAST, contrast.max()); ctrls.set(V4L2_CID_SATURATION, saturation.min()); + std::array u8Values; + std::fill(u8Values.begin(), u8Values.end(), u8.min().get()); + ctrls.set(VIVID_CID_U8_4D_ARRAY, Span(u8Values)); + ret = capture_->setControls(&ctrls); if (ret) { cerr << "Failed to set controls" << endl;