Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-24 17:15:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

libcamera: v4l2_controls: Use the ControlRange class for control info

Browse source 
Use the ControlRange class to express the range of a V4L2 control,
replacing the open-coded minimum and maximum fields in the
V4L2ControlInfo class.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Laurent Pinchart 2019-09-28 17:36:05 +03:00
parent 186ae04c0c
commit 28535ea1a2
4 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -30,8 +30,7 @@ public:
size_t size() const { return size_; }
const std::string &name() const { return name_; }
int64_t min() const { return min_; }
int64_t max() const { return max_; }
const ControlRange &range() const { return range_; }
private:
unsigned int id_;
@ -39,8 +38,7 @@ private:
size_t size_;
std::string name_;
int64_t min_;
int64_t max_;
ControlRange range_;
};
using V4L2ControlInfoMap = std::map<unsigned int, V4L2ControlInfo>;

2
src/libcamera/pipeline/uvcvideo.cpp
View file

@ -364,7 +364,7 @@ int UVCCameraData::init(MediaEntity *entity)
controlInfo_.emplace(std::piecewise_construct,
std::forward_as_tuple(id),
std::forward_as_tuple(info.min(), info.max()));
std::forward_as_tuple(info.range()));
}
return 0;

2
src/libcamera/pipeline/vimc.cpp
View file

@ -437,7 +437,7 @@ int VimcCameraData::init(MediaDevice *media)
controlInfo_.emplace(std::piecewise_construct,
std::forward_as_tuple(id),
std::forward_as_tuple(info.min(), info.max()));
std::forward_as_tuple(info.range()));
}
return 0;

21
src/libcamera/v4l2_controls.cpp
View file

@ -74,8 +74,13 @@ V4L2ControlInfo::V4L2ControlInfo(const struct v4l2_query_ext_ctrl &ctrl)
type_ = ctrl.type;
name_ = static_cast<const char *>(ctrl.name);
size_ = ctrl.elem_size * ctrl.elems;
min_ = ctrl.minimum;
max_ = ctrl.maximum;
if (ctrl.type == V4L2_CTRL_TYPE_INTEGER64)
range_ = ControlRange(static_cast<int64_t>(ctrl.minimum),
static_cast<int64_t>(ctrl.maximum));
else
range_ = ControlRange(static_cast<int32_t>(ctrl.minimum),
static_cast<int32_t>(ctrl.maximum));
}
/**
@ -103,15 +108,9 @@ V4L2ControlInfo::V4L2ControlInfo(const struct v4l2_query_ext_ctrl &ctrl)
*/
/**
* \fn V4L2ControlInfo::min()
* \brief Retrieve the control minimum value
* \return The V4L2 control minimum value
*/
/**
* \fn V4L2ControlInfo::max()
* \brief Retrieve the control maximum value
* \return The V4L2 control maximum value
* \fn V4L2ControlInfo::range()
* \brief Retrieve the control value range
* \return The V4L2 control value range
*/
/**