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

libcamera: v4l2_controls: Use the ControlValue class for data storage

Browse source 
Use the ControlValue class to replace the manually crafted data storage
in V4L2Control. This will help sharing code when more data types will be
supported.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Laurent Pinchart 2019-09-28 05:16:26 +03:00
parent ace50f75a4
commit 186ae04c0c
5 changed files with 25 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libcamera/v4l2_device.cpp
View file

@ -264,14 +264,14 @@ int V4L2Device::setControls(V4L2ControlList *ctrls)
/* Set the v4l2_ext_control value for the write operation. */
switch (info->type()) {
case V4L2_CTRL_TYPE_INTEGER64:
v4l2Ctrls[i].value64 = ctrl->value();
v4l2Ctrls[i].value64 = ctrl->value().get<int64_t>();
break;
default:
/*
* \todo To be changed when support for string and
* compound controls will be added.
*/
v4l2Ctrls[i].value = ctrl->value();
v4l2Ctrls[i].value = ctrl->value().get<int32_t>();
break;
}
}
@ -393,14 +393,14 @@ void V4L2Device::updateControls(V4L2ControlList *ctrls,
switch (info->type()) {
case V4L2_CTRL_TYPE_INTEGER64:
ctrl->setValue(v4l2Ctrl->value64);
ctrl->value().set<int64_t>(v4l2Ctrl->value64);
break;
default:
/*
* \todo To be changed when support for string and
* compound controls will be added.
*/
ctrl->setValue(v4l2Ctrl->value);
ctrl->value().set<int32_t>(v4l2Ctrl->value);
break;
}
}