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

libcamera: v4l2_controls: Store a ControlRange in V4L2ControlInfoMap

Browse source 
V4L2ControlRange only offers a convenience constructor for a
ControlRange. Store the ControlRange instead of V4L2ControlRange in
V4L2ControlInfoMap to make the map less dependent on V4L2 types.

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-14 00:54:12 +03:00
parent 207d57c8b4
commit 1bfed95c1e
6 changed files with 27 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -31,27 +31,27 @@ public:
V4L2ControlRange(const struct v4l2_query_ext_ctrl &ctrl); V4L2ControlRange(const struct v4l2_query_ext_ctrl &ctrl);
}; };
class V4L2ControlInfoMap : private std::map<const ControlId *, V4L2ControlRange> class V4L2ControlInfoMap : private std::map<const ControlId *, ControlRange>
{ {
public: public:
V4L2ControlInfoMap &operator=(std::map<const ControlId *, V4L2ControlRange> &&info); V4L2ControlInfoMap &operator=(std::map<const ControlId *, ControlRange> &&info);
using std::map<const ControlId *, V4L2ControlRange>::key_type; using std::map<const ControlId *, ControlRange>::key_type;
using std::map<const ControlId *, V4L2ControlRange>::mapped_type; using std::map<const ControlId *, ControlRange>::mapped_type;
using std::map<const ControlId *, V4L2ControlRange>::value_type; using std::map<const ControlId *, ControlRange>::value_type;
using std::map<const ControlId *, V4L2ControlRange>::size_type; using std::map<const ControlId *, ControlRange>::size_type;
using std::map<const ControlId *, V4L2ControlRange>::iterator; using std::map<const ControlId *, ControlRange>::iterator;
using std::map<const ControlId *, V4L2ControlRange>::const_iterator; using std::map<const ControlId *, ControlRange>::const_iterator;
using std::map<const ControlId *, V4L2ControlRange>::begin; using std::map<const ControlId *, ControlRange>::begin;
using std::map<const ControlId *, V4L2ControlRange>::cbegin; using std::map<const ControlId *, ControlRange>::cbegin;
using std::map<const ControlId *, V4L2ControlRange>::end; using std::map<const ControlId *, ControlRange>::end;
using std::map<const ControlId *, V4L2ControlRange>::cend; using std::map<const ControlId *, ControlRange>::cend;
using std::map<const ControlId *, V4L2ControlRange>::at; using std::map<const ControlId *, ControlRange>::at;
using std::map<const ControlId *, V4L2ControlRange>::empty; using std::map<const ControlId *, ControlRange>::empty;
using std::map<const ControlId *, V4L2ControlRange>::size; using std::map<const ControlId *, ControlRange>::size;
using std::map<const ControlId *, V4L2ControlRange>::count; using std::map<const ControlId *, ControlRange>::count;
using std::map<const ControlId *, V4L2ControlRange>::find; using std::map<const ControlId *, ControlRange>::find;
mapped_type &at(unsigned int key); mapped_type &at(unsigned int key);
const mapped_type &at(unsigned int key) const; const mapped_type &at(unsigned int key) const;

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

@ -337,7 +337,7 @@ int UVCCameraData::init(MediaEntity *entity)
/* Initialise the supported controls. */ /* Initialise the supported controls. */
const V4L2ControlInfoMap &controls = video_->controls(); const V4L2ControlInfoMap &controls = video_->controls();
for (const auto &ctrl : controls) { for (const auto &ctrl : controls) {
const V4L2ControlRange &range = ctrl.second; const ControlRange &range = ctrl.second;
const ControlId *id; const ControlId *id;
switch (ctrl.first->id()) { switch (ctrl.first->id()) {

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

@ -413,7 +413,7 @@ int VimcCameraData::init(MediaDevice *media)
/* Initialise the supported controls. */ /* Initialise the supported controls. */
const V4L2ControlInfoMap &controls = sensor_->controls(); const V4L2ControlInfoMap &controls = sensor_->controls();
for (const auto &ctrl : controls) { for (const auto &ctrl : controls) {
const V4L2ControlRange &range = ctrl.second; const ControlRange &range = ctrl.second;
const ControlId *id; const ControlId *id;
switch (ctrl.first->id()) { switch (ctrl.first->id()) {

6
src/libcamera/v4l2_controls.cpp
View file

@ -128,7 +128,7 @@ V4L2ControlRange::V4L2ControlRange(const struct v4l2_query_ext_ctrl &ctrl)
/** /**
* \class V4L2ControlInfoMap * \class V4L2ControlInfoMap
* \brief A map of controlID to V4L2ControlRange * \brief A map of controlID to ControlRange for V4L2 controls
*/ */
/** /**
@ -142,9 +142,9 @@ V4L2ControlRange::V4L2ControlRange(const struct v4l2_query_ext_ctrl &ctrl)
* *
* \return The populated V4L2ControlInfoMap * \return The populated V4L2ControlInfoMap
*/ */
V4L2ControlInfoMap &V4L2ControlInfoMap::operator=(std::map<const ControlId *, V4L2ControlRange> &&info) V4L2ControlInfoMap &V4L2ControlInfoMap::operator=(std::map<const ControlId *, ControlRange> &&info)
{ {
std::map<const ControlId *, V4L2ControlRange>::operator=(std::move(info)); std::map<const ControlId *, ControlRange>::operator=(std::move(info));
idmap_.clear(); idmap_.clear();
for (const auto &ctrl : *this) for (const auto &ctrl : *this)

6
src/libcamera/v4l2_device.cpp
View file

@ -342,7 +342,7 @@ int V4L2Device::ioctl(unsigned long request, void *argp)
*/ */
void V4L2Device::listControls() void V4L2Device::listControls()
{ {
std::map<const ControlId *, V4L2ControlRange> ctrls; std::map<const ControlId *, ControlRange> ctrls;
struct v4l2_query_ext_ctrl ctrl = {}; struct v4l2_query_ext_ctrl ctrl = {};
/* \todo Add support for menu and compound controls. */ /* \todo Add support for menu and compound controls. */
@ -380,9 +380,7 @@ void V4L2Device::listControls()
} }
controlIds_.emplace_back(utils::make_unique<V4L2ControlId>(ctrl)); controlIds_.emplace_back(utils::make_unique<V4L2ControlId>(ctrl));
ctrls.emplace(std::piecewise_construct, ctrls.emplace(controlIds_.back().get(), V4L2ControlRange(ctrl));
std::forward_as_tuple(controlIds_.back().get()),
std::forward_as_tuple(ctrl));
} }
controls_ = std::move(ctrls); controls_ = std::move(ctrls);

6
test/v4l2_videodevice/controls.cpp
View file

@ -41,9 +41,9 @@ protected:
return TestFail; return TestFail;
} }
const V4L2ControlRange &brightness = info.find(V4L2_CID_BRIGHTNESS)->second; const ControlRange &brightness = info.find(V4L2_CID_BRIGHTNESS)->second;
const V4L2ControlRange &contrast = info.find(V4L2_CID_CONTRAST)->second; const ControlRange &contrast = info.find(V4L2_CID_CONTRAST)->second;
const V4L2ControlRange &saturation = info.find(V4L2_CID_SATURATION)->second; const ControlRange &saturation = info.find(V4L2_CID_SATURATION)->second;
/* Test getting controls. */ /* Test getting controls. */
V4L2ControlList ctrls(info); V4L2ControlList ctrls(info);