NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

test: v4l2_videodevice: controls: Test 64-bit controls

Browse source 
The recent merge (and revert) of commit 34bee5e84e ("libcamera:
V4L2Device: Remove the controls order assumption in updateControls()")
showed that 64-bit controls were missing from unit tests.

Fix this by testing the VIVID_CID_INTEGER64 control in the V4L2 video
device controls test.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
This commit is contained in:
Laurent Pinchart 2021-05-25 12:30:30 +03:00
parent c43c12a24b
commit a8c9fce109
1 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
test/v4l2_videodevice/controls.cpp
View file

@ -16,6 +16,7 @@
/* These come from the vivid driver. */
#define VIVID_CID_CUSTOM_BASE (V4L2_CID_USER_BASE | 0xf000)
#define VIVID_CID_INTEGER64 (VIVID_CID_CUSTOM_BASE + 3)
#define VIVID_CID_U8_4D_ARRAY (VIVID_CID_CUSTOM_BASE + 10)
/* Helper for VIVID_CID_U8_4D_ARRAY control array size: not from kernel. */
@ -46,6 +47,7 @@ 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(VIVID_CID_INTEGER64) == infoMap.end() ||
infoMap.find(VIVID_CID_U8_4D_ARRAY) == infoMap.end()) {
cerr << "Missing controls" << endl;
return TestFail;
@ -54,12 +56,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 &int64 = infoMap.find(VIVID_CID_INTEGER64)->second;
const ControlInfo &u8 = infoMap.find(VIVID_CID_U8_4D_ARRAY)->second;
/* Test getting controls. */
ControlList ctrls = capture_->getControls({ V4L2_CID_BRIGHTNESS,
V4L2_CID_CONTRAST,
V4L2_CID_SATURATION,
VIVID_CID_INTEGER64,
VIVID_CID_U8_4D_ARRAY });
if (ctrls.empty()) {
cerr << "Failed to get controls" << endl;
@ -78,6 +82,12 @@ protected:
return TestFail;
}
/*
* The VIVID_CID_INTEGER64 control can take any value, just test
* that its value can be retrieved and has the right type.
*/
ctrls.get(VIVID_CID_INTEGER64).get<int64_t>();
uint8_t u8Min = u8.min().get<uint8_t>();
uint8_t u8Max = u8.max().get<uint8_t>();
@ -94,6 +104,7 @@ protected:
ctrls.set(V4L2_CID_BRIGHTNESS, brightness.min());
ctrls.set(V4L2_CID_CONTRAST, contrast.max());
ctrls.set(V4L2_CID_SATURATION, saturation.min());
ctrls.set(VIVID_CID_INTEGER64, int64.min());
std::array<uint8_t, VIVID_CID_U8_ARRAY_SIZE> u8Values;
std::fill(u8Values.begin(), u8Values.end(), u8.min().get<uint8_t>());