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

libcamera: controls: Name all ControlInfoMap instance variables infoMap

Browse source 
To prepare for the rename of ControlRange to ControlInfo, rename all the
ControlInfoMap instance variables currently named info to infoMap. This
will help avoiding namespace clashes.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Laurent Pinchart 2020-03-01 22:02:37 +02:00
parent cf66c4406b
commit 73b7ba9da5
7 changed files with 43 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

18
test/v4l2_videodevice/controls.cpp
View file

@ -26,27 +26,27 @@ public:
protected:
int run()
{
const ControlInfoMap &info = capture_->controls();
const ControlInfoMap &infoMap = capture_->controls();
/* Test control enumeration. */
if (info.empty()) {
if (infoMap.empty()) {
cerr << "Failed to enumerate controls" << endl;
return TestFail;
}
if (info.find(V4L2_CID_BRIGHTNESS) == info.end() ||
info.find(V4L2_CID_CONTRAST) == info.end() ||
info.find(V4L2_CID_SATURATION) == info.end()) {
if (infoMap.find(V4L2_CID_BRIGHTNESS) == infoMap.end() ||
infoMap.find(V4L2_CID_CONTRAST) == infoMap.end() ||
infoMap.find(V4L2_CID_SATURATION) == infoMap.end()) {
cerr << "Missing controls" << endl;
return TestFail;
}
const ControlRange &brightness = info.find(V4L2_CID_BRIGHTNESS)->second;
const ControlRange &contrast = info.find(V4L2_CID_CONTRAST)->second;
const ControlRange &saturation = info.find(V4L2_CID_SATURATION)->second;
const ControlRange &brightness = infoMap.find(V4L2_CID_BRIGHTNESS)->second;
const ControlRange &contrast = infoMap.find(V4L2_CID_CONTRAST)->second;
const ControlRange &saturation = infoMap.find(V4L2_CID_SATURATION)->second;
/* Test getting controls. */
ControlList ctrls(info);
ControlList ctrls(infoMap);
ctrls.set(V4L2_CID_BRIGHTNESS, -1);
ctrls.set(V4L2_CID_CONTRAST, -1);
ctrls.set(V4L2_CID_SATURATION, -1);