Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-16 08:55:06 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

libcamera: V4L2Device: Replace VLA with std::vector in setControls()

Browse source 
The original code uses Variable-Length-Array, which is not
officially supported in C++. This replaces the array with
std::vector.

Signed-off-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Hirokazu Honda 2021-04-23 18:36:52 +09:00 • committed by Laurent Pinchart
parent 3252631fbd
commit 3c0e99e034
1 changed files with 18 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/libcamera/v4l2_device.cpp
View file

@ -282,30 +282,28 @@ ControlList V4L2Device::getControls(const std::vector<uint32_t> &ids)
*/ */
int V4L2Device::setControls(ControlList *ctrls) int V4L2Device::setControls(ControlList *ctrls)
{ {
unsigned int count = ctrls->size(); if (ctrls->empty())
if (count == 0)
return 0; return 0;
struct v4l2_ext_control v4l2Ctrls[count]; std::vector<v4l2_ext_control> v4l2Ctrls(ctrls->size());
memset(v4l2Ctrls, 0, sizeof(v4l2Ctrls)); memset(v4l2Ctrls.data(), 0, sizeof(v4l2_ext_control) * ctrls->size());
unsigned int i = 0; for (auto [ctrl, i] = std::pair(ctrls->begin(), 0u); i < ctrls->size(); ctrl++, i++) {
for (auto &ctrl : *ctrls) { const 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()) {
LOG(V4L2, Error) LOG(V4L2, Error)
<< "Control " << utils::hex(id) << " not found"; << "Control " << utils::hex(id) << " not found";
return -EINVAL; return -EINVAL;
} }
v4l2_ext_control &v4l2Ctrl = v4l2Ctrls[i];
v4l2Ctrls[i].id = id; v4l2Ctrl.id = id;
/* Set the v4l2_ext_control value for the write operation. */ /* Set the v4l2_ext_control value for the write operation. */
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>(); v4l2Ctrl.value64 = value.get<int64_t>();
break; break;
case ControlTypeByte: { case ControlTypeByte: {
@ -317,32 +315,30 @@ int V4L2Device::setControls(ControlList *ctrls)
} }
Span<uint8_t> data = value.data(); Span<uint8_t> data = value.data();
v4l2Ctrls[i].p_u8 = data.data(); v4l2Ctrl.p_u8 = data.data();
v4l2Ctrls[i].size = data.size(); v4l2Ctrl.size = data.size();
break; break;
} }
default: default:
/* \todo To be changed to support strings. */ /* \todo To be changed to support strings. */
v4l2Ctrls[i].value = value.get<int32_t>(); v4l2Ctrl.value = value.get<int32_t>();
break; break;
} }
i++;
} }
struct v4l2_ext_controls v4l2ExtCtrls = {}; struct v4l2_ext_controls v4l2ExtCtrls = {};
v4l2ExtCtrls.which = V4L2_CTRL_WHICH_CUR_VAL; v4l2ExtCtrls.which = V4L2_CTRL_WHICH_CUR_VAL;
v4l2ExtCtrls.controls = v4l2Ctrls; v4l2ExtCtrls.controls = v4l2Ctrls.data();
v4l2ExtCtrls.count = count; v4l2ExtCtrls.count = v4l2Ctrls.size();
int ret = ioctl(VIDIOC_S_EXT_CTRLS, &v4l2ExtCtrls); int ret = ioctl(VIDIOC_S_EXT_CTRLS, &v4l2ExtCtrls);
if (ret) { if (ret) {
unsigned int errorIdx = v4l2ExtCtrls.error_idx; unsigned int errorIdx = v4l2ExtCtrls.error_idx;
/* Generic validation error. */ /* Generic validation error. */
if (errorIdx == 0 || errorIdx >= count) { if (errorIdx == 0 || errorIdx >= v4l2Ctrls.size()) {
LOG(V4L2, Error) << "Unable to set controls: " LOG(V4L2, Error) << "Unable to set controls: "
<< strerror(-ret); << strerror(-ret);
return -EINVAL; return -EINVAL;
@ -351,11 +347,12 @@ int V4L2Device::setControls(ControlList *ctrls)
/* A specific control failed. */ /* A specific control failed. */
LOG(V4L2, Error) << "Unable to set control " << errorIdx LOG(V4L2, Error) << "Unable to set control " << errorIdx
<< ": " << strerror(-ret); << ": " << strerror(-ret);
count = errorIdx - 1;
v4l2Ctrls.resize(errorIdx);
ret = errorIdx; ret = errorIdx;
} }
updateControls(ctrls, v4l2Ctrls, count); updateControls(ctrls, v4l2Ctrls.data(), v4l2Ctrls.size());
return ret; return ret;
} }