summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2019-10-27 23:42:56 +0200
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2019-11-20 21:47:43 +0200
commit6a1ff2615ba14eb70bec501270aacb531cb4c210 (patch)
treef9ae8f0a880db1e69a2450e8a7e6e4bd8feb4a6c
parent7cbd88fec72643ff2bbe8c2ea43b25ad7bd31ca9 (diff)
libcamera: v4l2_controls: Fix control range construction for bool
V4L2 controls of type V4L2_CTRL_TYPE_BOOLEAN are incorrectly described with a ControlRange of int32_t values. Fix it. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
-rw-r--r--src/libcamera/v4l2_controls.cpp14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/libcamera/v4l2_controls.cpp b/src/libcamera/v4l2_controls.cpp
index 2462c3e2..b6547a7c 100644
--- a/src/libcamera/v4l2_controls.cpp
+++ b/src/libcamera/v4l2_controls.cpp
@@ -118,12 +118,22 @@ V4L2ControlId::V4L2ControlId(const struct v4l2_query_ext_ctrl &ctrl)
*/
V4L2ControlRange::V4L2ControlRange(const struct v4l2_query_ext_ctrl &ctrl)
{
- if (ctrl.type == V4L2_CTRL_TYPE_INTEGER64)
+ switch (ctrl.type) {
+ case V4L2_CTRL_TYPE_BOOLEAN:
+ ControlRange::operator=(ControlRange(static_cast<bool>(ctrl.minimum),
+ static_cast<bool>(ctrl.maximum)));
+ break;
+
+ case V4L2_CTRL_TYPE_INTEGER64:
ControlRange::operator=(ControlRange(static_cast<int64_t>(ctrl.minimum),
static_cast<int64_t>(ctrl.maximum)));
- else
+ break;
+
+ default:
ControlRange::operator=(ControlRange(static_cast<int32_t>(ctrl.minimum),
static_cast<int32_t>(ctrl.maximum)));
+ break;
+ }
}
} /* namespace libcamera */