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

libcamera: v4l2_controls: Remove V4L2ControlInfo::size()

Browse source 
We don't support V4L2 compound controls, the size field is thus unused.
Remove it to ease merging of the libcamera and V4L2 control info
classes. Support for array controls can then be added later on top, and
would be useful for libcamera controls too.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Laurent Pinchart 2019-10-13 21:20:44 +03:00
parent 876b900862
commit 35e6319b35
3 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libcamera/include/v4l2_controls.h
View file

@ -31,14 +31,10 @@ public:
V4L2ControlInfo(const struct v4l2_query_ext_ctrl &ctrl);
const ControlId &id() const { return id_; }
size_t size() const { return size_; }
const ControlRange &range() const { return range_; }
private:
V4L2ControlId id_;
size_t size_;
ControlRange range_;
};

8
src/libcamera/v4l2_controls.cpp
View file

@ -127,8 +127,6 @@ V4L2ControlId::V4L2ControlId(const struct v4l2_query_ext_ctrl &ctrl)
V4L2ControlInfo::V4L2ControlInfo(const struct v4l2_query_ext_ctrl &ctrl)
: id_(ctrl)
{
size_ = ctrl.elem_size * ctrl.elems;
if (ctrl.type == V4L2_CTRL_TYPE_INTEGER64)
range_ = ControlRange(static_cast<int64_t>(ctrl.minimum),
static_cast<int64_t>(ctrl.maximum));
@ -143,12 +141,6 @@ V4L2ControlInfo::V4L2ControlInfo(const struct v4l2_query_ext_ctrl &ctrl)
* \return The V4L2 control ID
*/
/**
* \fn V4L2ControlInfo::size()
* \brief Retrieve the control value data size (in bytes)
* \return The V4L2 control value data size
*/
/**
* \fn V4L2ControlInfo::range()
* \brief Retrieve the control value range

7
src/libcamera/v4l2_device.cpp
View file

@ -362,6 +362,13 @@ void V4L2Device::listControls()
ctrl.flags & V4L2_CTRL_FLAG_DISABLED)
continue;
if (ctrl.elems != 1 || ctrl.nr_of_dims) {
LOG(V4L2, Debug)
<< "Array control " << utils::hex(ctrl.id)
<< " not supported";
continue;
}
switch (ctrl.type) {
case V4L2_CTRL_TYPE_INTEGER:
case V4L2_CTRL_TYPE_BOOLEAN: