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

libcamera: v4l2_device: Support writing array U8 controls

Browse source 
Add support to write array controls of type V4L2_CTRL_TYPE_U8.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Jacopo Mondi 2020-03-04 14:14:36 +01:00 • committed by Laurent Pinchart
parent 2c6e6fbc96
commit 0aa8e09775
1 changed files with 27 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/libcamera/v4l2_device.cpp
View file

@ -250,7 +250,7 @@ int V4L2Device::setControls(ControlList *ctrls)
memset(v4l2Ctrls, 0, sizeof(v4l2Ctrls)); memset(v4l2Ctrls, 0, sizeof(v4l2Ctrls));
unsigned int i = 0; unsigned int i = 0;
for (const auto &ctrl : *ctrls) { for (auto &ctrl : *ctrls) {
unsigned int id = ctrl.first; unsigned int id = ctrl.first;
const auto iter = controls_.find(id); const auto iter = controls_.find(id);
if (iter == controls_.end()) { if (iter == controls_.end()) {
@ -262,16 +262,29 @@ int V4L2Device::setControls(ControlList *ctrls)
v4l2Ctrls[i].id = id; v4l2Ctrls[i].id = id;
/* Set the v4l2_ext_control value for the write operation. */ /* Set the v4l2_ext_control value for the write operation. */
const ControlValue &value = ctrl.second; ControlValue &value = ctrl.second;
switch (iter->first->type()) { switch (iter->first->type()) {
case ControlTypeInteger64: case ControlTypeInteger64:
v4l2Ctrls[i].value64 = value.get<int64_t>(); v4l2Ctrls[i].value64 = value.get<int64_t>();
break; break;
case ControlTypeByte: {
if (!value.isArray()) {
LOG(V4L2, Error)
<< "Control " << utils::hex(id)
<< " requires an array value";
return -EINVAL;
}
Span<uint8_t> data = value.data();
v4l2Ctrls[i].p_u8 = data.data();
v4l2Ctrls[i].size = data.size();
break;
}
default: default:
/* /* \todo To be changed to support strings. */
* \todo To be changed when support for string and
* compound controls will be added.
*/
v4l2Ctrls[i].value = value.get<int32_t>(); v4l2Ctrls[i].value = value.get<int32_t>();
break; break;
} }
@ -414,6 +427,14 @@ void V4L2Device::updateControls(ControlList *ctrls,
case ControlTypeInteger64: case ControlTypeInteger64:
value.set<int64_t>(v4l2Ctrl->value64); value.set<int64_t>(v4l2Ctrl->value64);
break; break;
case ControlTypeByte:
/*
* No action required, the VIDIOC_[GS]_EXT_CTRLS ioctl
* accessed the ControlValue storage directly.
*/
break;
default: default:
/* /*
* \todo To be changed when support for string and * \todo To be changed when support for string and