summaryrefslogtreecommitdiff
path: root/src/libcamera/v4l2_device.cpp
diff options
context:
space:
mode:
authorHirokazu Honda <hiroh@chromium.org>2021-04-23 18:36:53 +0900
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2021-04-26 16:40:13 +0300
commitc3ab0fa0ce7831f2c97133755ab7e4690e398f10 (patch)
tree806610b97ce0250401308a504420143a5467cfdd /src/libcamera/v4l2_device.cpp
parent3c0e99e0341559968361eea231a2b5e5dae6034d (diff)
libcamera: V4L2Device: Use Span in updateControls()
V4L2Device::updateControls() takes two arguments, raw array and its size, for the v4l2_ext_control values. This replaces it with libcamera::Span. Signed-off-by: Hirokazu Honda <hiroh@chromium.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Tested-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'src/libcamera/v4l2_device.cpp')
-rw-r--r--src/libcamera/v4l2_device.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp
index 6a2bfffe..397029ac 100644
--- a/src/libcamera/v4l2_device.cpp
+++ b/src/libcamera/v4l2_device.cpp
@@ -253,7 +253,7 @@ ControlList V4L2Device::getControls(const std::vector<uint32_t> &ids)
v4l2Ctrls.resize(errorIdx);
}
- updateControls(&ctrls, v4l2Ctrls.data(), v4l2Ctrls.size());
+ updateControls(&ctrls, v4l2Ctrls);
return ctrls;
}
@@ -352,7 +352,7 @@ int V4L2Device::setControls(ControlList *ctrls)
ret = errorIdx;
}
- updateControls(ctrls, v4l2Ctrls.data(), v4l2Ctrls.size());
+ updateControls(ctrls, v4l2Ctrls);
return ret;
}
@@ -516,15 +516,13 @@ void V4L2Device::listControls()
* values in \a v4l2Ctrls
* \param[inout] ctrls List of V4L2 controls to update
* \param[in] v4l2Ctrls List of V4L2 extended controls as returned by the driver
- * \param[in] count The number of controls to update
*/
void V4L2Device::updateControls(ControlList *ctrls,
- const struct v4l2_ext_control *v4l2Ctrls,
- unsigned int count)
+ Span<const v4l2_ext_control> v4l2Ctrls)
{
unsigned int i = 0;
for (auto &ctrl : *ctrls) {
- if (i == count)
+ if (i == v4l2Ctrls.size())
break;
const struct v4l2_ext_control *v4l2Ctrl = &v4l2Ctrls[i];