[libcamera-devel] [PATCH v2 5/5] libcamera: ipu3: Register sensor controls
Jacopo Mondi
jacopo at jmondi.org
Mon Dec 28 17:56:00 CET 2020
Register the sensor provided controls together with the pipeline
handler initialized controls.
Reviewed-by: Paul Elder <paul.elder at ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo at jmondi.org>
---
src/libcamera/pipeline/ipu3/ipu3.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp
index f1151733d9fe..a745d163462d 100644
--- a/src/libcamera/pipeline/ipu3/ipu3.cpp
+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp
@@ -777,7 +777,12 @@ int PipelineHandlerIPU3::registerCameras()
data->properties_ = cio2->sensor()->properties();
/* Initialze the camera controls. */
- data->controlInfo_ = IPU3Controls;
+ ControlInfoMap::Map controlsMap;
+ for (const auto &it : IPU3Controls)
+ controlsMap[it.first] = it.second;
+ for (const auto &it : cio2->sensor()->controls())
+ controlsMap[it.first] = it.second;
+ data->controlInfo_ = std::move(controlsMap);
/**
* \todo Dynamically assign ImgU and output devices to each
--
2.29.2
More information about the libcamera-devel
mailing list