diff options
author | Jacopo Mondi <jacopo@jmondi.org> | 2020-12-18 11:47:52 +0100 |
---|---|---|
committer | Jacopo Mondi <jacopo@jmondi.org> | 2021-05-10 15:08:26 +0200 |
commit | cdfcb05bedd22670f42581188d9ffd07a283fb4c (patch) | |
tree | 148cc5feb8e13e052c743b4f56000ecfdcfedaf4 | |
parent | a58a94e4c21465ede803c48162f1f791188a17f4 (diff) |
libcamera: camera_sensor: Register static properties
Register static properties in the CameraSensor class by inspecting the
camera sensor properties database.
Static properties are overridden by properties retrieved from
the kernel interface at run-time if any overlap between the two
sets occurs.
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-rw-r--r-- | include/libcamera/internal/camera_sensor.h | 1 | ||||
-rw-r--r-- | src/libcamera/camera_sensor.cpp | 16 |
2 files changed, 16 insertions, 1 deletions
diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h index 3e98f71b..3fa3a419 100644 --- a/include/libcamera/internal/camera_sensor.h +++ b/include/libcamera/internal/camera_sensor.h @@ -77,6 +77,7 @@ private: int generateId(); int validateSensorDriver(); void initVimcDefaultProperties(); + void initStaticProperties(); int initProperties(); const MediaEntity *entity_; diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp index 2887bb69..1db263cf 100644 --- a/src/libcamera/camera_sensor.cpp +++ b/src/libcamera/camera_sensor.cpp @@ -19,6 +19,7 @@ #include <libcamera/property_ids.h> #include "libcamera/internal/bayer_format.h" +#include "libcamera/internal/camera_sensor_properties.h" #include "libcamera/internal/formats.h" #include "libcamera/internal/sysfs.h" #include "libcamera/internal/utils.h" @@ -407,6 +408,16 @@ void CameraSensor::initVimcDefaultProperties() activeArea_ = Rectangle(pixelArraySize_); } +void CameraSensor::initStaticProperties() +{ + const CameraSensorProperties *props = CameraSensorProperties::get(model_); + if (!props) + return; + + /* Register the properties retrieved from the sensor database. */ + properties_.set(properties::UnitCellSize, props->unitCellSize); +} + int CameraSensor::initProperties() { /* @@ -444,7 +455,10 @@ int CameraSensor::initProperties() if (ret) return ret; - /* Retrieve and store the camera sensor properties. */ + /* Initialize the static properties from the sensor database. */ + initStaticProperties(); + + /* Retrieve and register properties from the kernel interface. */ const ControlInfoMap &controls = subdev_->controls(); int32_t propertyValue; |