From 207d57c8b4c066a0e70982f28e0084361d7448f2 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Mon, 14 Oct 2019 00:41:47 +0300 Subject: libcamera: v4l2_controls: Replace V4L2ControlInfo with V4L2ControlRange MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The V4L2ControlInfo class only stores a ControlRange. Make it inherit from ControlRange to provide a convenience constructor from a struct v4l2_query_ext_ctrl and rename it to V4L2ControlRange. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund Reviewed-by: Jacopo Mondi --- src/ipa/rkisp1/rkisp1.cpp | 8 +++--- src/libcamera/include/v4l2_controls.h | 47 ++++++++++++++++------------------- src/libcamera/pipeline/uvcvideo.cpp | 4 +-- src/libcamera/pipeline/vimc.cpp | 4 +-- src/libcamera/v4l2_controls.cpp | 42 +++++++++++-------------------- src/libcamera/v4l2_device.cpp | 2 +- 6 files changed, 44 insertions(+), 63 deletions(-) (limited to 'src') diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp index 13059d99..d64c334c 100644 --- a/src/ipa/rkisp1/rkisp1.cpp +++ b/src/ipa/rkisp1/rkisp1.cpp @@ -83,12 +83,12 @@ void IPARkISP1::configure(const std::map &streamConfig, autoExposure_ = true; - minExposure_ = std::max(itExp->second.range().min().get(), 1); - maxExposure_ = itExp->second.range().max().get(); + minExposure_ = std::max(itExp->second.min().get(), 1); + maxExposure_ = itExp->second.max().get(); exposure_ = minExposure_; - minGain_ = std::max(itGain->second.range().min().get(), 1); - maxGain_ = itGain->second.range().max().get(); + minGain_ = std::max(itGain->second.min().get(), 1); + maxGain_ = itGain->second.max().get(); gain_ = minGain_; LOG(IPARkISP1, Info) diff --git a/src/libcamera/include/v4l2_controls.h b/src/libcamera/include/v4l2_controls.h index ca721750..74156982 100644 --- a/src/libcamera/include/v4l2_controls.h +++ b/src/libcamera/include/v4l2_controls.h @@ -25,38 +25,33 @@ public: V4L2ControlId(const struct v4l2_query_ext_ctrl &ctrl); }; -class V4L2ControlInfo +class V4L2ControlRange : public ControlRange { public: - V4L2ControlInfo(const struct v4l2_query_ext_ctrl &ctrl); - - const ControlRange &range() const { return range_; } - -private: - ControlRange range_; + V4L2ControlRange(const struct v4l2_query_ext_ctrl &ctrl); }; -class V4L2ControlInfoMap : private std::map +class V4L2ControlInfoMap : private std::map { public: - V4L2ControlInfoMap &operator=(std::map &&info); - - using std::map::key_type; - using std::map::mapped_type; - using std::map::value_type; - using std::map::size_type; - using std::map::iterator; - using std::map::const_iterator; - - using std::map::begin; - using std::map::cbegin; - using std::map::end; - using std::map::cend; - using std::map::at; - using std::map::empty; - using std::map::size; - using std::map::count; - using std::map::find; + V4L2ControlInfoMap &operator=(std::map &&info); + + using std::map::key_type; + using std::map::mapped_type; + using std::map::value_type; + using std::map::size_type; + using std::map::iterator; + using std::map::const_iterator; + + using std::map::begin; + using std::map::cbegin; + using std::map::end; + using std::map::cend; + using std::map::at; + using std::map::empty; + using std::map::size; + using std::map::count; + using std::map::find; mapped_type &at(unsigned int key); const mapped_type &at(unsigned int key) const; diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp index 4d76b5fd..7356585b 100644 --- a/src/libcamera/pipeline/uvcvideo.cpp +++ b/src/libcamera/pipeline/uvcvideo.cpp @@ -337,7 +337,7 @@ int UVCCameraData::init(MediaEntity *entity) /* Initialise the supported controls. */ const V4L2ControlInfoMap &controls = video_->controls(); for (const auto &ctrl : controls) { - const V4L2ControlInfo &info = ctrl.second; + const V4L2ControlRange &range = ctrl.second; const ControlId *id; switch (ctrl.first->id()) { @@ -362,7 +362,7 @@ int UVCCameraData::init(MediaEntity *entity) controlInfo_.emplace(std::piecewise_construct, std::forward_as_tuple(id), - std::forward_as_tuple(info.range())); + std::forward_as_tuple(range)); } return 0; diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp index 78c0fe5a..87e7e54e 100644 --- a/src/libcamera/pipeline/vimc.cpp +++ b/src/libcamera/pipeline/vimc.cpp @@ -413,7 +413,7 @@ int VimcCameraData::init(MediaDevice *media) /* Initialise the supported controls. */ const V4L2ControlInfoMap &controls = sensor_->controls(); for (const auto &ctrl : controls) { - const V4L2ControlInfo &info = ctrl.second; + const V4L2ControlRange &range = ctrl.second; const ControlId *id; switch (ctrl.first->id()) { @@ -432,7 +432,7 @@ int VimcCameraData::init(MediaDevice *media) controlInfo_.emplace(std::piecewise_construct, std::forward_as_tuple(id), - std::forward_as_tuple(info.range())); + std::forward_as_tuple(range)); } return 0; diff --git a/src/libcamera/v4l2_controls.cpp b/src/libcamera/v4l2_controls.cpp index 9a5e4830..f2ac60de 100644 --- a/src/libcamera/v4l2_controls.cpp +++ b/src/libcamera/v4l2_controls.cpp @@ -104,45 +104,31 @@ V4L2ControlId::V4L2ControlId(const struct v4l2_query_ext_ctrl &ctrl) } /** - * \class V4L2ControlInfo - * \brief Information on a V4L2 control + * \class V4L2ControlRange + * \brief Convenience specialisation of ControlRange for V4L2 controls * - * The V4L2ControlInfo class represents all the information related to a V4L2 - * control, such as its ID, its type, its user-readable name and the expected - * size of its value data. - * - * V4L2ControlInfo instances are created by inspecting the fieldS of a struct - * v4l2_query_ext_ctrl structure, after it has been filled by the device driver - * as a consequence of a VIDIOC_QUERY_EXT_CTRL ioctl call. - * - * This class does not contain the control value, but only static information on - * the control, which shall be cached by the caller at initialisation time or - * the first time the control information is accessed. + * The V4L2ControlRange class is a specialisation of the ControlRange for V4L2 + * controls. It offers a convenience constructor from a struct + * v4l2_query_ext_ctrl, and is otherwise equivalent to the ControlRange class. */ /** - * \brief Construct a V4L2ControlInfo from a struct v4l2_query_ext_ctrl + * \brief Construct a V4L2ControlRange from a struct v4l2_query_ext_ctrl * \param[in] ctrl The struct v4l2_query_ext_ctrl as returned by the kernel */ -V4L2ControlInfo::V4L2ControlInfo(const struct v4l2_query_ext_ctrl &ctrl) +V4L2ControlRange::V4L2ControlRange(const struct v4l2_query_ext_ctrl &ctrl) { if (ctrl.type == V4L2_CTRL_TYPE_INTEGER64) - range_ = ControlRange(static_cast(ctrl.minimum), - static_cast(ctrl.maximum)); + ControlRange::operator=(ControlRange(static_cast(ctrl.minimum), + static_cast(ctrl.maximum))); else - range_ = ControlRange(static_cast(ctrl.minimum), - static_cast(ctrl.maximum)); + ControlRange::operator=(ControlRange(static_cast(ctrl.minimum), + static_cast(ctrl.maximum))); } -/** - * \fn V4L2ControlInfo::range() - * \brief Retrieve the control value range - * \return The V4L2 control value range - */ - /** * \class V4L2ControlInfoMap - * \brief A map of controlID to V4L2ControlInfo + * \brief A map of controlID to V4L2ControlRange */ /** @@ -156,9 +142,9 @@ V4L2ControlInfo::V4L2ControlInfo(const struct v4l2_query_ext_ctrl &ctrl) * * \return The populated V4L2ControlInfoMap */ -V4L2ControlInfoMap &V4L2ControlInfoMap::operator=(std::map &&info) +V4L2ControlInfoMap &V4L2ControlInfoMap::operator=(std::map &&info) { - std::map::operator=(std::move(info)); + std::map::operator=(std::move(info)); idmap_.clear(); for (const auto &ctrl : *this) diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp index 4bb7d595..133f8abc 100644 --- a/src/libcamera/v4l2_device.cpp +++ b/src/libcamera/v4l2_device.cpp @@ -342,7 +342,7 @@ int V4L2Device::ioctl(unsigned long request, void *argp) */ void V4L2Device::listControls() { - std::map ctrls; + std::map ctrls; struct v4l2_query_ext_ctrl ctrl = {}; /* \todo Add support for menu and compound controls. */ -- cgit v1.2.1