diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2019-09-28 00:27:33 +0300 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2019-10-04 19:33:08 +0300 |
| commit | dd37ef784e7b4a8125225177bf74eef04b8efd83 (patch) | |
| tree | b270db2787d69e3139d22787b4650c543c753dc2 /src/libcamera/pipeline | |
| parent | 224ef9776ac5be51f984780c761713027f2c6102 (diff) | |
libcamera: controls: Use explicit 32-bit integer types
Make the control API more explicit when dealing with integer controls by
specifying the size. We already do so for 64-bit integers, using int64_t
and ControlTypeInteger64, do the same for 32-bit integers.
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>
Diffstat (limited to 'src/libcamera/pipeline')
| -rw-r--r-- | src/libcamera/pipeline/uvcvideo.cpp | 10 | ||||
| -rw-r--r-- | src/libcamera/pipeline/vimc.cpp | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp index 81c548af..0d56758e 100644 --- a/src/libcamera/pipeline/uvcvideo.cpp +++ b/src/libcamera/pipeline/uvcvideo.cpp @@ -235,24 +235,24 @@ int PipelineHandlerUVC::processControls(UVCCameraData *data, Request *request) switch (ci->id()) { case Brightness: - controls.add(V4L2_CID_BRIGHTNESS, value.get<int>()); + controls.add(V4L2_CID_BRIGHTNESS, value.get<int32_t>()); break; case Contrast: - controls.add(V4L2_CID_CONTRAST, value.get<int>()); + controls.add(V4L2_CID_CONTRAST, value.get<int32_t>()); break; case Saturation: - controls.add(V4L2_CID_SATURATION, value.get<int>()); + controls.add(V4L2_CID_SATURATION, value.get<int32_t>()); break; case ManualExposure: controls.add(V4L2_CID_EXPOSURE_AUTO, 1); - controls.add(V4L2_CID_EXPOSURE_ABSOLUTE, value.get<int>()); + controls.add(V4L2_CID_EXPOSURE_ABSOLUTE, value.get<int32_t>()); break; case ManualGain: - controls.add(V4L2_CID_GAIN, value.get<int>()); + controls.add(V4L2_CID_GAIN, value.get<int32_t>()); break; default: diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp index 3e34e7a0..e549dc64 100644 --- a/src/libcamera/pipeline/vimc.cpp +++ b/src/libcamera/pipeline/vimc.cpp @@ -288,15 +288,15 @@ int PipelineHandlerVimc::processControls(VimcCameraData *data, Request *request) switch (ci->id()) { case Brightness: - controls.add(V4L2_CID_BRIGHTNESS, value.get<int>()); + controls.add(V4L2_CID_BRIGHTNESS, value.get<int32_t>()); break; case Contrast: - controls.add(V4L2_CID_CONTRAST, value.get<int>()); + controls.add(V4L2_CID_CONTRAST, value.get<int32_t>()); break; case Saturation: - controls.add(V4L2_CID_SATURATION, value.get<int>()); + controls.add(V4L2_CID_SATURATION, value.get<int32_t>()); break; default: |