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

libcamera: v4l2_controls: Turn V4L2ControlInfoMap into a class

Browse source 
In preparation for extending V4L2ControlInfoMap with control idmap
support, turn it into a real class. Make it inherit from std::map<>
instead of wrapping it to keep the API simple.

V4L2ControlInfoMap is meant to be constructed with a set of control
info, and never modified afterwards. To ensure this, inherit from
std::map<> with private access specifier, and explicitly expose the
std::map<> methods that do not allow insertion or removal of elements. A
custom move assignment operator is implemented to allow efficient
construction of the V4L2ControlInfoMap.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Tested-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Laurent Pinchart 2019-10-12 20:20:39 +03:00
parent 90d0f193eb
commit 2fe723440a
3 changed files with 40 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/libcamera/v4l2_device.cpp
View file

@ -340,6 +340,7 @@ int V4L2Device::ioctl(unsigned long request, void *argp)
*/
void V4L2Device::listControls()
{
std::map<unsigned int, V4L2ControlInfo> ctrls;
struct v4l2_query_ext_ctrl ctrl = {};
/* \todo Add support for menu and compound controls. */
@ -368,10 +369,12 @@ void V4L2Device::listControls()
continue;
}
controls_.emplace(std::piecewise_construct,
std::forward_as_tuple(ctrl.id),
std::forward_as_tuple(ctrl));
ctrls.emplace(std::piecewise_construct,
std::forward_as_tuple(ctrl.id),
std::forward_as_tuple(ctrl));
}
controls_ = std::move(ctrls);
}
/*