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

libcamera: v4l2_device: Update documentation

Browse source 
Compound controls are now supported, but they're still listed as
unsupported in some parts of the V4L2Device class documentation.
Fix this by removing those parts.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Jacopo Mondi 2020-04-23 14:32:20 +02:00
parent 96653be728
commit 43e8c5a93d
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/libcamera/v4l2_device.cpp
View file

@ -153,9 +153,9 @@ void V4L2Device::close()
* their values in the corresponding \a ctrls entry. * their values in the corresponding \a ctrls entry.
* *
* If any control in \a ctrls is not supported by the device, is disabled (i.e. * If any control in \a ctrls is not supported by the device, is disabled (i.e.
* has the V4L2_CTRL_FLAG_DISABLED flag set), is a compound control, or if any * has the V4L2_CTRL_FLAG_DISABLED flag set), or if any other error occurs
* other error occurs during validation of the requested controls, no control is * during validation of the requested controls, no control is read and this
* read and this method returns -EINVAL. * method returns -EINVAL.
* *
* If an error occurs while reading the controls, the index of the first control * If an error occurs while reading the controls, the index of the first control
* that couldn't be read is returned. The value of all controls below that index * that couldn't be read is returned. The value of all controls below that index
@ -251,10 +251,9 @@ int V4L2Device::getControls(ControlList *ctrls)
* \a ctrls entry. * \a ctrls entry.
* *
* If any control in \a ctrls is not supported by the device, is disabled (i.e. * If any control in \a ctrls is not supported by the device, is disabled (i.e.
* has the V4L2_CTRL_FLAG_DISABLED flag set), is read-only, is a * has the V4L2_CTRL_FLAG_DISABLED flag set), is read-only, if any other error
* compound control, or if any other error occurs during validation of * occurs during validation of the requested controls, no control is written and
* the requested controls, no control is written and this method returns * this method returns -EINVAL.
* -EINVAL.
* *
* If an error occurs while writing the controls, the index of the first * If an error occurs while writing the controls, the index of the first
* control that couldn't be written is returned. All controls below that index * control that couldn't be written is returned. All controls below that index
@ -384,7 +383,7 @@ void V4L2Device::listControls()
ControlInfoMap::Map ctrls; ControlInfoMap::Map ctrls;
struct v4l2_query_ext_ctrl ctrl = {}; struct v4l2_query_ext_ctrl ctrl = {};
/* \todo Add support for menu and compound controls. */ /* \todo Add support for menu controls. */
while (1) { while (1) {
ctrl.id |= V4L2_CTRL_FLAG_NEXT_CTRL | ctrl.id |= V4L2_CTRL_FLAG_NEXT_CTRL |
V4L2_CTRL_FLAG_NEXT_COMPOUND; V4L2_CTRL_FLAG_NEXT_COMPOUND;
@ -457,8 +456,8 @@ void V4L2Device::updateControls(ControlList *ctrls,
default: default:
/* /*
* \todo To be changed when support for string and * \todo To be changed when support for string controls
* compound controls will be added. * will be added.
*/ */
value.set<int32_t>(v4l2Ctrl->value); value.set<int32_t>(v4l2Ctrl->value);
break; break;