PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: Extend u16 control type

Browse Source 
V4L2 Controls support a wide variety of types not yet supported by the
ControlValue type system.

Extend the libcamera ControlValue types to support an explicit 16 bit
unsigned integer type, and map that to the corresponding
V4L2_CTRL_TYPE_U16 type within the v4l2_device support class.

It's used on some camera metadata that is of length 16-bits,
for example JPEG metadata headers.

Signed-off-by: Yudhistira Erlandinata <yerlandinata@chromium.org>
Co-developed-by: Harvey Yang <chenghaoyang@chromium.org>
Signed-off-by: Harvey Yang <chenghaoyang@chromium.org>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Yudhistira Erlandinata
2024-10-29 16:07:13 +00:00
committed by Kieran Bingham
parent 86902b39d7
commit d711a4c015
4 changed files with 83 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcamera/v4l2_device.cpp
+28
View File
@@ -216,6 +216,13 @@ ControlList V4L2Device::getControls(const std::vector<uint32_t> &ids)
v4l2Ctrl.p_u8 = data.data();
break;
case V4L2_CTRL_TYPE_U16:
type = ControlTypeUnsigned16;
value.reserve(type, true, info.elems);
data = value.data();
v4l2Ctrl.p_u16 = reinterpret_cast<uint16_t *>(data.data());
break;
case V4L2_CTRL_TYPE_U32:
type = ControlTypeUnsigned32;
value.reserve(type, true, info.elems);
@@ -307,6 +314,18 @@ int V4L2Device::setControls(ControlList *ctrls)
/* Set the v4l2_ext_control value for the write operation. */
ControlValue &value = ctrl->second;
switch (iter->first->type()) {
case ControlTypeUnsigned16: {
if (value.isArray()) {
Span<uint8_t> data = value.data();
v4l2Ctrl.p_u16 = reinterpret_cast<uint16_t *>(data.data());
v4l2Ctrl.size = data.size();
} else {
v4l2Ctrl.value = value.get<uint16_t>();
}
break;
}
case ControlTypeUnsigned32: {
if (value.isArray()) {
Span<uint8_t> data = value.data();
@@ -508,6 +527,9 @@ ControlType V4L2Device::v4l2CtrlType(uint32_t ctrlType)
case V4L2_CTRL_TYPE_BOOLEAN:
return ControlTypeBool;
case V4L2_CTRL_TYPE_U16:
return ControlTypeUnsigned16;
case V4L2_CTRL_TYPE_U32:
return ControlTypeUnsigned32;
@@ -559,6 +581,11 @@ std::optional<ControlInfo> V4L2Device::v4l2ControlInfo(const v4l2_query_ext_ctrl
static_cast<uint8_t>(ctrl.maximum),
static_cast<uint8_t>(ctrl.default_value));
case V4L2_CTRL_TYPE_U16:
return ControlInfo(static_cast<uint16_t>(ctrl.minimum),
static_cast<uint16_t>(ctrl.maximum),
static_cast<uint16_t>(ctrl.default_value));
case V4L2_CTRL_TYPE_U32:
return ControlInfo(static_cast<uint32_t>(ctrl.minimum),
static_cast<uint32_t>(ctrl.maximum),
@@ -650,6 +677,7 @@ void V4L2Device::listControls()
case V4L2_CTRL_TYPE_BITMASK:
case V4L2_CTRL_TYPE_INTEGER_MENU:
case V4L2_CTRL_TYPE_U8:
case V4L2_CTRL_TYPE_U16:
case V4L2_CTRL_TYPE_U32:
break;
/* \todo Support other control types. */