From bd0245a0dc6ff036dc25dee1f776e03e84c02953 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sun, 30 Jun 2019 15:22:27 +0300 Subject: libcamera: v4l2_controls: Add min and max to V4L2ControlInfo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add min() and max() methods to V4L2ControlInfo to report the control's minimum and maximum value respectively. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham Reviewed-by: Jacopo Mondi Reviewed-by: Niklas Söderlund --- src/libcamera/include/v4l2_controls.h | 6 ++++++ src/libcamera/v4l2_controls.cpp | 14 ++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/src/libcamera/include/v4l2_controls.h b/src/libcamera/include/v4l2_controls.h index 2c8cb900..0047efab 100644 --- a/src/libcamera/include/v4l2_controls.h +++ b/src/libcamera/include/v4l2_controls.h @@ -28,11 +28,17 @@ 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_; } + private: unsigned int id_; unsigned int type_; size_t size_; std::string name_; + + int64_t min_; + int64_t max_; }; class V4L2Control diff --git a/src/libcamera/v4l2_controls.cpp b/src/libcamera/v4l2_controls.cpp index 78888de2..af017bce 100644 --- a/src/libcamera/v4l2_controls.cpp +++ b/src/libcamera/v4l2_controls.cpp @@ -74,6 +74,8 @@ V4L2ControlInfo::V4L2ControlInfo(const struct v4l2_query_ext_ctrl &ctrl) type_ = ctrl.type; name_ = static_cast(ctrl.name); size_ = ctrl.elem_size * ctrl.elems; + min_ = ctrl.minimum; + max_ = ctrl.maximum; } /** @@ -100,6 +102,18 @@ V4L2ControlInfo::V4L2ControlInfo(const struct v4l2_query_ext_ctrl &ctrl) * \return The V4L2 control user readable name */ +/** + * \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 + */ + /** * \class V4L2Control * \brief A V4L2 control value -- cgit v1.2.1