PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
src/libcamera/include/v4l2_controls.h
+17 -17
View File
@@ -31,27 +31,27 @@ public:
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:
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 *, V4L2ControlRange>::mapped_type;
using std::map<const ControlId *, V4L2ControlRange>::value_type;
using std::map<const ControlId *, V4L2ControlRange>::size_type;
using std::map<const ControlId *, V4L2ControlRange>::iterator;
using std::map<const ControlId *, V4L2ControlRange>::const_iterator;
using std::map<const ControlId *, ControlRange>::key_type;
using std::map<const ControlId *, ControlRange>::mapped_type;
using std::map<const ControlId *, ControlRange>::value_type;
using std::map<const ControlId *, ControlRange>::size_type;
using std::map<const ControlId *, ControlRange>::iterator;
using std::map<const ControlId *, ControlRange>::const_iterator;
using std::map<const ControlId *, V4L2ControlRange>::begin;
using std::map<const ControlId *, V4L2ControlRange>::cbegin;
using std::map<const ControlId *, V4L2ControlRange>::end;
using std::map<const ControlId *, V4L2ControlRange>::cend;
using std::map<const ControlId *, V4L2ControlRange>::at;
using std::map<const ControlId *, V4L2ControlRange>::empty;
using std::map<const ControlId *, V4L2ControlRange>::size;
using std::map<const ControlId *, V4L2ControlRange>::count;
using std::map<const ControlId *, V4L2ControlRange>::find;
using std::map<const ControlId *, ControlRange>::begin;
using std::map<const ControlId *, ControlRange>::cbegin;
using std::map<const ControlId *, ControlRange>::end;
using std::map<const ControlId *, ControlRange>::cend;
using std::map<const ControlId *, ControlRange>::at;
using std::map<const ControlId *, ControlRange>::empty;
using std::map<const ControlId *, ControlRange>::size;
using std::map<const ControlId *, ControlRange>::count;
using std::map<const ControlId *, ControlRange>::find;
mapped_type &at(unsigned int key);
const mapped_type &at(unsigned int key) const;